Automatic merge of T1.5.1-997-gb5992851e1 and 19 pull requests

- 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 #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at b3f83ed: Blueprint/train car operations UI window
- Pull request #885 at 56c17fb: 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 #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 3e390b8: Downloading route content (Github, zip)
- Pull request #912 at 359cfee: New Triple Valve Features Vol. 2
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #946 at 66f836c: Advanced track sounds
- Pull request #949 at 1985cbe: Oil Burning Locomotive
- Pull request #950 at a98ff62: Ctrl-F5 showing yellow rectangles where mouse left button is active
- Pull request #951 at 486081b: fix: Fix watchdog process state name
- Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1
- Pull request #953 at 9b0ec01: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at 23cff01: Add Support for Multiple Track Profiles

Author: openrails-bot

Source/Orts.Formats.Msts/TrackDatabaseFile.cs

@@ -794,6 +794,8 @@ public class TrVectorSection
 
         /// <summary>??? (needed for ActivityEditor, but not used here, so why is it defined here?)</summary>
         public bool Reduced { get; set; }
+        /// <summary>The index of the track profile suitable for this section</summary>
+        public int TRPIndex { get; set; } = -1;
 
         /// <summary>
         /// Default constructor used during file parsing.

Source/RunActivity/Viewer3D/DynamicTrack.cs

@@ -130,21 +130,13 @@ public class DynamicTrackViewer
         WorldPosition worldPosition;
         public DynamicTrackPrimitive Primitive;
 
-        public DynamicTrackViewer(Viewer viewer, DyntrackObj dtrack, WorldPosition position, WorldPosition endPosition)
+        public DynamicTrackViewer(Viewer viewer, DyntrackObj dtrack, WorldPosition position, WorldPosition endPosition, int trpIndex = 0)
         {
             Viewer = viewer;
             worldPosition = position;
 
-            if (viewer.TRP == null)
-            {
-                // First to need a track profile creates it
-                Trace.Write(" TRP");
-                // Creates profile and loads materials into SceneryMaterials
-                TRPFile.CreateTrackProfile(viewer, viewer.Simulator.RoutePath, out viewer.TRP);
-            }
-
             // Instantiate classes
-            Primitive = new DynamicTrackPrimitive(Viewer, dtrack, worldPosition, endPosition);
+            Primitive = new DynamicTrackPrimitive(Viewer, dtrack, worldPosition, endPosition, trpIndex);
         }
 
         public DynamicTrackViewer(Viewer viewer, WorldPosition position, WorldPosition endPosition)
@@ -219,6 +211,26 @@ public void Mark()
             foreach (LOD lod in Primitive.TrProfile.LODs)
                 lod.Mark();
         }
+
+        /// <summary>
+        /// Returns the index of the track profile that best suits the given TrVectorSection
+        /// The result is cached in the section object for future use
+        /// </summary>
+        /// <returns>Index of viewer.TRPs</returns>
+        public static int GetBestTrackProfile(Viewer viewer, TrVectorSection trSection)
+        {
+            string shapeName = "";
+            if (viewer.Simulator.TSectionDat.TrackShapes.ContainsKey(trSection.ShapeIndex))
+                shapeName = viewer.Simulator.TSectionDat.TrackShapes.Get(trSection.ShapeIndex).FileName;
+
+            viewer.TrackProfileIndicies.TryGetValue(shapeName, out int trpIndex);
+
+            trSection.TRPIndex = trpIndex;
+            return trpIndex;
+        }
+        // Note: Dynamic track objects will ALWAYS use TRPIndex = 0
+        // This is because dynamic tracks don't have shapes, and as such lack the information needed
+        // to select a specific track profile.
     }
 
     // A track profile consists of a number of groups used for LOD considerations.  There are LODs,
@@ -242,26 +254,40 @@ public class TRPFile
         /// </summary>
         /// <param name="viewer">Viewer.</param>
         /// <param name="routePath">Path to route.</param>
