Automatic merge of T1.5.1-1829-g5cb0ed0a4 and 12 pull requests

- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting
- Pull request #1062 at 9a76b26: Train Forces popup Window.
- Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1)
- Pull request #1084 at 13454ed: Timetable: Calculate Delay While Stopped at a Station
- Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12
- Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1087 at 1f64f02: Improve warning message for signal location mismatch.
- Pull request #1088 at 4b3fa4c: Preserve previous log file.
- Pull request #1089 at d750bd1: Fix Superelevation on Rigid Frame Rolling Stock Again
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -2441,8 +2441,8 @@ protected virtual void UpdateControllers(float elapsedClockSeconds)
                 LocalDynamicBrakePercent = Math.Max(LocalDynamicBrakePercent, DynamicBrakeController.SavedValue * 100);
             }
 
-                var throttleCurrentNotch = ThrottleController.CurrentNotch;
-                ThrottleController.Update(elapsedClockSeconds);
+            var throttleCurrentNotch = ThrottleController.CurrentNotch;
+            ThrottleController.Update(elapsedClockSeconds);
             if (CruiseControl != null && CruiseControl.ThrottlePercent != null)
             {
                 LocalThrottlePercent = CruiseControl.ThrottlePercent.Value;
@@ -2678,29 +2678,29 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
             // With Simple adhesion apart from correction for rail adhesion, there is no further variation to the motive force. 
             // With Advanced adhesion the raw motive force is fed into the advanced (axle) adhesion model, and is corrected for wheel slip and rail adhesion
 
-                // For the advanced adhesion model, a rudimentary form of slip control is incorporated by using the wheel speed to calculate tractive effort.
-                // As wheel speed is increased tractive effort is decreased. Hence wheel slip is "controlled" to a certain extent.
-                // This doesn't cover all types of locomotives, for example if DC traction motors and no slip control, then the tractive effort shouldn't be reduced.
-                // This won't eliminate slip, but limits its impact. 
-                // More modern locomotive have a more sophisticated system that eliminates slip in the majority (if not all circumstances).
-                // Simple adhesion control does not have any slip control feature built into it.
-                // TODO - a full review of slip/no slip control.
+            // For the advanced adhesion model, a rudimentary form of slip control is incorporated by using the wheel speed to calculate tractive effort.
+            // As wheel speed is increased tractive effort is decreased. Hence wheel slip is "controlled" to a certain extent.
+            // This doesn't cover all types of locomotives, for example if DC traction motors and no slip control, then the tractive effort shouldn't be reduced.
+            // This won't eliminate slip, but limits its impact. 
+            // More modern locomotive have a more sophisticated system that eliminates slip in the majority (if not all circumstances).
+            // Simple adhesion control does not have any slip control feature built into it.
+            // TODO - a full review of slip/no slip control.
             PrevAbsTractionSpeedMpS = AbsTractionSpeedMpS;
-                if (TractionMotorType == TractionMotorTypes.AC)
+            if (TractionMotorType == TractionMotorTypes.AC)
+            {
+                AbsTractionSpeedMpS = AbsSpeedMpS;
+            }
+            else
+            {
+                if (WheelSlip && AdvancedAdhesionModel)
                 {
-                    AbsTractionSpeedMpS = AbsSpeedMpS;
+                    AbsTractionSpeedMpS = AbsWheelSpeedMpS;
                 }
                 else
                 {
-                    if (WheelSlip && AdvancedAdhesionModel)
-                    {
-                        AbsTractionSpeedMpS = AbsWheelSpeedMpS;
-                    }
-                    else
-                    {
-                        AbsTractionSpeedMpS = AbsSpeedMpS;
-                    }
+                    AbsTractionSpeedMpS = AbsSpeedMpS;
                 }
+            }
             UpdateTractionForce(elapsedClockSeconds);
 
             if (MaxForceN > 0 && MaxContinuousForceN > 0 && PowerReduction < 1)
@@ -5456,7 +5456,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                         data = 0.0f;
                         if (TractionForceN > 0)
                         {
-                                data = TractiveForceN / MaxForceN * MaxCurrentA;
+                            data = TractiveForceN / MaxForceN * MaxCurrentA;
                             data = Math.Abs(data);
                         }
                         if (DynamicBrakeForceN > 0)
@@ -5474,7 +5474,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
                             direction = ((CVCGauge)cvc).Direction;
                         data = 0.0f;
-                            data = TractiveForceN;
+                        data = TractiveForceN;
                         if (DynamicBrakeForceN > 0)
                         {
                             data = DynamicBrakeForceN;
@@ -5490,7 +5490,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                                 if (TractionForceN > 0)
                                 {
                                     data = (data / MaxForceN) * MaxCurrentA;
-                                 }
+                                }
                                 if (DynamicBrakeForceN > 0)
                                 {
                                     data = (DynamicBrakeForceN / MaxDynamicBrakeForceN) * DynamicBrakeMaxCurrentA;
@@ -5519,7 +5519,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                         if (cvc is CVCGauge && ((CVCGauge)cvc).Orientation == 0)
                             direction = ((CVCGauge)cvc).Direction;
                         data = 0.0f;
-                            data = Math.Abs(TractiveForceN);
+                        data = Math.Abs(TractiveForceN);
                         if (DynamicBrake && DynamicBrakePercent > 0)
                         {
                             data = -Math.Abs(DynamicBrakeForceN);

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2146,8 +2146,8 @@ public virtual int GetDrawIndex()
                     break;
                 case CABViewControlTypes.DYNAMIC_BRAKE:
                     if (Locomotive.DynamicBrakeController != null && !Locomotive.HasSmoothStruc)
-                            index = Locomotive.DynamicBrakeController.CurrentNotch;
-                        else
+                        index = Locomotive.DynamicBrakeController.CurrentNotch;
+                    else
                         index = PercentToIndex(data);
                     break;
                 case CABViewControlTypes.CPH_DISPLAY: