KeepersCompound.LGS/Database/File.cs

@@ -144,7 +144,6 @@ public class DbFile
             "P$OTxtRepr3" => new PropertyChunk<PropString>(),
             "P$Light" => new PropertyChunk<PropLight>(),
             "P$LightColo" => new PropertyChunk<PropLightColor>(),
-            "P$Spotlight" => new PropertyChunk<PropSpotlight>(),
             "P$RenderAlp" => new PropertyChunk<PropFloat>(),
             "LD$MetaProp" => new LinkDataMetaProp(),
             _ when entryName.StartsWith("L$") => new LinkChunk(),

KeepersCompound.LGS/Database/ObjectHierarchy.cs

@@ -102,7 +102,6 @@ public class ObjectHierarchy
         AddProp<PropFloat>("P$RenderAlp");
         AddProp<PropLight>("P$Light");
         AddProp<PropLightColor>("P$LightColo");
-        AddProp<PropSpotlight>("P$Spotlight");
     }
 
     public T GetProperty<T>(int objectId, string propName) where T : Property

KeepersCompound.Lightmapper/Program.cs

@@ -13,14 +13,8 @@ class Program
     {
         public Vector3 position;
         public Vector3 color;
-        public float innerRadius;
         public float radius;
         public float r2;
-
-        public bool spotlight;
-        public Vector3 spotlightDir;
-        public float spotlightInnerAngle;
-        public float spotlightOuterAngle;
     }
 
     static void Main(string[] args)
@@ -29,7 +23,7 @@ class Program
 
         var 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";
+        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(misPath));
 
         Timing.LogAll();
@@ -110,16 +104,14 @@ class Program
                         position = brush.position,
                         color = HsbToRgb(sz.Y, sz.Z, Math.Min(sz.X, 255.0f)),
                         radius = float.MaxValue,
-                        r2 = float.MaxValue,
+                        r2 = float.MaxValue
                     });
                 }
                 else if (brush.media == BrList.Brush.Media.Object)
                 {
-                    // TODO: Handle PropSpotlightAndAmbient
                     var id = (int)brush.brushInfo;
                     var propLight = hierarchy.GetProperty<PropLight>(id, "P$Light");
                     var propLightColor = hierarchy.GetProperty<PropLightColor>(id, "P$LightColo");
-                    var propSpotlight = hierarchy.GetProperty<PropSpotlight>(id, "P$Spotlight");
 
                     if (propLight != null)
                     {
@@ -131,25 +123,10 @@ class Program
                         {
                             position = brush.position + propLight.Offset,
                             color = HsbToRgb(propLightColor.Hue, propLightColor.Saturation, propLight.Brightness),
-                            innerRadius = propLight.InnerRadius,
                             radius = propLight.Radius,
                             r2 = propLight.Radius * propLight.Radius,
                         };
 
-                        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));
-                            rot *= Matrix4x4.CreateRotationZ(float.DegreesToRadians(brush.angle.Z));
-
-                            light.spotlight = true;
-                            light.spotlightDir = Vector3.Transform(-Vector3.UnitZ, rot);
-                            light.spotlightInnerAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.InnerAngle));
-                            light.spotlightOuterAngle = (float)Math.Cos(float.DegreesToRadians(propSpotlight.OuterAngle));
-                        }
-
                         if (propLight.Radius == 0)
                         {
                             light.radius = float.MaxValue;
@@ -381,40 +358,6 @@ class Program
         var slen = len / 4.0f;
         var strength = (angle + 1.0f) / slen;
 
-        // Inner radius starts a linear falloff to 0 at the radius
-        if (light.innerRadius != 0 && len > light.innerRadius)
-        {
-            strength *= (light.radius - len) / (light.radius - light.innerRadius);
-        }
-
-        // This is basically the same as how inner radius works. It just applies
-        // a linear falloff to 0 between the inner angle and outer angle.
-        if (light.spotlight)
-        {
-            var spotAngle = Vector3.Dot(-Vector3.Normalize(dir), light.spotlightDir);
-            var inner = light.spotlightInnerAngle;
-            var outer = light.spotlightOuterAngle;
-
-            // In an improperly configured spotlight inner and outer angles might be the
-            // same. So to avoid division by zero (and some clamping) we explicitly handle
-            // some cases
-            float spotlightMultiplier;
-            if (spotAngle >= inner)
-            {
-                spotlightMultiplier = 1.0f;
-            }
-            else if (spotAngle <= outer)
-            {
-                spotlightMultiplier = 0.0f;
-            }
-            else
-            {
-                spotlightMultiplier = (spotAngle - outer) / (inner - outer);
-            }
-
-            strength *= spotlightMultiplier;
-        }
-
         return strength;
     }