Automatic merge of T1.5.1-794-g4cad06780 and 14 pull requests

- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting
- 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 a055bca: Blueprint/train car operations UI window
- Pull request #885 at 8f94333: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- 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 #897 at 0a9d939: feat: Improved system information collection
- Pull request #899 at 1b09e19: Duplex steam engines - Booster Engine addition
- Pull request #903 at 7353625: Downloading route content (Github, zip)
- Pull request #906 at 5850660: Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -574,6 +574,11 @@ public float TenderCoalMassKG              // Decreased by firing and increased
            0.0f, MathHelper.Pi/2, 0.0f, 0.0f  // default 2 cylinder locomotive
         };
 
+        static float[] BoosterWheelCrankAngleDiffRad = new float[]
+{
+           0.0f, MathHelper.Pi/2, 0.0f, 0.0f  // default 2 cylinder locomotive
+};
+
         public float IndicatedHorsePowerHP;   // Indicated Horse Power (IHP), theoretical power of the locomotive, it doesn't take into account the losses due to friction, etc. Typically output HP will be 70 - 90% of the IHP
         public float DrawbarHorsePowerHP;  // Drawbar Horse Power  (DHP), maximum power available at the wheels.
         public float DrawBarPullLbsF;      // Drawbar pull in lbf
@@ -2136,7 +2141,6 @@ public override void InitializeMoving()
         public override void Update(float elapsedClockSeconds)
         {
             base.Update(elapsedClockSeconds);
-            UpdateFX(elapsedClockSeconds);
 
 #if INDIVIDUAL_CONTROL
             //this train is remote controlled, with mine as a helper, so I need to send the controlling information, but not the force.
@@ -2454,8 +2458,8 @@ private void UpdateFX(float elapsedClockSeconds)
                 // Find 
                 for (int i = 0; i < MSTSNumCylinders; i++)
                 {
-
-                    float normalisedCrankAngleRad = NormalisedCrankAngle(i);
+                    var crankAngleDiffRad = WheelCrankAngleDiffRad[i];
+                    float normalisedCrankAngleRad = NormalisedCrankAngle(i, crankAngleDiffRad);
 
                     // Exhaust crank angle
                     float exhaustCrankAngleRad = 0;
@@ -2518,7 +2522,6 @@ private void UpdateFX(float elapsedClockSeconds)
                         }
                     }
 
-
                     if (MSTSNumCylinders == 4)
                     {
                         // Cylinder Cocks
@@ -2586,8 +2589,6 @@ private void UpdateFX(float elapsedClockSeconds)
                                 CylinderCock42On = true;
                             }
                         }
-
-
                     }
                     else if (MSTSNumCylinders == 3)
                     {
@@ -2639,7 +2640,6 @@ private void UpdateFX(float elapsedClockSeconds)
                                 CylinderCock32On = true;
                             }
                         }
-
                     }
                     else // 2 Cylinders
                     {
@@ -2675,12 +2675,8 @@ private void UpdateFX(float elapsedClockSeconds)
                                 CylinderCock22On = true;
                             }
                         }
-
-
                     }
                 }
-
-
             }
             else if (Cylinder2SteamEffects) // For MSTS locomotives with one cylinder cock ignore calculation of cock opening times.
                                             // Currently retained as a legacy issue, and eventually both this and the MSTS version should be removed
