KeepersCompound
/
ThiefLightmapper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set cell light palette, lightmap bitmasks, and layers

This commit is contained in:
Jarrod Doyle 2024-10-05 18:14:25 +01:00
parent 6d665302d2
commit 7c733fc9fd
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
KeepersCompound.Lightmapper/Program.cs
View File

@ -408,23 +408,10 @@ class Program
var layer = 0; var layer = 0;
if (light.anim) if (light.anim)
{ {
var paletteIdx = -1; // Because we're building the AnimLightBitmask in this loop we
for (var i = 0; i < cell.AnimLightCount; i++) // know there aren't any layers set above us. So the target layer
{ // is just the number of set bits + 1.
var id = cell.AnimLights[i]; layer = BitOperations.PopCount(info.AnimLightBitmask) + 1;
if (id == light.animLightTableIndex)
{
paletteIdx = i;
}
}
if (paletteIdx == -1 || (info.AnimLightBitmask & (1 << paletteIdx)) == 0)
{
continue;
}
var mask = info.AnimLightBitmask & ((1 << (paletteIdx + 1)) - 1);
layer = BitOperations.PopCount((uint)mask);
} }
// Check if plane normal is facing towards the light // Check if plane normal is facing towards the light
@ -494,6 +481,27 @@ class Program
var hit = hitResult && Math.Abs(hitResult.Distance - direction.Length()) < MathUtils.Epsilon; var hit = hitResult && Math.Abs(hitResult.Distance - direction.Length()) < MathUtils.Epsilon;
if (hit) if (hit)
{ {
// If we're an anim light there's a lot of stuff we need to update
// Firstly we need to add the light to the cells anim light palette
// Secondly we need to set the appropriate bit of the lightmap's
// bitmask. Finally we need to check if the lightmap needs another layer
if (light.anim)
{
// TODO: Don't recalculate this for every point lol
var paletteIdx = cell.AnimLights.IndexOf((ushort)light.animLightTableIndex);
if (paletteIdx == -1)
{
paletteIdx = cell.AnimLightCount;
cell.AnimLightCount++;
cell.AnimLights.Add((ushort)light.animLightTableIndex);
}
info.AnimLightBitmask |= 1u << paletteIdx;
if (layer >= lightmap.Layers)
{
lightmap.AddLayer();
}
}
var strength = CalculateLightStrengthAtPoint(light, pos, plane); var strength = CalculateLightStrengthAtPoint(light, pos, plane);
lightmap.AddLight(layer, x, y, light.color, strength, hdr); lightmap.AddLight(layer, x, y, light.color, strength, hdr);
} }