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 7a41709: Add Support for Multiple Track Profiles

Author: openrails-bot

Source/RunActivity/Viewer3D/DynamicTrack.cs

@@ -249,8 +249,8 @@ public class TRPFile
         //public RenderProcess RenderProcess; // TODO: Pass this along in function calls
 
         /// <summary>
-        /// Creates a TRPFile instance from a track profile file (XML or STF) or canned.
-        /// (Precedence is XML [.XML], STF [.DAT], default [canned]).
+        /// Creates a List<TRPFile></TRPFile> instance from a set of track profile file(s)
+        /// (XML or STF) or canned. (Precedence is XML [.XML], STF [.DAT], default [canned]).
         /// </summary>
         /// <param name="viewer">Viewer.</param>
         /// <param name="routePath">Path to route.</param>
@@ -263,14 +263,36 @@ public static void CreateTrackProfile(Viewer viewer, string routePath, out List<
 
             if (Directory.Exists(path))
             {
+                // The file called "TrProfile" should be used as the default track profile, if present
+                string xmlDefault = path + @"\TrProfile.xml";
+                string stfDefault = path + @"\TrProfile.stf";
+
+                if (File.Exists(xmlDefault))
+                {
+                    trpFiles.Add(new TRPFile(viewer, xmlDefault));
+                    profileNames.Add(Path.GetFileNameWithoutExtension(xmlDefault));
+                }
+                else if (File.Exists(stfDefault))
+                {
+                    trpFiles.Add(new TRPFile(viewer, stfDefault));
+                    profileNames.Add(Path.GetFileNameWithoutExtension(stfDefault));
+                }
+                else // Add the canned (Kuju) track profile if no default is given
+                    trpFiles.Add(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));
+                    string xmlName = Path.GetFileNameWithoutExtension(xmlProfile);
+                    // Don't try to add the default track profile twice
+                    if (!profileNames.Contains(xmlName))
+                    {
+                        trpFiles.Add(new TRPFile(viewer, xmlProfile));
+                        profileNames.Add(xmlName);
+                    }
                 }
                 foreach (string stfProfile in stfProfiles)
                 {
@@ -284,7 +306,7 @@ public static void CreateTrackProfile(Viewer viewer, string routePath, out List<
                 }
             }
 
-            // Add default profile only if no other profiles were added
+            // Add canned profile if no profiles were found
             if (trpFiles.Count <= 0)
                 trpFiles.Add(new TRPFile(viewer, ""));
 

Source/RunActivity/Viewer3D/Scenery.cs

@@ -678,28 +678,30 @@ public static int GetBestTrackProfile(Viewer viewer, SharedShape shape)
                 TRPFile.CreateTrackProfile(viewer, viewer.Simulator.RoutePath, out viewer.TRPs);
             }
 
-            float score = 0;
+            float score = float.NegativeInfinity;
             int bestIndex = -1;
             for (int i = 0; i < viewer.TRPs.Count; i++)
             {
-                
                 float prevScore = score;
+                score = 0;
                 // 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;
+                    else // Slight bias against track profiles with extra textures defined
+                        score -= 0.05f;
                 }
                 foreach (string image in shape.ImageNames)
                 {
-                    // Bias against track profiles that are missing textures
+                    // Strong 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;
+                else
+                    score = prevScore;
             }
 
             if (bestIndex < 0)