Headlight back to the original linear model

Author: pzgulyas

Source/RunActivity/Content/SceneryShader.fx

@@ -85,7 +85,7 @@ int      MorphConfig[9]; // 0-5: position of POSITION, NORMAL, TANGENT, TEXCOORD
 float    MorphWeights[MAX_MORPH_TARGETS]; // the actual morphing animation state
 
 int		NumLights; // The number of the lights used
-float	LightTypes[MAX_LIGHTS]; // 0: directional, 1: point, 2: spot
+float	LightTypes[MAX_LIGHTS]; // 0: directional, 1: point, 2: spot, 3: headlight
 float3	LightPositions[MAX_LIGHTS];
 float3	LightDirections[MAX_LIGHTS];
 float3	LightColors[MAX_LIGHTS];

Source/RunActivity/Viewer3D/Lights.cs

@@ -272,13 +272,12 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                     LightConeDirection = Vector3.Transform(Vector3.Lerp(ActiveLightCone.Direction1, ActiveLightCone.Direction2, ActiveLightCone.Fade.Y), ShapeXNATranslations[coneIndex]);
                     LightConeDirection -= ShapeXNATranslations[coneIndex].Translation;
                     LightConeDirection.Normalize();
-                    // The original shaders followed the phylisophy of wanting 50% brightness at half the range. (LightConeDistance is only the half.) Now we need the full range.
-                    LightConeDistance = 2 * MathHelper.Lerp(ActiveLightCone.Distance1, ActiveLightCone.Distance2, ActiveLightCone.Fade.Y);
+                    LightConeDistance = 4 * MathHelper.Lerp(ActiveLightCone.Distance1, ActiveLightCone.Distance2, ActiveLightCone.Fade.Y);
                     LightConeOuterAngle = MathHelper.Lerp(ActiveLightCone.Angle1, ActiveLightCone.Angle2, ActiveLightCone.Fade.Y);
                     var lightConeColor = Vector4.Lerp(ActiveLightCone.Color1, ActiveLightCone.Color2, ActiveLightCone.Fade.Y);
-                    LightConeColor = new Vector3(lightConeColor.X, lightConeColor.Y, lightConeColor.Z);
+                    LightConeColor = new Vector3(lightConeColor.X, lightConeColor.Y, lightConeColor.Z) * lightConeColor.W;
 
-                    frame.AddLight(LightMode.Spot, LightConePosition, LightConeDirection, LightConeColor, RenderFrame.HeadLightIntensity * lightConeColor.W, LightConeDistance, 0, LightConeOuterAngle, ActiveLightCone.Fade.X, false);
+                    frame.AddLight(LightMode.Headlight, LightConePosition, LightConeDirection, LightConeColor, RenderFrame.HeadLightIntensity, LightConeDistance, 0, LightConeOuterAngle, ActiveLightCone.Fade.X, false);
                 }
                 else
                 {

Source/RunActivity/Viewer3D/RenderFrame.cs

@@ -73,7 +73,8 @@ public enum LightMode
     {
         Directional = 0,
         Point = 1,
-        Spot = 2
+        Spot = 2,
+        Headlight = 3
     }
 
     public abstract class RenderPrimitive
@@ -392,7 +393,8 @@ public class RenderFrame
         static readonly Vector3 MoonGlow = new Vector3(245f / 255f, 243f / 255f, 206f / 255f);
         const float SunIntensity = 1;
         const float MoonIntensity = SunIntensity / 380000;
-        public const float HeadLightIntensity = 250000; // See some sample values: https://docs.unity3d.com/Packages/[email protected]/manual/LightUnits.html
+        //public const float HeadLightIntensity = 250000; // See some sample values: https://docs.unity3d.com/Packages/[email protected]/manual/LightUnits.html
+        public const float HeadLightIntensity = 4; // Using the old linear attenuation model
 
         const float LIGHT_INTENSITY_ADJUSTMENT_SPOT = 1f;
         const float LIGHT_INTENSITY_ADJUSTMENT_POINT = 0.08f; // By visual inspection of PlaysetLightTest at nighttime. Probably should be 1 / 4π = 0.08