KeepersCompound
/
thief-mission-viewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: KeepersCompound:e499cfcbfcd4a1f711f4153e5bf57378b3a60f86
Branches Tags
KeepersCompound:main
..
compare: KeepersCompound:110c9b8a3ca68ff2cf0d999a6a73b189f4c8d512
Branches Tags
KeepersCompound:main

No commits in common. "e499cfcbfcd4a1f711f4153e5bf57378b3a60f86" and "110c9b8a3ca68ff2cf0d999a6a73b189f4c8d512" have entirely different histories.
e499cfcbfc ... 110c9b8a3c

3 changed files with 10 additions and 74 deletions
Show Stats Expand all files Collapse all files

6
Thief Mission Viewer.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Godot.NET.Sdk/4.3.0">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<!-- <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework> -->
<TargetFramework>net6.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<RootNamespace>ThiefMissionViewer</RootNamespace>
</PropertyGroup>

18
project/code/TMV/Mission.cs
View File

@ -3,6 +3,7 @@ using KeepersCompound.LGS;
using KeepersCompound.LGS.Database;
using KeepersCompound.LGS.Database.Chunks;
using KeepersCompound.TMV.UI;
using RectpackSharp;
using System;
using System.Collections.Generic;
using System.IO;
@ -260,7 +261,7 @@ public partial class Mission : Node3D
var lmHdr = worldRep.DataHeader.LightmapFormat == 2;
GD.Print($"HDR Lightmap: {lmHdr}");
var packingRects = new List<RectPacker.Rect>();
var packingRects = new List<PackingRectangle>();
var surfaceDataMap = new Dictionary<int, MeshSurfaceData>();
var rectDataMap = new Dictionary<int, LightmapRectData>();
@ -287,12 +288,7 @@ public partial class Mission : Node3D
rectDataMap.Add(packingRects.Count, lightmapRectData);
var light = cell.LightList[polyIdx];
var rect = new RectPacker.Rect
{
Width = light.Width,
Height = light.Height,
Id = packingRects.Count,
};
var rect = new PackingRectangle(0, 0, light.Width, light.Height, packingRects.Count);
packingRects.Add(rect);
cellIdxOffset += cell.Polys[polyIdx].VertexCount;
@ -359,15 +355,16 @@ public partial class Mission : Node3D
private static Texture2DArray BuildLightmapTexture(
WorldRep.Cell[] cells,
RectPacker.Rect[] packingRects,
PackingRectangle[] packingRects,
Dictionary<int, LightmapRectData> rectDataMap,
Dictionary<int, MeshSurfaceData> surfaceDataMap)
{
var bounds = Timing.TimeStage("RectPack", () =>
{
return RectPacker.Pack(packingRects);
RectanglePacker.Pack(packingRects, out var bounds, PackingHints.FindBest, 0);
return bounds;
});
GD.Print($"Packed {packingRects.Length} rects in ({bounds.Width}, {bounds.Height})");
GD.Print($"Creating lightmap with bounds: ({bounds.Width}, {bounds.Height})");
var lightmapFormat = Image.Format.Rgba8;
var lmLayerCount = 33; // TODO: Use LightmapLayers
@ -416,7 +413,6 @@ public partial class Mission : Node3D
return new Vector2(u, v);
});
}
lmImages[0].SavePng("user://lm.png");
var lightmapTexture = new Texture2DArray();
lightmapTexture.CreateFromImages(lmImages);

60
project/code/TMV/RectPacker.cs
View File

@ -1,60 +0,0 @@
using System;
namespace KeepersCompound.TMV;
public static class RectPacker
{
public struct Rect
{
public int Id;
public ushort X;
public ushort Y;
public ushort Width;
public ushort Height;
}
public static Rect Pack(Rect[] rectangles, ushort width = 2048, ushort minHeight = 512)
{
ArgumentNullException.ThrowIfNull(rectangles);
ArgumentOutOfRangeException.ThrowIfZero(width);
ArgumentOutOfRangeException.ThrowIfZero(minHeight);
var bounds = new Rect
{
Width = width,
Height = minHeight
};
if (rectangles.Length == 0)
{
return bounds;
}
Array.Sort(rectangles, (a, b) => b.Height.CompareTo(a.Height));
// Naively try to pack into the row, wrapping when we reach the end
// and expanding the bounds when needed
ushort rowMaxH = rectangles[0].Height;
ushort x = 0;
ushort y = 0;
var rectCount = rectangles.Length;
for (var i = 0; i < rectCount; i++)
{
var rect = rectangles[i];
if (x + rect.Width > width)
{
x = 0;
y += rowMaxH;
rowMaxH = rect.Height;
}
rect.X = x;
rect.Y = y;
rectangles[i] = rect;
x += rect.Width;
}
bounds.Height = (ushort)(y + rowMaxH);
return bounds;
}
}