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

Gather anim lights

This commit is contained in:
Jarrod Doyle 2024-09-29 10:39:40 +01:00
parent 6efceff852
commit 93410a46d5
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
KeepersCompound.Lightmapper/Program.cs
View File

@ -141,7 +141,7 @@ class Program
propLightColor ??= new PropLightColor { Hue = 0, Saturation = 0 }; propLightColor ??= new PropLightColor { Hue = 0, Saturation = 0 };
var light = new Light var baseLight = new Light
{ {
position = brush.position, position = brush.position,
spotlightDir = -Vector3.UnitZ, spotlightDir = -Vector3.UnitZ,
@ -154,11 +154,11 @@ class Program
var model = new ModelFile(modelPath); var model = new ModelFile(modelPath);
if (model.TryGetVhot(ModelFile.VhotId.LightPosition, out var vhot)) if (model.TryGetVhot(ModelFile.VhotId.LightPosition, out var vhot))
{ {
light.position += vhot.Position; baseLight.position += vhot.Position;
} }
if (model.TryGetVhot(ModelFile.VhotId.LightDirection, out vhot)) if (model.TryGetVhot(ModelFile.VhotId.LightDirection, out vhot))
{ {
light.spotlightDir = vhot.Position; baseLight.spotlightDir = vhot.Position;
} }
} }
@ -169,23 +169,23 @@ class Program
rot *= Matrix4x4.CreateRotationY(float.DegreesToRadians(brush.angle.Y)); rot *= Matrix4x4.CreateRotationY(float.DegreesToRadians(brush.angle.Y));
rot *= Matrix4x4.CreateRotationZ(float.DegreesToRadians(brush.angle.Z)); rot *= Matrix4x4.CreateRotationZ(float.DegreesToRadians(brush.angle.Z));
light.spotlight = true; baseLight.spotlight = true;
light.spotlightDir = Vector3.Transform(light.spotlightDir, rot); baseLight.spotlightDir = Vector3.Transform(baseLight.spotlightDir, rot);
light.spotlightInnerAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.InnerAngle)); baseLight.spotlightInnerAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.InnerAngle));
light.spotlightOuterAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.OuterAngle)); baseLight.spotlightOuterAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.OuterAngle));
} }
// if (propAnimLight != null)
// {
// }
if (propLight != null) if (propLight != null)
{ {
light.position += propLight.Offset; var light = new Light
light.color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propLight.Brightness); {
light.innerRadius = propLight.InnerRadius; position = baseLight.position + propLight.Offset,
light.radius = propLight.Radius; color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propLight.Brightness),
light.r2 = propLight.Radius * propLight.Radius; innerRadius = propLight.InnerRadius,
radius = propLight.Radius,
r2 = propLight.Radius * propLight.Radius,
};
if (propLight.Radius == 0) if (propLight.Radius == 0)
{ {
light.radius = float.MaxValue; light.radius = float.MaxValue;
@ -194,6 +194,27 @@ class Program
lights.Add(light); lights.Add(light);
} }
if (propAnimLight != null)
{
var light = new Light
{
position = baseLight.position + propAnimLight.Offset,
color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propAnimLight.Brightness),
innerRadius = propAnimLight.InnerRadius,
radius = propAnimLight.Radius,
r2 = propAnimLight.Radius * propAnimLight.Radius,
anim = true,
animObjId = id,
};
if (propAnimLight.Radius == 0)
{
light.radius = float.MaxValue;
light.r2 = float.MaxValue;
}
lights.Add(light);
}
} }
} }
} }
@ -327,6 +348,12 @@ class Program
foreach (var light in lights) foreach (var light in lights)
{ {
// For now we're not actually doing anything
if (light.anim)
{
continue;
}
// Check if plane normal is facing towards the light // Check if plane normal is facing towards the light
// If it's not then we're never going to be (directly) lit by this // If it's not then we're never going to be (directly) lit by this
// light. // light.