Automatic merge of T1.5.1-1723-g959de2385 and 16 pull requests

- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting
- Pull request #900 at 4629736: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at bbc0013: Train Forces popup Window.
- Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1)
- Pull request #1066 at 62c89c1: Log derailment, using TraceInformation.
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #1049 at 6a0c471: Re-organise document storage and access
- Pull request #1057 at 254b6d4: Switchable brake system
- Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051
- Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts
- Pull request #1071 at 722dd3f: Change cover image for v1.6
- Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12
- Pull request #1076 at d1ff8fd: Allow depart early
- Pull request #1077 at 7e73abd: Fix SME brakes not working

Author: openrails-bot

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -4080,7 +4080,7 @@ public void UnconditionalInitializeBrakes()
                     fullServPressurePSI = lead.BrakeSystem is VacuumSinglePipe ? 16 : maxPressurePSI - lead.TrainBrakeController.FullServReductionPSI;
                     EqualReservoirPressurePSIorInHg = Math.Min(maxPressurePSI, EqualReservoirPressurePSIorInHg);
                     lead.TrainBrakeController.UpdatePressure(ref EqualReservoirPressurePSIorInHg, 1000, ref BrakeLine4);
-                    if (!(lead.BrakeSystem is EPBrakeSystem))
+                    if (!(lead.BrakeSystem is EPBrakeSystem) && !(lead.BrakeSystem is SMEBrakeSystem))
                         BrakeLine4 = -1;
                     EqualReservoirPressurePSIorInHg =
                             MathHelper.Max(EqualReservoirPressurePSIorInHg, fullServPressurePSI);
@@ -4412,7 +4412,7 @@ public void PropagateBrakePressure(float elapsedClockSeconds)
                 if (lead.TrainBrakeController != null)
                 {
                     lead.TrainBrakeController.UpdatePressure(ref EqualReservoirPressurePSIorInHg, elapsedClockSeconds, ref BrakeLine4);
-                    if (!(lead.BrakeSystem is EPBrakeSystem))
+                    if (!(lead.BrakeSystem is EPBrakeSystem) && !(lead.BrakeSystem is SMEBrakeSystem))
                         BrakeLine4 = -1;
                 }
                 if (lead.EngineBrakeController != null)

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

@@ -5536,35 +5536,35 @@ public virtual float GetDataOf(CabViewControl cvc)
 
                 case CABViewControlTypes.RPM:
                     {
-                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                            if (mstsDieselLocomotive.DieselEngines[0] != null)
-                                data = mstsDieselLocomotive.DieselEngines[0].RealRPM;
+                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                        if (mstsDieselLocomotive.DieselEngines[0] != null)
+                            data = mstsDieselLocomotive.DieselEngines[0].RealRPM;
                         break;
                     }
 
                 case CABViewControlTypes.RPM_2:
                     {
                         if (this is MSTSDieselLocomotive mstsDieselLocomotive && mstsDieselLocomotive.DieselEngines.NumOfActiveEngines > 1)
-                            {                      
-                                if (mstsDieselLocomotive.DieselEngines[1] != null)
-                                    data = mstsDieselLocomotive.DieselEngines[1].RealRPM;
-                            }
+                        {                      
+                            if (mstsDieselLocomotive.DieselEngines[1] != null)
+                                data = mstsDieselLocomotive.DieselEngines[1].RealRPM;
                         }
-                        break;
+                    }
+                    break;
 
                 case CABViewControlTypes.ORTS_DIESEL_TEMPERATURE:
                     {
-                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                            if (mstsDieselLocomotive.DieselEngines[0] != null)
-                                data = mstsDieselLocomotive.DieselEngines[0].DieselTemperatureDeg;
+                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                        if (mstsDieselLocomotive.DieselEngines[0] != null)
+                            data = mstsDieselLocomotive.DieselEngines[0].DieselTemperatureDeg;
                         break;
                     }
 
                 case CABViewControlTypes.ORTS_OIL_PRESSURE:
                     {
-                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                            if (mstsDieselLocomotive.DieselEngines[0] != null)
-                                data = mstsDieselLocomotive.DieselEngines[0].DieselOilPressurePSI;
+                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                        if (mstsDieselLocomotive.DieselEngines[0] != null)
+                            data = mstsDieselLocomotive.DieselEngines[0].DieselOilPressurePSI;
                         break;
                     }
 
@@ -5767,10 +5767,10 @@ public virtual float GetDataOf(CabViewControl cvc)
                     }
                 case CABViewControlTypes.WHEELSLIP:
                     {
-                            if (AdvancedAdhesionModel && Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING && !Train.Autopilot)
-                                data = HuDIsWheelSlipWarninq ? 1 : 0;
-                            else
-                                data = HuDIsWheelSlip ? 1 : 0;
+                        if (AdvancedAdhesionModel && Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING && !Train.Autopilot)
+                            data = HuDIsWheelSlipWarninq ? 1 : 0;
+                        else
+                            data = HuDIsWheelSlip ? 1 : 0;
                         break;
                     }
 

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -3474,12 +3474,12 @@ public void FindControlActiveLocomotive()
                         {
                             unmatchedLocomotive = car as MSTSLocomotive;
                             break;
-                }
+                        }
                         else
-                {
+                        {
                             unmatchedControlCar = null;
-                }
-            }
+                        }
+                    }
                     else
                     {
                         unmatchedLocomotive = car as MSTSLocomotive;