Automatic merge of T1.5.1-482-g7f7dd9993 and 7 pull requests

openrails-bot · openrails-bot · commit 21ff10b41e78 · 2023-06-21T07:52:42.000+01:00
- Pull request #570 at 7269d24: Experimental glTF 2.0 support with PBR lighting - Pull request #757 at d9d75f4: Unify RailDriver code implementations - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #829 at 434af02: Improvements for air brakes #3 - Emergency valves - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #842 at 9c2724d: Set up ability for steam locomotives to have multiple engines
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2849,13 +2849,13 @@ public void SimpleAdhesion()
             max1 = MaxForceN;
             //add sander
             if (Sander && AbsSpeedMpS < SanderSpeedOfMpS && CurrentTrackSandBoxCapacityM3 > 0.0 && MainResPressurePSI > 80.0)
-                    {
-                        switch (Simulator.WeatherType)
-                        {
+            {
+                switch (Simulator.WeatherType)
+                {
                     case WeatherType.Clear: SandingFrictionFactor = 1.2f; break;
                     case WeatherType.Rain: SandingFrictionFactor = 1.8f; break;
                     case WeatherType.Snow: SandingFrictionFactor = 2.5f; break;
-                        }
+                }
                 if (SanderSpeedEffectUpToMpS > 0.0f) // Reduce sander effectiveness if max effective speed is defined
                 {
                     SandingFrictionFactor *= (1.0f - 0.5f / SanderSpeedEffectUpToMpS * AbsSpeedMpS);
@@ -3134,7 +3134,7 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
                 }
             }
 
-            BaseFrictionCoefficientFactor = MathHelper.Clamp(BaseFrictionCoefficientFactor, 0.5f, 1.0f); 
+            BaseFrictionCoefficientFactor = MathHelper.Clamp(BaseFrictionCoefficientFactor, 0.5f, 1.0f);
 
             // Increase friction coefficient when sanding
             if (Sander && AbsSpeedMpS < SanderSpeedOfMpS && CurrentTrackSandBoxCapacityM3 > 0.0 && MainResPressurePSI > 80.0)
@@ -3144,11 +3144,11 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
                     case WeatherType.Clear: SandingFrictionCoefficientFactor = 1.40f; break;
                     case WeatherType.Rain: SandingFrictionCoefficientFactor = 1.25f; break;
                     case WeatherType.Snow: SandingFrictionCoefficientFactor = 1.50f; break;
-                        }
+                }
                 if (SanderSpeedEffectUpToMpS > 0.0f) // Reduce sander effectiveness if max effective speed is defined
-                    {
+                {
                     SandingFrictionCoefficientFactor *= (1.0f - 0.5f / SanderSpeedEffectUpToMpS * AbsSpeedMpS);
-                        }
+                }
                 BaseFrictionCoefficientFactor *= Math.Max(SandingFrictionCoefficientFactor, 1.0f); // Prevent sand from harming adhesion above max effective speed
             }
 
