Merge pull request #1033 from cesarBLG/multiple-light-textures

Multiple signal light textures per signal

Author: cjakeman

Source/Documentation/Manual/appendices.rst

@@ -678,6 +678,19 @@ The value speed is the required speed value in dimension as set by the relevant
 Inclusion of speed definition is optional and need not be set if only approach control position functions
 are used.
 
+Signal light parameters
+-----------------------
+
+.. index::
+  single: ORTSSignalLightTex
+
+It is possible to have different light textures in the same signal, by inserting
+the following parameter in the signal light definition::
+
+    ORTSSignalLightTex ( "name" )
+
+Where **name** is the name of the texture to be used for the signal light.
+
 Signal aspect parameters
 ------------------------
 The following parameters can be included in signal aspect definitions.

Source/Orts.Formats.Msts/SignalConfigurationFile.cs

@@ -889,6 +889,8 @@ public class SignalLight
         public float Radius { get; private set; }
         /// <summary>is the SIGLIGHT flag SEMAPHORE_CHANGE set?</summary>
         public bool SemaphoreChange { get; private set; }
+        /// <summary> The name of the texture to use for this light, overriding signal's default </summary>
+        public string LightTextureName { get; private set; } = String.Empty;
 
         /// <summary>
         /// Default constructor used during file parsing.
@@ -917,6 +919,9 @@ public SignalLight(STFReader stf)
                             default: stf.StepBackOneItem(); STFException.TraceInformation(stf, "Skipped unknown SignalLight flag " + stf.ReadString()); break;
                         }
                 }),
+                new STFReader.TokenProcessor("ortssignallighttex", ()=>{
+                    LightTextureName = stf.ReadStringBlock("").ToLowerInvariant();
+                }),
             });
         }
 

Source/RunActivity/Viewer3D/Signals.cs

@@ -374,7 +374,7 @@ void renderEffect(Material material)
                     {
                         frame.AddPrimitive(material, slp, RenderPrimitiveGroup.Lights, ref xnaMatrix, ShapeFlags.None, state);
                     }
-                    renderEffect(SignalTypeData.Material);
+                    renderEffect(slp.Material);
                     if (Viewer.Settings.SignalLightGlow)
                         renderEffect(SignalTypeData.GlowMaterial);
                 }
