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

Handle HDR and light strength multiplication in AddLight

This commit is contained in:
Jarrod Doyle 2024-09-26 12:04:58 +01:00
parent 196e97a8fd
commit dcecc33bcd
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
KeepersCompound.LGS/Database/Chunks/WorldRep.cs
View File

@ -243,6 +243,32 @@ public class WorldRep : IChunk
Pixels[idx + 3] = 255; Pixels[idx + 3] = 255;
} }
public void AddLight(int layer, int x, int y, Vector3 color, float strength, bool hdr)
{
if (hdr)
{
strength /= 2.0f;
}
// We need to make sure we don't go over (255, 255, 255).
// If we just do Max(color, (255, 255, 255)) then we change
// the hue/saturation of coloured lights. Got to make sure we
// maintain the colour ratios.
var c = color * strength;
var ratio = 0.0f;
foreach (var e in new float[] { c.X, c.Y, c.Z })
{
ratio = Math.Max(ratio, e / 255.0f);
}
if (ratio > 1.0f)
{
c /= ratio;
}
AddLight(layer, x, y, (byte)c.X, (byte)c.Y, (byte)c.Z);
}
public readonly void Write(BinaryWriter writer) public readonly void Write(BinaryWriter writer)
{ {
writer.Write(Pixels); writer.Write(Pixels);

30
KeepersCompound.Lightmapper/Program.cs
View File

@ -347,28 +347,8 @@ class Program
var len = dir.Length(); var len = dir.Length();
var slen = len / 4.0f; var slen = len / 4.0f;
var strength = (angle + 1.0f) / slen; var strength = (angle + 1.0f) / slen;
if (hdr)
{
strength /= 2;
}
// We need to make sure we don't go over (255, 255, 255). lightmap.AddLight(0, x, y, light.color, strength, hdr);
// If we just do Max(color, (255, 255, 255)) then we change
// the hue/saturation of coloured lights. Got to make sure we
// maintain the colour ratios.
var c = light.color * strength;
var ratio = 0.0f;
foreach (var e in new float[] { c.X, c.Y, c.Z })
{
ratio = Math.Max(ratio, e / 255.0f);
}
if (ratio > 1.0f)
{
c /= ratio;
}
lightmap.AddLight(0, x, y, (byte)c.X, (byte)c.Y, (byte)c.Z);
} }
} }
} }
@ -388,17 +368,11 @@ class Program
lightmap.Pixels[i] = 0; lightmap.Pixels[i] = 0;
} }
var c = ambientLight;
if (hdr)
{
c /= 2.0f;
}
for (var y = 0; y < lightmap.Height; y++) for (var y = 0; y < lightmap.Height; y++)
{ {
for (var x = 0; x < lightmap.Width; x++) for (var x = 0; x < lightmap.Width; x++)
{ {
lightmap.AddLight(0, x, y, (byte)c.X, (byte)c.Y, (byte)c.Z); lightmap.AddLight(0, x, y, ambientLight, 1.0f, hdr);
} }
} }
} }