Automatic merge of T1.5.1-1197-g092fac25e3 and 16 pull requests

- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #885 at 8f473ce: feat: Add notifications to Menu
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at e715fa4: Multiple Track Profiles & Superelevation Improvements
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains
- Pull request #980 at a7406de: Downloading route content (Github, zip) second part 
- Pull request #900 at c27f32d: DMI updates
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #981 at c1f4301: Multiple type trainset lightglows

Author: openrails-bot

Source/Orts.Formats.Msts/LightCollection.cs

@@ -346,6 +346,7 @@ public class Light
         public float FadeOut;
         public List<LightState> States = new List<LightState>();
         public List<LightCondition> Conditions = new List<LightCondition>();
+        public string Graphic;
 
         public Light(int index, STFReader stf)
         {
@@ -373,6 +374,7 @@ public Light(int index, STFReader stf)
                 }),
                 new STFReader.TokenProcessor("shapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("shapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null).ToUpper(); }),
+                new STFReader.TokenProcessor("ortsgraphic", ()=>{ Graphic = stf.ReadStringBlock(null).ToUpper(); }),
             });
         }
 
@@ -401,6 +403,7 @@ public Light(Light light, bool reverse)
     public class LightCollection
     {
         public List<Light> Lights = new List<Light>();
+        public string GeneralLightGlowGraphic = "LightGlow.png";
 
         // Array of bools, one per type of condition in the same order as presented in the 'LightCondition' class
         // A 'true' indicates all lights in this set ignore the corresponding condition, so we don't need to waste time thinking about it
@@ -411,7 +414,8 @@ public LightCollection(STFReader stf)
         {
             stf.MustMatch("(");
             stf.ReadInt(null); // count; ignore this because its not always correct
-            stf.ParseBlock(new[] {
+            stf.ParseBlock(new[]{
+                new STFReader.TokenProcessor("ortsgraphic", ()=>{ GeneralLightGlowGraphic = stf.ReadStringBlock("Lightglow.png").ToUpper(); }),
                 new STFReader.TokenProcessor("light", ()=>{ Lights.Add(new Light(Lights.Count, stf)); }),
             });
             if (Lights.Count == 0)

Source/RunActivity/Content/LightGlow.png

@@ -462,6 +462,9 @@
     <Content Include="Content\LightGlow.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\ORTSLightGlow.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Loading.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Source/RunActivity/Content/ORTSLightGlow.png

@@ -36,6 +36,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 
 namespace Orts.Viewer3D
@@ -89,8 +90,8 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
             Viewer = viewer;
             Car = car;
             CarViewer = carViewer;
-
-            LightGlowMaterial = viewer.MaterialManager.Load("LightGlow");
+            
+            LightGlowMaterial = viewer.MaterialManager.Load("LightGlow", DefineFullTexturePath(Car.Lights.GeneralLightGlowGraphic));
             LightConeMaterial = viewer.MaterialManager.Load("LightCone");
 
             UpdateState();
@@ -102,6 +103,8 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
                     {
                         case LightType.Glow:
                             LightPrimitives.Add(new LightGlowPrimitive(this, Viewer.RenderProcess, light));
+                            if (light.Graphic != null)
+                                (LightPrimitives.Last() as LightGlowPrimitive).SpecificGlowMaterial = viewer.MaterialManager.Load("LightGlow", DefineFullTexturePath(light.Graphic));
                             break;
                         case LightType.Cone:
                             LightPrimitives.Add(new LightConePrimitive(this, Viewer.RenderProcess, light));
@@ -149,6 +152,15 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
             UpdateActiveLightCone();
         }
 
+        string DefineFullTexturePath(string textureName)
+        {
+            if (File.Exists(Path.Combine(Path.GetDirectoryName(Car.WagFilePath), textureName)))
+                return Path.Combine(Path.GetDirectoryName(Car.WagFilePath), textureName);
+            if (File.Exists(Path.Combine(Viewer.ContentPath, textureName)))
+                return Path.Combine(Viewer.ContentPath, textureName);
+            return Path.Combine(Viewer.ContentPath, "LightGlow.png");
+        }
+
         void UpdateActiveLightCone()
         {
             var newLightCone = (LightConePrimitive)LightPrimitives.FirstOrDefault(lm => lm is LightConePrimitive && lm.Enabled);
@@ -220,9 +232,9 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                     if ((lightPrimitive.Enabled || lightPrimitive.FadeOut) && lightPrimitive is LightGlowPrimitive)
                     {
                         if (ShapeXNATranslations.TryGetValue(lightPrimitive.Light.ShapeIndex, out Matrix lightMatrix))
-                            frame.AddPrimitive(LightGlowMaterial, lightPrimitive, RenderPrimitiveGroup.Lights, ref lightMatrix);
+                            frame.AddPrimitive(lightPrimitive.Light.Graphic != null ? (lightPrimitive as LightGlowPrimitive).SpecificGlowMaterial : LightGlowMaterial, lightPrimitive, RenderPrimitiveGroup.Lights, ref lightMatrix);
                         else
-                            frame.AddPrimitive(LightGlowMaterial, lightPrimitive, RenderPrimitiveGroup.Lights, ref xnaDTileTranslation);
+                            frame.AddPrimitive(lightPrimitive.Light.Graphic != null ? (lightPrimitive as LightGlowPrimitive).SpecificGlowMaterial : LightGlowMaterial, lightPrimitive, RenderPrimitiveGroup.Lights, ref xnaDTileTranslation);
                     }
 
 #if DEBUG_LIGHT_CONE
@@ -252,6 +264,11 @@ public void Mark()
         {
             LightGlowMaterial.Mark();
             LightConeMaterial.Mark();
+            foreach (var lightPrimitive in LightPrimitives)
+                if (lightPrimitive is LightGlowPrimitive && lightPrimitive.Light.Graphic != null)
+                {
+                    (lightPrimitive as LightGlowPrimitive).SpecificGlowMaterial.Mark();
+                 }
         }
 
         public static void CalculateLightCone(LightState lightState, out Vector3 position, out Vector3 direction, out float angle, out float radius, out float distance, out Vector4 color)
@@ -680,6 +697,7 @@ public class LightGlowPrimitive : LightPrimitive
         static VertexDeclaration VertexDeclaration;
         VertexBuffer VertexBuffer;
         static IndexBuffer IndexBuffer;
+        public Material SpecificGlowMaterial;
 
         public LightGlowPrimitive(LightViewer lightViewer, RenderProcess renderProcess, Light light)
             : base(light)
@@ -932,11 +950,11 @@ public class LightGlowMaterial : Material
     {
         readonly Texture2D LightGlowTexture;
 
-        public LightGlowMaterial(Viewer viewer)
-            : base(viewer, null)
+        public LightGlowMaterial(Viewer viewer, string textureName)
+            : base(viewer, textureName)
         {
             // TODO: This should happen on the loader thread.
-            LightGlowTexture = SharedTextureManager.Get(Viewer.RenderProcess.GraphicsDevice, System.IO.Path.Combine(Viewer.ContentPath, "Lightglow.png"));
+            LightGlowTexture = SharedTextureManager.Get(Viewer.RenderProcess.GraphicsDevice, textureName);
         }
 
         public override void SetState(GraphicsDevice graphicsDevice, Material previousMaterial)

Source/RunActivity/RunActivity.csproj

@@ -360,7 +360,7 @@ public Material Load(string materialName, string textureName = null, int options
                         Materials[materialKey] = new LightConeMaterial(Viewer);
                         break;
                     case "LightGlow":
-                        Materials[materialKey] = new LightGlowMaterial(Viewer);
+                        Materials[materialKey] = new LightGlowMaterial(Viewer, textureName);
                         break;
                     case "PopupWindow":
                         Materials[materialKey] = new PopupWindowMaterial(Viewer);