Automatic merge of T1.5.1-1705-g95e36ea99 and 17 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 #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
- Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at b96d6fa: Train Forces popup Window.
- Pull request #1064 at 52410f9: 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 #1000 at d8d9709: Locomotive operation from control car
- 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 #1055 at 5c78967: Route Based TTrack Sounds

Author: openrails-bot

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -778,10 +778,10 @@ public TrainCar SetPlayerLocomotive(Train playerTrain)
                 {
                     if (!leadFound)
                     {
-                    PlayerLocomotive = car;
-                    playerTrain.LeadLocomotive = car;
-                    playerTrain.InitializeBrakes();
-                    PlayerLocomotive.LocalThrottlePercent = playerTrain.AITrainThrottlePercent;
+                        PlayerLocomotive = car;
+                        playerTrain.LeadLocomotive = car;
+                        playerTrain.InitializeBrakes();
+                        PlayerLocomotive.LocalThrottlePercent = playerTrain.AITrainThrottlePercent;
                         PlayerLocomotive.SignalEvent(Event.PlayerTrainLeadLoco);
                         leadFound = true;
                     }

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -793,7 +793,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                     car.SoundHeardInternallyCorrection[MSTSWagon.LeftWindowFrontIndex] = LeftWindowFront.AnimationKeyFraction();
                 if (RightWindowFront.MaxFrame > 0)
                     car.SoundHeardInternallyCorrection[MSTSWagon.RightWindowFrontIndex] = RightWindowFront.AnimationKeyFraction();
-        }
+            }
         }
 
 
@@ -814,18 +814,18 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
                 foreach (var kvp in RunningGears)
                 {
                     if (!kvp.Value.Empty())
-                {
+                    {
                         var axle = kvp.Key >= 0 && kvp.Key < loco.LocomotiveAxles.Count ? loco.LocomotiveAxles[kvp.Key] : null;
                         if (axle != null)
                             //TODO: next code line has been modified to flip trainset physics in order to get viewing direction coincident with loco direction when using rear cab.
                             kvp.Value.UpdateLoop(((MSTSWagon.Train != null && MSTSWagon.Train.IsPlayerDriven && loco.UsingRearCab) ? -1 : 1) * (float)axle.AxleSpeedMpS * elapsedTime.ClockSeconds / MathHelper.TwoPi / axle.WheelRadiusM);
                         else if (AnimationDriveWheelRadiusM > 0.001)
                             kvp.Value.UpdateLoop(distanceTravelledM / MathHelper.TwoPi / AnimationDriveWheelRadiusM);
-                }
+                    }
 
-            }
+                }
                 foreach (var kvp in WheelPartIndexes)
-            {
+                {
                     var axle = kvp.Key < loco.LocomotiveAxles.Count && kvp.Key >= 0 ? loco.LocomotiveAxles[kvp.Key] : (Car.EngineType == TrainCar.EngineTypes.Steam ? null : loco.LocomotiveAxles[0]);
                     Matrix wheelRotationMatrix;
                     if (axle != null)
@@ -840,33 +840,33 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
                         wheelRotationMatrix = Matrix.CreateRotationX(WheelRotationR);
                     }
                     foreach (var iMatrix in kvp.Value)
-                {
+                    {
                         TrainCarShape.XNAMatrices[iMatrix] = wheelRotationMatrix * TrainCarShape.SharedShape.Matrices[iMatrix];
-                }
+                    }
                 }
             }
             else // set values for simple adhesion
-                {
+            {
                 distanceTravelledM = ((MSTSWagon.IsDriveable && MSTSWagon.Train != null && MSTSWagon.Train.IsPlayerDriven && ((MSTSLocomotive)MSTSWagon).UsingRearCab) ? -1 : 1) * MSTSWagon.SpeedMpS * elapsedTime.ClockSeconds;
                 if (Car.BrakeSkid) distanceTravelledM = 0;
                 foreach (var kvp in RunningGears)
                 {
                     if (!kvp.Value.Empty() && AnimationDriveWheelRadiusM > 0.001)
                         kvp.Value.UpdateLoop(distanceTravelledM / MathHelper.TwoPi / AnimationDriveWheelRadiusM);
                 }
-            // Wheel rotation (animation) - for non-drive wheels in steam locomotives and all wheels in other stock
-            if (WheelPartIndexes.Count > 0)
-             {
+                // Wheel rotation (animation) - for non-drive wheels in steam locomotives and all wheels in other stock
+                if (WheelPartIndexes.Count > 0)
+                {
                     var rotationalDistanceR = distanceTravelledM / AnimationWheelRadiusM;  // in radians
-                WheelRotationR = MathHelper.WrapAngle(WheelRotationR - rotationalDistanceR);
-                var wheelRotationMatrix = Matrix.CreateRotationX(WheelRotationR);
+                    WheelRotationR = MathHelper.WrapAngle(WheelRotationR - rotationalDistanceR);
+                    var wheelRotationMatrix = Matrix.CreateRotationX(WheelRotationR);
                     foreach (var kvp in WheelPartIndexes)
-                 {
+                    {
                         foreach (var iMatrix in kvp.Value)
                         {
-                    TrainCarShape.XNAMatrices[iMatrix] = wheelRotationMatrix * TrainCarShape.SharedShape.Matrices[iMatrix];
-                 }
-              }
+                            TrainCarShape.XNAMatrices[iMatrix] = wheelRotationMatrix * TrainCarShape.SharedShape.Matrices[iMatrix];
+                        }
+                    }
                 }
             }