@@ -465,7 +465,6 @@ public class SignalTypeData
     {
         readonly Viewer Viewer;
 
-        public readonly Material Material;
         public readonly Material GlowMaterial;
 #if DEBUG_SIGNAL_SHAPES
             public readonly SignalTypeDataType Type;
@@ -488,7 +487,6 @@ public SignalTypeData(Viewer viewer, SignalType mstsSignalType)
             if (!viewer.SIGCFG.LightTextures.ContainsKey(mstsSignalType.LightTextureName))
             {
                 Trace.TraceWarning("Skipped invalid light texture {1} for signal type {0}", mstsSignalType.Name, mstsSignalType.LightTextureName);
-                Material = viewer.MaterialManager.Load("missing-signal-light");
 #if DEBUG_SIGNAL_SHAPES
                     Type = SignalTypeDataType.Normal;
 #endif
@@ -498,7 +496,7 @@ public SignalTypeData(Viewer viewer, SignalType mstsSignalType)
             else
             {
                 var mstsLightTexture = viewer.SIGCFG.LightTextures[mstsSignalType.LightTextureName];
-                Material = viewer.MaterialManager.Load("SignalLight", Helpers.GetRouteTextureFile(viewer.Simulator, Helpers.TextureFlags.None, mstsLightTexture.TextureFile));
+                var defaultMaterial = viewer.MaterialManager.Load("SignalLight", Helpers.GetRouteTextureFile(viewer.Simulator, Helpers.TextureFlags.None, mstsLightTexture.TextureFile));
                 GlowMaterial = viewer.MaterialManager.Load("SignalLightGlow");
 #if DEBUG_SIGNAL_SHAPES
                     Type = (SignalTypeDataType)mstsSignalType.FnType;
@@ -535,7 +533,20 @@ public SignalTypeData(Viewer viewer, SignalType mstsSignalType)
                             continue;
                         }
                         var mstsLight = viewer.SIGCFG.LightsTable[mstsSignalLight.Name];
-                        Lights.Add(new SignalLightPrimitive(viewer, new Vector3(-mstsSignalLight.X, mstsSignalLight.Y, mstsSignalLight.Z), mstsSignalLight.Radius, new Color(mstsLight.r, mstsLight.g, mstsLight.b, mstsLight.a), glowDay, glowNight, mstsLightTexture.u0, mstsLightTexture.v0, mstsLightTexture.u1, mstsLightTexture.v1));
+                        var material = defaultMaterial;
+                        if (!string.IsNullOrEmpty(mstsSignalLight.LightTextureName))
+                        {
+                            if (!viewer.SIGCFG.LightTextures.ContainsKey(mstsSignalLight.LightTextureName))
+                            {
+                                Trace.TraceWarning("Skipped invalid light texture {0} for signal light {1} in signal type {2}", mstsSignalLight.LightTextureName, mstsSignalLight.Name, mstsSignalType.Name);
+                            }
+                            else
+                            {
+                                var texture = viewer.SIGCFG.LightTextures[mstsSignalLight.LightTextureName];
+                                material = viewer.MaterialManager.Load("SignalLight", Helpers.GetRouteTextureFile(viewer.Simulator, Helpers.TextureFlags.None, texture.TextureFile));
+                            }
+                        }
+                        Lights.Add(new SignalLightPrimitive(viewer, new Vector3(-mstsSignalLight.X, mstsSignalLight.Y, mstsSignalLight.Z), mstsSignalLight.Radius, new Color(mstsLight.r, mstsLight.g, mstsLight.b, mstsLight.a), glowDay, glowNight, mstsLightTexture.u0, mstsLightTexture.v0, mstsLightTexture.u1, mstsLightTexture.v1, material));
                         LightsSemaphoreChange.Add(mstsSignalLight.SemaphoreChange);
                     }
                 }
@@ -555,7 +566,10 @@ public SignalTypeData(Viewer viewer, SignalType mstsSignalType)
         public void Mark()
         {
             Viewer.SignalTypeDataManager.Mark(this);
-            Material.Mark();
+            foreach (var light in Lights)
+            {
+                light.Mark();
+            }
             GlowMaterial?.Mark();
         }
     }
@@ -647,8 +661,9 @@ public class SignalLightPrimitive : RenderPrimitive
         internal readonly float GlowIntensityDay;
         internal readonly float GlowIntensityNight;
         readonly VertexBuffer VertexBuffer;
+        public readonly Material Material;
 
-        public SignalLightPrimitive(Viewer viewer, Vector3 position, float radius, Color color, float glowDay, float glowNight, float u0, float v0, float u1, float v1)
+        public SignalLightPrimitive(Viewer viewer, Vector3 position, float radius, Color color, float glowDay, float glowNight, float u0, float v0, float u1, float v1, Material material)
         {
             Position = position;
             GlowIntensityDay = glowDay;
@@ -663,13 +678,20 @@ public SignalLightPrimitive(Viewer viewer, Vector3 position, float radius, Color
 
             VertexBuffer = new VertexBuffer(viewer.GraphicsDevice, typeof(VertexPositionColorTexture), verticies.Length, BufferUsage.WriteOnly);
             VertexBuffer.SetData(verticies);
+
+            Material = material;
         }
 
         public override void Draw(GraphicsDevice graphicsDevice)
         {
             graphicsDevice.SetVertexBuffer(VertexBuffer);
             graphicsDevice.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
         }
+
+        public void Mark()
+        {
+            Material.Mark();
+        }
     }
 
     public class SignalLightMaterial : Material