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

Slight light gather refactor

This commit is contained in:
Jarrod Doyle 2024-09-29 10:22:43 +01:00
parent b57d15f6f0
commit 067cd2cc00
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
KeepersCompound.Lightmapper/Program.cs
View File

@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using System.Numerics;
using KeepersCompound.LGS;
using KeepersCompound.LGS.Database;
@ -22,6 +22,9 @@ class Program
public Vector3 spotlightDir;
public float spotlightInnerAngle;
public float spotlightOuterAngle;
public bool anim;
public int animObjId;
}
static void Main(string[] args)
@ -33,18 +36,16 @@ class Program
var campaignName = "JAYRUDE_Tests";
var missionName = "lm_test.cow";
// campaignName = "TDP20AC_a_burrick_in_a_room";
// missionName = "miss20.mis";
// Setup extract path
var tmpDir = Directory.CreateTempSubdirectory("KCLightmapper");
Console.WriteLine(tmpDir.FullName);
var resPathManager = new ResourcePathManager(tmpDir.FullName);
resPathManager.Init(installPath);
var campaign = resPathManager.GetCampaign(campaignName);
var misPath = campaign.GetResourcePath(ResourceType.Mission, missionName);
// misPath = "/stuff/Games/thief/drive_c/GOG Games/TG ND 1.27 (MAPPING)/FMs/JAYRUDE_Tests/lm_test.cow";
// misPath = "/stuff/Games/thief/drive_c/GOG Games/TG ND 1.27 (MAPPING)/FMs/AtdV/miss20.mis";
// misPath = "/stuff/Games/thief/drive_c/GOG Games/TG ND 1.27 (MAPPING)/FMs/TDP20AC_a_burrick_in_a_room/miss20.mis";
Timing.TimeStage("Total", () => LightmapMission(campaign, misPath));
Timing.LogAll();
@ -138,17 +139,11 @@ class Program
var propSpotlight = hierarchy.GetProperty<PropSpotlight>(id, "P$Spotlight");
var propModelname = hierarchy.GetProperty<PropLabel>(id, "P$ModelName");
if (propLight != null)
{
propLightColor ??= new PropLightColor { Hue = 0, Saturation = 0 };
var light = new Light
{
position = brush.position + propLight.Offset,
color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propLight.Brightness),
innerRadius = propLight.InnerRadius,
radius = propLight.Radius,
r2 = propLight.Radius * propLight.Radius,
position = brush.position,
spotlightDir = -Vector3.UnitZ,
};
@ -169,7 +164,6 @@ class Program
if (propSpotlight != null)
{
// TODO: Some objects seem to have spotlight direction embedded in the model file
var rot = Matrix4x4.Identity;
rot *= Matrix4x4.CreateRotationX(float.DegreesToRadians(brush.angle.X));
rot *= Matrix4x4.CreateRotationY(float.DegreesToRadians(brush.angle.Y));
@ -181,6 +175,17 @@ class Program
light.spotlightOuterAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.OuterAngle));
}
// if (propAnimLight != null)
// {
// }
if (propLight != null)
{
light.position += propLight.Offset;
light.color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propLight.Brightness);
light.innerRadius = propLight.InnerRadius;
light.radius = propLight.Radius;
light.r2 = propLight.Radius * propLight.Radius;
if (propLight.Radius == 0)
{
light.radius = float.MaxValue;