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

Close #16: Apply LmParams saturation

This commit is contained in:
Jarrod Doyle 2025-02-21 16:53:21 +00:00
parent f4d5dcbd5a
commit b0ceb0f845
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
KeepersCompound.Lightmapper/LightMapper.cs
View File

@ -93,12 +93,12 @@ public class LightMapper
return; return;
} }
var sunlightSettings = new SunSettings() var sunlightSettings = new SunSettings
{ {
Enabled = rendParams.useSunlight, Enabled = rendParams.useSunlight,
QuadLit = rendParams.sunlightMode is RendParams.SunlightMode.QuadUnshadowed or RendParams.SunlightMode.QuadObjcastShadows, QuadLit = rendParams.sunlightMode is RendParams.SunlightMode.QuadUnshadowed or RendParams.SunlightMode.QuadObjcastShadows,
Direction = Vector3.Normalize(rendParams.sunlightDirection), Direction = Vector3.Normalize(rendParams.sunlightDirection),
Color = Utils.HsbToRgb(rendParams.sunlightHue, rendParams.sunlightSaturation, rendParams.sunlightBrightness), Color = Utils.HsbToRgb(rendParams.sunlightHue, rendParams.sunlightSaturation * lmParams.Saturation, rendParams.sunlightBrightness),
}; };
var ambientLight = rendParams.ambientLightZones.ToList(); var ambientLight = rendParams.ambientLightZones.ToList();
@ -125,7 +125,7 @@ public class LightMapper
Log.Information("Lighting Settings: {Settings}", settings); Log.Information("Lighting Settings: {Settings}", settings);
Timing.TimeStage("Gather Lights", BuildLightList); Timing.TimeStage("Gather Lights", () => BuildLightList(settings));
Timing.TimeStage("Set Light Indices", () => SetCellLightIndices(settings)); Timing.TimeStage("Set Light Indices", () => SetCellLightIndices(settings));
Timing.TimeStage("Trace Scene", () => TraceScene(settings)); Timing.TimeStage("Trace Scene", () => TraceScene(settings));
Timing.TimeStage("Update AnimLight Cell Mapping", SetAnimLightCellMaps); Timing.TimeStage("Update AnimLight Cell Mapping", SetAnimLightCellMaps);
@ -222,7 +222,7 @@ public class LightMapper
return (noObjMesh, fullMesh); return (noObjMesh, fullMesh);
} }
private void BuildLightList() private void BuildLightList(Settings settings)
{ {
_lights.Clear(); _lights.Clear();
@ -242,10 +242,10 @@ public class LightMapper
switch (brush.media) switch (brush.media)
{ {
case BrList.Brush.Media.Light: case BrList.Brush.Media.Light:
ProcessBrushLight(worldRep.LightingTable, brush); ProcessBrushLight(worldRep.LightingTable, brush, settings);
break; break;
case BrList.Brush.Media.Object: case BrList.Brush.Media.Object:
ProcessObjectLight(worldRep.LightingTable, brush); ProcessObjectLight(worldRep.LightingTable, brush, settings);
break; break;
} }
} }
@ -293,7 +293,7 @@ public class LightMapper
} }
// TODO: Check if this works (brush is a record type) // TODO: Check if this works (brush is a record type)
private void ProcessBrushLight(WorldRep.LightTable lightTable, BrList.Brush brush) private void ProcessBrushLight(WorldRep.LightTable lightTable, BrList.Brush brush, Settings settings)
{ {
// For some reason the light table index on brush lights is 1 indexed // For some reason the light table index on brush lights is 1 indexed
brush.brushInfo = (uint)lightTable.LightCount + 1; brush.brushInfo = (uint)lightTable.LightCount + 1;
@ -306,10 +306,11 @@ public class LightMapper
} }
var brightness = Math.Min(sz.X, 255.0f); var brightness = Math.Min(sz.X, 255.0f);
var saturation = sz.Z * settings.Saturation;
var light = new Light var light = new Light
{ {
Position = brush.position, Position = brush.position,
Color = Utils.HsbToRgb(sz.Y, sz.Z, brightness), Color = Utils.HsbToRgb(sz.Y, saturation, brightness),
Brightness = brightness, Brightness = brightness,
Radius = float.MaxValue, Radius = float.MaxValue,
R2 = float.MaxValue, R2 = float.MaxValue,
@ -322,7 +323,7 @@ public class LightMapper
lightTable.AddLight(light.ToLightData(32.0f)); lightTable.AddLight(light.ToLightData(32.0f));
} }
private void ProcessObjectLight(WorldRep.LightTable lightTable, BrList.Brush brush) private void ProcessObjectLight(WorldRep.LightTable lightTable, BrList.Brush brush, Settings settings)
{ {
// TODO: Handle PropSpotlightAndAmbient // TODO: Handle PropSpotlightAndAmbient
var id = (int)brush.brushInfo; var id = (int)brush.brushInfo;
@ -336,6 +337,8 @@ public class LightMapper
var propJointPos = _hierarchy.GetProperty<PropJointPos>(id, "P$JointPos"); var propJointPos = _hierarchy.GetProperty<PropJointPos>(id, "P$JointPos");
propLightColor ??= new PropLightColor { Hue = 0, Saturation = 0 }; propLightColor ??= new PropLightColor { Hue = 0, Saturation = 0 };
propLightColor.Saturation *= settings.Saturation;
var joints = propJointPos?.Positions ?? [0, 0, 0, 0, 0, 0]; var joints = propJointPos?.Positions ?? [0, 0, 0, 0, 0, 0];
// Transform data // Transform data