@@ -2709,58 +2705,87 @@ private void UpdateFX(float elapsedClockSeconds)
             // Booster steam exhaust
             if (BoosterCylinderSteamExhaustOn) // For Booster engine
             {
-                var BoosterCylinderSteamExhaustTimePeriodS = 0.5f * 1.0f / DrvWheelRevRpS;  // Calculate how long cylinder cocks open  @ speed = Time (sec) / (Drv Wheel RpS ) - assume two cylinder strokes per rev, ie each cock will only be open for 1/2 rev
-                BoosterCylinderSteamExhaustTimerS += elapsedClockSeconds;
-                if (BoosterCylinderSteamExhaustTimerS > BoosterCylinderSteamExhaustTimePeriodS)
+
+                for (int i = 0; i < 1; i++)
                 {
-                    if (BoosterCylinderSteamExhaust01On)
+                    var crankAngleDiffRad = BoosterWheelCrankAngleDiffRad[i];
+                    float normalisedCrankAngleRad = NormalisedCrankAngle(i, crankAngleDiffRad);
+                    
+                    // Exhaust crank angle
+                    float exhaustCrankAngleRad = 0;
+                    if (normalisedCrankAngleRad <= MathHelper.Pi)
+                    {
+                        exhaustCrankAngleRad = CylinderExhaustOpenFactor * (float)Math.PI;
+                    }
+                    else
                     {
-                        BoosterCylinderSteamExhaust01On = false;
-                        BoosterCylinderSteamExhaust02On = true;
-                        BoosterCylinderSteamExhaustTimerS = 0.0f;  // Reset timer
+                        exhaustCrankAngleRad = CylinderExhaustOpenFactor * (float)Math.PI + (float)Math.PI;
                     }
-                    else if (BoosterCylinderSteamExhaust02On)
+
+                    if (absSpeedMpS > 0.001)
                     {
-                        BoosterCylinderSteamExhaust01On = true;
-                        BoosterCylinderSteamExhaust02On = false;
-                        BoosterCylinderSteamExhaustTimerS = 0.0f;  // Reset timer
+                        if (i == 0 && ((normalisedCrankAngleRad <= MathHelper.Pi && normalisedCrankAngleRad >= exhaustCrankAngleRad) || (normalisedCrankAngleRad < 2 * MathHelper.Pi && normalisedCrankAngleRad >= exhaustCrankAngleRad)))
+                        {
+                            BoosterCylinderSteamExhaust01On = true;
+                        }
+                        else if (i == 0)
+                        {
+                            BoosterCylinderSteamExhaust01On = false;
+                        }
 
+                        else if (i == 1 && ((normalisedCrankAngleRad <= MathHelper.Pi && normalisedCrankAngleRad >= exhaustCrankAngleRad) || (normalisedCrankAngleRad < 2 * MathHelper.Pi && normalisedCrankAngleRad >= exhaustCrankAngleRad)))
+                        {
+                            BoosterCylinderSteamExhaust02On = true;
+                        }
+                        else if (i == 1)
+                        {
+                            BoosterCylinderSteamExhaust02On = false;
+                        }
                     }
                 }
             }
 
             // Booster steam cylinder cock exhaust
             if (BoosterCylinderCocksOn) // For Booster engine
             {
-                var BoosterCylinderCockOpenTimePeriodS = 0.5f * 1.0f / DrvWheelRevRpS;  // Calculate how long cylinder cocks open  @ speed = Time (sec) / (Drv Wheel RpS ) - assume two cylinder strokes per rev, ie each cock will only be open for 1/2 rev
-                BoosterCylinderCockTimerS += elapsedClockSeconds;
-                if (BoosterCylinderCockTimerS > BoosterCylinderCockOpenTimePeriodS)
+
+                for (int i = 0; i < 1; i++)
                 {
-                    if (BoosterCylinderCock11On)
+
+                    var crankAngleDiffRad = BoosterWheelCrankAngleDiffRad[i];
+                    float normalisedCrankAngleRad = NormalisedCrankAngle(i, crankAngleDiffRad);
+
+                    if (i == 0)
                     {
-                        BoosterCylinderCock11On = false;
-                        BoosterCylinderCock12On = true;
-                        BoosterCylinderCockTimerS = 0.0f;  // Reset timer
+                        if (normalisedCrankAngleRad <= MathHelper.Pi)
+                        {
+                            BoosterCylinderCock11On = true;
+                            BoosterCylinderCock12On = false;
+                        }
                     }
-                    else if (BoosterCylinderCock12On)
+                    else
                     {
-                        BoosterCylinderCock11On = true;
-                        BoosterCylinderCock12On = false;
-                        BoosterCylinderCockTimerS = 0.0f;  // Reset timer
-
+                        if (normalisedCrankAngleRad > MathHelper.Pi)
+                        {
+                            BoosterCylinderCock11On = false;
+                            BoosterCylinderCock12On = true;
+                        }
                     }
-
-                    if (BoosterCylinderCock21On)
+                    if (i == 1)
                     {
-                        BoosterCylinderCock21On = false;
-                        BoosterCylinderCock22On = true;
-                  //      BoosterCylinderCockTimerS = 0.0f;  // Reset timer
+                        if (normalisedCrankAngleRad <= MathHelper.Pi)
+                        {
+                            BoosterCylinderCock21On = true;
+                            BoosterCylinderCock22On = false;
+                        }
                     }
-                    else if (BoosterCylinderCock22On)
+                    else
                     {
-                        BoosterCylinderCock21On = true;
-                        BoosterCylinderCock22On = false;
-                   //     BoosterCylinderCockTimerS = 0.0f;  // Reset timer
+                        if (normalisedCrankAngleRad > MathHelper.Pi)
+                        {
+                            BoosterCylinderCock21On = false;
+                            BoosterCylinderCock22On = true;
+                        }
                     }
                 }
             }
