Automatic merge of T1.6-104-gfe3b901f2 and 13 pull requests

- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1115 at cb97e1d: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1161 at 6cfe4e2: Fix string trim in .ini files
- Pull request #1162 at 2516cce: specifies precedence of DDS over ACE
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul
- Pull request #1160 at 9dc6b3b: Route Based TTrack Sounds

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -1924,84 +1924,84 @@ public float GetAngleofAttackmRad()
         ///
         public float GetTrackSwitchTrigger(float elapsedClockSeconds)
         {
-    
-                // Timer to hold trigger on for a period of time
-                if (carOnSwitchTriggered)
-                    {
-        switchTriggerDelayedS -= elapsedClockSeconds;
-                        if (switchTriggerDelayedS < 0)
-            switchTriggerDelayedS = 0;
-                    }
-    
-                if (IsOverSwitch && !carOnSwitchTriggered)
-                    {
-        carOnSwitchTriggered = true;
-                        return 1; // Set trigger for car on switch
-                    }
-                else if (!IsOverSwitch && switchTriggerDelayedS == 0 && carOnSwitchTriggered)
-                    {
-        carOnSwitchTriggered = false;
-        switchTriggerDelayedS = 0.1f;
-                        return 0; // Reset trigger when off
-                    }
-                else if (carOnSwitchTriggered && switchTriggerDelayedS > 0)
-                    {
-                        return 1; // ensure trigger stays on until time out
-                    }
-    
-                return 0; // default if no result found
+
+            // Timer to hold trigger on for a period of time
+            if (carOnSwitchTriggered)
+            {
+                switchTriggerDelayedS -= elapsedClockSeconds;
+                if (switchTriggerDelayedS < 0)
+                    switchTriggerDelayedS = 0;
             }
 
+            if (IsOverSwitch && !carOnSwitchTriggered)
+            {
+                carOnSwitchTriggered = true;
+                return 1; // Set trigger for car on switch
+            }
+            else if (!IsOverSwitch && switchTriggerDelayedS == 0 && carOnSwitchTriggered)
+            {
+                carOnSwitchTriggered = false;
+                switchTriggerDelayedS = 0.1f;
+                return 0; // Reset trigger when off
+            }
+            else if (carOnSwitchTriggered && switchTriggerDelayedS > 0)
+            {
+                return 1; // ensure trigger stays on until time out
+            }
+
+            return 0; // default if no result found
+        }
+
         /// <summary>
         /// Get the track joint trigger for a car as it goes over a joint
         /// </summary>
         /// <returns>1 = track joint, 0 = no track joint</returns>
         ///
         public float GetTrackJointPosition(float elapsedClockSeconds)
         {
-                if ((float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM == 0)
+            if ((float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM == 0)
+            {
+                return 0; // Rail joints have not been selected
+            }
+            else
+            {
+                // Calculate remaining distance beween track joints
+                realTimeTrackJointDistanceM -= AbsSpeedMpS * elapsedClockSeconds;
+                if (realTimeTrackJointDistanceM < 0)
+                    realTimeTrackJointDistanceM = 0;
+                if (realTimeTrackJointDistanceM == 0)
+                {
+                    jointTrigger = 1;
+                    carOnJointTriggered = true;
+                    jointTriggerDelayedS -= elapsedClockSeconds;
+                    if (jointTriggerDelayedS < 0)
+                        jointTriggerDelayedS = 0;
+                }
+                else
+                {
+                    jointTrigger = 0;
+                }
+                if (jointTrigger == 1 && jointTriggerDelayedS == 0)
+                {
+                    jointTriggerDelayedS = 0.1f; // Ensure enough delay to trigger sound
+                    jointTrigger = 0;
+                    // To ensure that track joints are never closer then 1 sec apart set to speedmps when distance traveled in 1 sec is greater then the joint distance.
+                    if (AbsSpeedMpS > (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM)
                     {
-                        return 0; // Rail joints have not been selected
+                        realTimeTrackJointDistanceM = AbsSpeedMpS;
+                        jointSpeedMpS = AbsSpeedMpS;
                     }
-                else
+                    else
                     {
-                        // Calculate remaining distance beween track joints
-        realTimeTrackJointDistanceM -= AbsSpeedMpS * elapsedClockSeconds;
-                        if (realTimeTrackJointDistanceM < 0)
-            realTimeTrackJointDistanceM = 0;
-                        if (realTimeTrackJointDistanceM == 0)
-                            {
-            jointTrigger = 1;
-            carOnJointTriggered = true;
-            jointTriggerDelayedS -= elapsedClockSeconds;
-                                if (jointTriggerDelayedS < 0)
-                jointTriggerDelayedS = 0;
-                            }
-                        else
-                            {
-            jointTrigger = 0;
-                            }
-                        if (jointTrigger == 1 && jointTriggerDelayedS == 0)
-                            {
-            jointTriggerDelayedS = 0.1f; // Ensure enough delay to trigger sound
-            jointTrigger = 0;
-                                // To ensure that track joints are never closer then 1 sec apart set to speedmps when distance traveled in 1 sec is greater then the joint distance.
-                                if (AbsSpeedMpS > (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM)
-                                    {
-                realTimeTrackJointDistanceM = AbsSpeedMpS;
-                jointSpeedMpS = AbsSpeedMpS;
-                                    }
-                                else
-                                    {
-                realTimeTrackJointDistanceM = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM; // Reset for next pass
-                jointSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM;
-                                    }
-            carOnJointTriggered = false;
-                            }
-        
-                        return jointTrigger;
+                        realTimeTrackJointDistanceM = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM; // Reset for next pass
+                        jointSpeedMpS = (float)Simulator.TRK.Tr_RouteFile.DistanceBetweenTrackJointsM;
                     }
-          }
+                    carOnJointTriggered = false;
+                }
+
+                return jointTrigger;
+            }
+        }
 
 
 /// <summary>
@@ -2906,7 +2906,7 @@ public void SetUpWheels()
                 }
             }
             // Using WheelAxles.Count test to control WheelAxlesLoaded flag.
-            if (WheelAxles.Count > 2)
+            if (WheelAxles.Count >= 2) // Some cars only have two axles.
             {
                 WheelAxles.Sort(WheelAxles[0]);
                 WheelAxlesLoaded = true;

Source/RunActivity/Viewer3D/Sound.cs

@@ -1283,7 +1283,6 @@ public SoundStream(Orts.Formats.Msts.SMSStream mstsStream, Events.Source eventSo
                     {
                         Triggers.Add(new ORTSJoint8AxleTrigger(this, (Orts.Formats.Msts.Joint_Trigger_8)trigger));
                     }
-
                     else if (trigger.GetType() == typeof(Orts.Formats.Msts.Switch_Trigger_2) && soundSource.Car != null)
                     {
                         Triggers.Add(new ORTSSwitch2AxleTrigger(this, (Orts.Formats.Msts.Switch_Trigger_2)trigger));