-        /// <param name="trpFile">TRPFile created (out).</param>
-        public static void CreateTrackProfile(Viewer viewer, string routePath, out TRPFile trpFile)
+        /// <param name="trpFiles">List of TRPFile(s) created (out).</param>
+        public static void CreateTrackProfile(Viewer viewer, string routePath, out List<TRPFile> trpFiles)
         {
             string path = routePath + @"\TrackProfiles";
-            //Establish default track profile
-            if (Directory.Exists(path) && File.Exists(path + @"\TrProfile.xml"))
-            {
-                // XML-style
-                trpFile = new TRPFile(viewer, path + @"\TrProfile.xml");
-            }
-            else if (Directory.Exists(path) && File.Exists(path + @"\TrProfile.stf"))
-            {
-                // MSTS-style
-                trpFile = new TRPFile(viewer, path + @"\TrProfile.stf");
-            }
-            else
+            List<string> profileNames = new List<string>();
+            trpFiles = new List<TRPFile>();
+
+            if (Directory.Exists(path))
             {
-                // default
-                trpFile = new TRPFile(viewer, "");
+                // Get all .xml/.stf files that start with "TrProfile"
+                string[] xmlProfiles = Directory.GetFiles(path, "TrProfile*.xml");
+                string[] stfProfiles = Directory.GetFiles(path, "TrProfile*.stf");
+
+                foreach (string xmlProfile in xmlProfiles)
+                {
+                    trpFiles.Add(new TRPFile(viewer, xmlProfile));
+                    profileNames.Add(Path.GetFileNameWithoutExtension(xmlProfile));
+                }
+                foreach (string stfProfile in stfProfiles)
+                {
+                    string stfName = Path.GetFileNameWithoutExtension(stfProfile);
+                    // If an .stf profile and .xml profile have the same name, prefer the xml profile
+                    if (!profileNames.Contains(stfName))
+                    {
+                        trpFiles.Add(new TRPFile(viewer, stfProfile));
+                        profileNames.Add(stfName);
+                    }
+                }
             }
+
+            // Add default profile only if no other profiles were added
+            if (trpFiles.Count <= 0)
+                trpFiles.Add(new TRPFile(viewer, ""));
+
             // FOR DEBUGGING: Writes XML file from current TRP
             //TRP.TrackProfile.SaveAsXML(@"C:/Users/Walt/Desktop/TrProfile.xml");
         }
@@ -390,6 +416,7 @@ public class TrProfile
         public PitchControls PitchControl = PitchControls.None; // Method of control for profile replication pitch
         public float PitchControlScalar; // Scalar parameter for PitchControls
         public ArrayList LODs = new ArrayList(); // Array of Levels-Of-Detail
+        public List<string> Images = new List<string>();
 
         /// <summary>
         /// Enumeration of LOD control methods
@@ -552,6 +579,17 @@ public TrProfile(Viewer viewer)
 
             lod.LODItems.Add(lodItem); // Append this LODItem to LODItems array
             LODs.Add(lod); // Append this LOD to LODs array
+
+            // Add textures
+            foreach (LOD level in LODs)
+            {
+                foreach (LODItem item in level.LODItems)
+                {
+                    string texFileName = Path.GetFileNameWithoutExtension(item.TexName);
+                    if (!Images.Contains(texFileName))
+                        Images.Add(texFileName);
+                }
+            }
         }
 
         /// <summary>
@@ -571,7 +609,20 @@ public TrProfile(Viewer viewer, STFReader stf)
                 new STFReader.TokenProcessor("lod", ()=> { LODs.Add(new LOD(viewer, stf)); }),
             });
 
-            if (LODs.Count == 0) throw new Exception("missing LODs");
+            if (LODs.Count == 0)
+                throw new Exception("missing LODs");
+            else // Add textures
+            {
+                foreach (LOD level in LODs)
+                {
+                    foreach (LODItem item in level.LODItems)
+                    {
+                        string texFileName = Path.GetFileNameWithoutExtension(item.TexName);
+                        if (!Images.Contains(texFileName))
+                            Images.Add(texFileName);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -649,7 +700,20 @@ public TrProfile(Viewer viewer, XmlReader reader)
                     }
                 }
             }
