Automatic merge of T1.5.1-870-ge0bf062eb and 16 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 9c456aa: 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 42f1dd9: feat: Improved system information collection
- Pull request #903 at 9bead33: Downloading route content (Github, zip)
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #912 at d595703: New Triple Valve Features Vol. 2
- Pull request #914 at 30fd5c4: Adjustments to Duplex steam
- Pull request #915 at 6d911d7: Correct calculation error with curve friction
- Pull request #917 at a948dbe: Lighting Configuration Enhancements

Author: openrails-bot

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

@@ -2000,9 +2000,9 @@ public override void Initialize()
                     MaxIndicatedHorsePowerHP += SteamEngines[i].MaxIndicatedHorsePowerHP;
                 }
 
-                if (SteamEngines[i].ExcessWheelBalanceLbs == 0)
+                if (SteamEngines[i].ExcessRodBalanceLbs == 0)
                 {
-                    SteamEngines[i].ExcessWheelBalanceLbs = 440f; // set to a default value.
+                    SteamEngines[i].ExcessRodBalanceLbs = 440f; // set to a default value.
                 }
 
                 // For light locomotives reduce the weight of the various connecting rods, as the default values are for larger locomotives. This will reduce slip on small locomotives
@@ -2012,12 +2012,12 @@ public override void Initialize()
                 if (MassKG < Kg.FromTUS(10))
                 {
                     const float reductionfactor = 0.2f;
-                    SteamEngines[i].ExcessWheelBalanceLbs *= reductionfactor;
+                    SteamEngines[i].ExcessRodBalanceLbs *= reductionfactor;
                 }
                 else if (MassKG < Kg.FromTUS(20))
                 {
                     const float reductionfactor = 0.3f;
-                    SteamEngines[i].ExcessWheelBalanceLbs *= reductionfactor;
+                    SteamEngines[i].ExcessRodBalanceLbs *= reductionfactor;
                 }
             }
 
@@ -5980,7 +5980,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
                         float verticalThrustForcelbf = effectiveRotationalForcelbf * verticalThrustFactor;
 
                         // Calculate Excess Balance
-                        float excessBalanceForcelbf = inertiaSpeedCorrectionFactor * SteamEngines[numberofengine].ExcessWheelBalanceLbs * sin;
+                        float excessBalanceForcelbf = inertiaSpeedCorrectionFactor * SteamEngines[numberofengine].ExcessRodBalanceLbs * sin;
 
                         // Hammer (dynamic) force due to the rotation of the wheels is calculated  
                         // From The Steam Locomotive by Ralph Johnson (pg 276 ) - 
@@ -5990,11 +5990,14 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
 
                         if (SteamEngines[numberofengine].AuxiliarySteamEngineType != SteamEngine.AuxiliarySteamEngineTypes.Booster)
                         {
-                            SteamEngines[numberofengine].HammerForceLbs = (1.6047f * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) * SteamEngines[numberofengine].ExcessWheelBalanceLbs * (float)Math.Pow(MpS.ToMpH(absSpeedMpS), 2)) / ((float)Math.Pow(Me.ToIn(2.0f * SteamEngines[numberofengine].AttachedAxle.WheelRadiusM), 2) * SteamEngines[numberofengine].AttachedAxle.NumWheelsetAxles);
+                            // calculate the balance force per wheel
+                            var excessBalanceForceWheelLbs = SteamEngines[numberofengine].ExcessRodBalanceLbs / SteamEngines[numberofengine].AttachedAxle.NumWheelsetAxles;
 
                             // weight on each individual wheel, rather then each axle
                             var wheelWeight = SteamEngines[numberofengine].AttachedAxle.WheelWeightKg / (SteamEngines[numberofengine].AttachedAxle.NumWheelsetAxles * 2f);
 
+                            SteamEngines[numberofengine].HammerForceLbs = (1.6047f * Me.ToIn(SteamEngines[numberofengine].CylindersStrokeM) * excessBalanceForceWheelLbs * (float)Math.Pow(MpS.ToMpH(absSpeedMpS), 2)) / ((float)Math.Pow(Me.ToIn(2.0f * SteamEngines[numberofengine].AttachedAxle.WheelRadiusM), 2) * SteamEngines[numberofengine].AttachedAxle.NumWheelsetAxles);
+
                             if (SteamEngines[numberofengine].HammerForceLbs > wheelWeight)
                             {
                                 SteamEngines[numberofengine].IsWheelHammerForce = true;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs

@@ -367,9 +367,9 @@ public enum AuxiliarySteamEngineTypes
         public float MaxIndicatedHorsePowerHP;
 
         /// <summary>
-        /// Steam Engine unbalanced mass on wheels - per side. 
+        /// Steam Engine unbalanced mass on wheels - per side. Typically called Excess or overbalance of rods 
         /// </summary>
-        public float ExcessWheelBalanceLbs;
+        public float ExcessRodBalanceLbs;
 
         /// <summary>
         /// Steam Engine unbalanced wheel warning. 
@@ -721,7 +721,7 @@ public virtual void Parse(STFReader stf)
                         break;
                     case "excesswheelbalance":
                         var excess = stf.ReadFloatBlock(STFReader.UNITS.Mass, null);
-                        ExcessWheelBalanceLbs = Kg.ToLb(excess);  // Convert input to lbs for use internally in this module
+                        ExcessRodBalanceLbs = Kg.ToLb(excess);  // Convert input to lbs for use internally in this module
                         break;
 
                     case "auxiliarysteamenginetype":
@@ -755,7 +755,7 @@ public void Copy(SteamEngine other)
             LPCylindersDiameterM = other.LPCylindersDiameterM;
             BoosterCutoff = other.BoosterCutoff;
             MaxIndicatedHorsePowerHP = other.MaxIndicatedHorsePowerHP;
-            ExcessWheelBalanceLbs = other.ExcessWheelBalanceLbs;
+            ExcessRodBalanceLbs = other.ExcessRodBalanceLbs;
             BoosterThrottleCutoff = other.BoosterThrottleCutoff;
             BoosterGearRatio = other.BoosterGearRatio;
             AttachedAxleId = other.AttachedAxleId;