Automatic merge of T1.5.1-689-g9d41208f0 and 19 pull requests

openrails-bot · openrails-bot · commit fc3aa1688e42 · 2023-11-25T11:42:58.000Z
- Pull request #570 at c59c788: 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 #865 at 67014b7: Dispatcher window improvements - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 855d0e2: Implement Polach Adhesion - Pull request #882 at d8a1c4d: Blueprint/train car operations UI window - Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at 228f0f0: Scene viewer extension to TrackViewer - Pull request #888 at d7daf62: docs: Document player application model - Pull request #889 at 43341cf: No speed update - Pull request #890 at 39a9fa4: Allow depart early - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 794fddf: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 64a29c8: feat: Improved system information collection
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs
@@ -429,7 +429,7 @@ public float InertiaKgm2
         /// <summary>
         /// switch between Polach and Pacha adhesion calculation
         /// </summary>
-        bool UsePoalchAdhesion = false;
+        bool UsePolachAdhesion = false;
 
         /// <summary>
         /// Pre-calculation of slip characteristics at 0 slip speed
@@ -820,7 +820,7 @@ public void Save(BinaryWriter outf)
             double slipSpeedMpS = axleSpeedMpS - TrainSpeedMpS;
             double axleOutForceN = 0;
 
-            if (UsePoalchAdhesion)
+            if (UsePolachAdhesion)
             {
                 axleOutForceN = Math.Sign(slipSpeedMpS) * AxleWeightN * SlipCharacteristicsPolach(slipSpeedMpS);
             }
@@ -858,7 +858,7 @@ public void Save(BinaryWriter outf)
         /// Integrates the wheel rotation movement using a RK4 method,
         /// calculating the required number of substeps
         /// To maintain the accuracy of the integration method, the number of substeps needs to increase when slip speed approaches the slip threshold speed.
-        /// The folloi=wing section attempts to calculate the optimal substep limit. This is a trade off between the accuracy of the slips calculations and the CPU load which impacts the screen FPS
+        /// The following section attempts to calculate the optimal substep limit. This is a trade off between the accuracy of the slips calculations and the CPU load which impacts the screen FPS
         /// Outputs: wheel speed, wheel angular position and motive force
         /// </summary>
         void Integrate(float elapsedClockSeconds)
@@ -960,11 +960,11 @@ public virtual void Update(float timeSpan)
             // Switches between Polach (high performance) adhesion model and Pacha (low performance) adhesion model
             if(ScreenFrameRate > 59)
             {
-                UsePoalchAdhesion = true;
+                UsePolachAdhesion = true;
             }
             else if(ScreenFrameRate < 55) 
             {
-                UsePoalchAdhesion = false;
+                UsePolachAdhesion = false;
                 if (TrainSpeedMpS > 0 )
                 {
                     Trace.TraceInformation("Advanced adhesion model switched to low performance option due to low frame rate {0} at ElapsedClockSeconds of {1}", ScreenFrameRate, timeSpan);
@@ -979,7 +979,7 @@ public virtual void Update(float timeSpan)
             
             forceToAccelerationFactor = WheelRadiusM * WheelRadiusM / totalInertiaKgm2;        
 
-            if (UsePoalchAdhesion)
+            if (UsePolachAdhesion)
             {
 
                 Polach.Update();
