KeepersCompound.Lightmapper/LightMapper.cs

@@ -636,11 +636,10 @@ public class LightMapper
                 var planeMapper = new MathUtils.PlanePointMapper(plane.Normal, vs[0], vs[1]);
                 var v2ds = planeMapper.MapTo2d(vs);
                 
-                // TODO: Only need to generate quadweights if there's any quadlights in the mission
                 var (texU, texV) = renderPoly.TextureVectors;
                 var (offsets, weights) =
                     GetTraceOffsetsAndWeights(settings.MultiSampling, texU, texV, settings.MultiSamplingCenterWeight);
-                var (quadOffsets, quadWeights) = settings.MultiSampling != SoftnessMode.Standard
+                var (quadOffsets, quadWeights) = settings.MultiSampling == SoftnessMode.HighFourPoint
                     ? (offsets, weights)
                     : GetTraceOffsetsAndWeights(SoftnessMode.HighFourPoint, texU, texV, settings.MultiSamplingCenterWeight);
 
@@ -655,7 +654,7 @@ public class LightMapper
                         // TODO: Handle quad lit lights better. Right now we're computing two sets of points for every
                         // luxel. Maybe it's better to only compute if we encounter a quadlit light?
                         var tracePoints = GetTracePoints(pos, offsets, renderPoly.Center, planeMapper, v2ds);
-                        var quadTracePoints = settings.MultiSampling != SoftnessMode.Standard
+                        var quadTracePoints = settings.MultiSampling == SoftnessMode.HighFourPoint
                             ? tracePoints
                             : GetTracePoints(pos, quadOffsets, renderPoly.Center, planeMapper, v2ds);
                         
@@ -800,7 +799,7 @@ public class LightMapper
         return mode switch
         {
             SoftnessMode.LowFourPoint or SoftnessMode.MediumFourPoint or SoftnessMode.HighFourPoint => (
-                [-texU - texV, texU - texV, -texU + texV, texU + texV],
+                [-texU - texV, -texU - texV, -texU + texV, texU + texV],
                 [0.25f, 0.25f, 0.25f, 0.25f]),
             SoftnessMode.MediumFivePoint or SoftnessMode.HighFivePoint => (
                 [Vector3.Zero, -texU - texV, texU - texV, -texU + texV, texU + texV],
@@ -877,8 +876,7 @@ public class LightMapper
             origin = hitResult.Position += direction * MathUtils.Epsilon;
         }
 
-        // A large epsilon is used here to fix shadow acne on sloped surfaces :)
-        return Math.Abs(hitDistanceFromTarget) < 10 * MathUtils.Epsilon;
+        return Math.Abs(hitDistanceFromTarget) < MathUtils.Epsilon;
     }
 
     // TODO: Can this be merged with the above?