-            if (LODs.Count == 0) throw new Exception("missing LODs");
+            if (LODs.Count == 0)
+                throw new Exception("missing LODs");
+            else // Add textures
+            {
+                foreach (LOD level in LODs)
+                {
+                    foreach (LODItem item in level.LODItems)
+                    {
+                        string texFileName = Path.GetFileNameWithoutExtension(item.TexName);
+                        if (!Images.Contains(texFileName))
+                            Images.Add(texFileName);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -986,7 +1050,7 @@ public DynamicTrackPrimitive()
         /// Constructor.
         /// </summary>
         public DynamicTrackPrimitive(Viewer viewer, DyntrackObj track, WorldPosition worldPosition,
-                                WorldPosition endPosition)
+                                WorldPosition endPosition, int trpIndex = 0)
         {
             // DynamicTrackPrimitive is responsible for creating a mesh for a section with a single subsection.
             // It also must update worldPosition to reflect the end of this subsection, subsequently to
@@ -1013,7 +1077,7 @@ public DynamicTrackPrimitive(Viewer viewer, DyntrackObj track, WorldPosition wor
 
             XNAEnd = endPosition.XNAMatrix.Translation;
 
-            TrProfile = viewer.TRP.TrackProfile;
+            TrProfile = viewer.TRPs[trpIndex].TrackProfile;
             // Count all of the LODItems in all the LODs
             int count = 0;
             for (int i = 0; i < TrProfile.LODs.Count; i++)

Source/RunActivity/Viewer3D/Scenery.cs

@@ -367,24 +367,34 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                         // We might not have found the junction node; if so, fall back to the static track shape.
                         if (trJunctionNode != null)
                         {
-                            if (viewer.Simulator.UseSuperElevation > 0) SuperElevationManager.DecomposeStaticSuperElevation(viewer, dTrackList, trackObj, worldMatrix, TileX, TileZ, shapeFilePath);
-                            sceneryObjects.Add(new SwitchTrackShape(viewer, shapeFilePath, worldMatrix, trJunctionNode));
+                            if (viewer.Simulator.UseSuperElevation > 0)
+                                SuperElevationManager.DecomposeStaticSuperElevation(viewer, dTrackList, trackObj, worldMatrix, TileX, TileZ, shapeFilePath);
+                            var newScenery = new SwitchTrackShape(viewer, shapeFilePath, worldMatrix, trJunctionNode);
+                            sceneryObjects.Add(newScenery);
+
+                            string newShapeName = Path.GetFileName(newScenery.SharedShape.FilePath);
+                            if (!viewer.TrackProfileIndicies.ContainsKey(newShapeName))
+                                viewer.TrackProfileIndicies.Add(newShapeName, GetBestTrackProfile(viewer, newScenery.SharedShape));
                         }
                         else
                         {
                             //if want to use super elevation, we will generate tracks using dynamic tracks
                             if (viewer.Simulator.UseSuperElevation > 0
                                 && SuperElevationManager.DecomposeStaticSuperElevation(viewer, dTrackList, trackObj, worldMatrix, TileX, TileZ, shapeFilePath))
                             {
-                                //var success = SuperElevation.DecomposeStaticSuperElevation(viewer, dTrackList, trackObj, worldMatrix, TileX, TileZ, shapeFilePath);
-                                //if (success == 0) sceneryObjects.Add(new StaticTrackShape(viewer, shapeFilePath, worldMatrix));
+                                // Need to load the static shape file to determine which track profile to use
+                                var superelevatedShape = viewer.ShapeManager.Get(shapeFilePath);
+
+                                string newShapeName = Path.GetFileName(superelevatedShape.FilePath);
+                                if (!viewer.TrackProfileIndicies.ContainsKey(newShapeName))
+                                    viewer.TrackProfileIndicies.Add(newShapeName, GetBestTrackProfile(viewer, superelevatedShape));
                             }
                             //otherwise, use shapes
                             else if (!containsMovingTable) sceneryObjects.Add(new StaticTrackShape(viewer, shapeFilePath, worldMatrix));
                             else
                             {
                                 var found = false;
-                                foreach (var movingTable in Program.Simulator.            MovingTables)
+                                foreach (var movingTable in Program.Simulator.MovingTables)
                                 {
                                     if (worldObject.UID == movingTable.UID && WFileName == movingTable.WFile)
                                     {
@@ -420,6 +430,14 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                     }
                     else if (worldObject.GetType() == typeof(DyntrackObj))
                     {
+                        if (viewer.TRPs == null)
+                        {
+                            // First to need a track profile creates it
+                            Trace.Write(" TRP");
+                            // Creates profile and loads materials into SceneryMaterials
+                            TRPFile.CreateTrackProfile(viewer, viewer.Simulator.RoutePath, out viewer.TRPs);
+                        }
+
                         if (viewer.Simulator.Settings.Wire == true && viewer.Simulator.TRK.Tr_RouteFile.Electrified == true)
                             Wire.DecomposeDynamicWire(viewer, dTrackList, (DyntrackObj)worldObject, worldMatrix);
                         // Add DyntrackDrawers for individual subsections
@@ -646,6 +664,50 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 forest.PrepareFrame(frame, elapsedTime);
         }
 
+        /// <summary>
+        /// Determines the index of the track profile that would be the most suitable replacement
+        /// for the given shared shape object.
+        /// </summary>
+        public static int GetBestTrackProfile(Viewer viewer, SharedShape shape)
+        {
+            if (viewer.TRPs == null)
+            {
+                // First to need a track profile creates it
+                Trace.Write(" TRP");
+                // Creates profile and loads materials into SceneryMaterials
+                TRPFile.CreateTrackProfile(viewer, viewer.Simulator.RoutePath, out viewer.TRPs);
+            }
+
+            float score = 0;
+            int bestIndex = -1;
+            for (int i = 0; i < viewer.TRPs.Count; i++)
+            {
+                
+                float prevScore = score;
+                // Default behavior: Attempt to match track shape to track profile using texture names alone
+                foreach (string image in viewer.TRPs[i].TrackProfile.Images)
+                {
+                    if (shape.ImageNames.Contains(image, StringComparer.InvariantCultureIgnoreCase))
+                        score++;
+                    else // Slight bias to prefer track profiles with more textures defined
+                        score += 0.05f;
+                }
+                foreach (string image in shape.ImageNames)
+                {
+                    // Bias against track profiles that are missing textures
+                    if (!viewer.TRPs[i].TrackProfile.Images.Contains(image, StringComparer.InvariantCultureIgnoreCase))
+                        score -= 0.25f;
+                }
+                if (score > prevScore)
+                    bestIndex = i;
+            }
+
+            if (bestIndex < 0)
+                return 0;
+            else
+                return bestIndex;
+        }
+
         /// <summary>
         /// MSTS WFiles represent some location with a position, quaternion and tile coordinates
         /// This converts it to the ORTS WorldPosition representation

Source/RunActivity/Viewer3D/Shapes.cs

@@ -1960,6 +1960,7 @@ public class SharedShape : IDisposable
 
         // This data is common to all instances of the shape
         public List<string> MatrixNames = new List<string>();
+        public List<string> ImageNames; // Names of textures without paths or file extensions
         public Matrix[] Matrices = new Matrix[0];  // the original natural pose for this shape - shared by all instances
         public animations Animations;
         public LodControl[] LodControls;
@@ -2044,6 +2045,8 @@ void LoadContent()
             }
             Animations = sFile.shape.animations;
 
+            ImageNames = new List<string>(sFile.shape.images.ConvertAll(img => Path.GetFileNameWithoutExtension(img)));
+
 #if DEBUG_SHAPE_HIERARCHY
             var debugShapeHierarchy = new StringBuilder();
             debugShapeHierarchy.AppendFormat("Shape {0}:\n", Path.GetFileNameWithoutExtension(FilePath).ToUpper());