@@ -5455,8 +5480,9 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
                             backwardCylinderPosition = crankCylinderPosition;
                         }
 
-                        float normalisedCrankAngleRad = NormalisedCrankAngle(i);
-
+                        var crankAngleDiffRad = WheelCrankAngleDiffRad[i];
+                        float normalisedCrankAngleRad = NormalisedCrankAngle(i, crankAngleDiffRad);
+                        
                         // Crank angles
                         float sin = (float)Math.Sin(crankAngleRad);
                         float cos = (float)Math.Cos(crankAngleRad);
@@ -5776,8 +5802,6 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
             {
                 IsCritTELimit = false; // Reset flag if limiting TE
             }
-
-            SteamEngines[numberofengine].AttachedAxle.DriveForceN = SteamEngines[numberofengine].TractiveForceN / SteamEngines[numberofengine].AttachedAxle.NumberWheelAxles;
         }
 
         /// <summary>
@@ -5795,10 +5819,13 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             // Update tractive effort across all steam engines
             for (int i = 0; i < SteamEngines.Count; i++)
             {
+                ApplyDirectionToTractiveForce(ref SteamEngines[i].TractiveForceN);
+
                 TractiveForceN += SteamEngines[i].TractiveForceN;
 
                 if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics)
                 {
+                    SteamEngines[i].AttachedAxle.DriveForceN = SteamEngines[i].TractiveForceN / SteamEngines[i].AttachedAxle.NumberWheelAxles;
                     UpdateAxleDriveForce();
                     MotiveForceN += SteamEngines[i].AttachedAxle.CompensatedAxleForceN;
                 }
@@ -5816,14 +5843,11 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
                 IndicatedHorsePowerHP += SteamEngines[i].IndicatedHorsePowerHP;
                 IndicatedHorsePowerHP = MathHelper.Clamp(IndicatedHorsePowerHP, 0, IndicatedHorsePowerHP);
 
-
                 //TODO - identify the maximum value for display?? 
                 PistonSpeedFtpMin = SteamEngines[0].PistonSpeedFtpMin;
 
             }
 
-            ApplyDirectionToTractiveForce(ref TractiveForceN);
-
             // Find the maximum TE for debug i.e. @ start and full throttle
             if (absSpeedMpS < 1.0)
             {
@@ -5860,9 +5884,9 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
             /// <summary>
             /// Normalise crank angle so that it is a value between 0 and 360 starting at the real crank angle difference
             /// </summary>
-            private float NormalisedCrankAngle(int cylinderNumber)
+            private float NormalisedCrankAngle(int cylinderNumber, float crankAngleRad)
         {
-            float normalisedCrankAngleRad = (float)MathHelper.WrapAngle((float)LocomotiveAxles[0].AxlePositionRad + WheelCrankAngleDiffRad[cylinderNumber]);
+            float normalisedCrankAngleRad = (float)MathHelper.WrapAngle((float)LocomotiveAxles[0].AxlePositionRad + crankAngleRad);
 
             if (normalisedCrankAngleRad < 0)
             {