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

Close #10: Apply ambient light zones

This commit is contained in:
Jarrod Doyle 2024-12-26 17:12:28 +00:00
parent 40ea7cce0e
commit 2e1c90b88a
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
KeepersCompound.Lightmapper/LightMapper.cs
View File

@ -19,7 +19,7 @@ public class LightMapper
private struct Settings private struct Settings
{ {
public Vector3 AmbientLight; public Vector3[] AmbientLight;
public bool Hdr; public bool Hdr;
public SoftnessMode MultiSampling; public SoftnessMode MultiSampling;
public float MultiSamplingCenterWeight; public float MultiSamplingCenterWeight;
@ -76,12 +76,19 @@ public class LightMapper
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, rendParams.sunlightBrightness),
}; };
var ambientLight = rendParams.ambientLightZones.ToList();
ambientLight.Insert(0, rendParams.ambientLight);
for (var i = 0; i < ambientLight.Count; i++)
{
ambientLight[i] *= 255;
}
// TODO: lmParams LightmappedWater doesn't mean the game will actually *use* the lightmapped water hmm // TODO: lmParams LightmappedWater doesn't mean the game will actually *use* the lightmapped water hmm
var settings = new Settings var settings = new Settings
{ {
Hdr = worldRep.DataHeader.LightmapFormat == 2, Hdr = worldRep.DataHeader.LightmapFormat == 2,
AmbientLight = rendParams.ambientLight * 255, AmbientLight = [..ambientLight],
MultiSampling = lmParams.ShadowSoftness, MultiSampling = lmParams.ShadowSoftness,
MultiSamplingCenterWeight = lmParams.CenterWeight, MultiSamplingCenterWeight = lmParams.CenterWeight,
LightmappedWater = lmParams.LightmappedWater, LightmappedWater = lmParams.LightmappedWater,
@ -475,7 +482,9 @@ public class LightMapper
lightmap.Reset(Vector3.One * 255f, settings.Hdr); lightmap.Reset(Vector3.One * 255f, settings.Hdr);
continue; continue;
} }
lightmap.Reset(settings.AmbientLight, settings.Hdr);
var ambientLight = settings.AmbientLight[cell.ZoneInfo.GetAmbientLightZoneIndex()];
lightmap.Reset(ambientLight, settings.Hdr);
// Get world position of lightmap (0, 0) (+0.5 so we cast from the center of a pixel) // Get world position of lightmap (0, 0) (+0.5 so we cast from the center of a pixel)
var topLeft = cell.Vertices[cell.Indices[cellIdxOffset]]; var topLeft = cell.Vertices[cell.Indices[cellIdxOffset]];