Automatic merge of T1.5.1-722-g01614a154 and 18 pull requests

openrails-bot · openrails-bot · commit 64f2131adfa9 · 2023-12-06T18:53:14.000Z
- Pull request #570 at 3cba5d6: 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 3b5a2fe: 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 #882 at 481ed9d: Blueprint/train car operations UI window - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at 697a4b6: Scene viewer extension to TrackViewer - Pull request #888 at d7daf62: docs: Document player application model - 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 0a9d939: feat: Improved system information collection - Pull request #898 at e271395: Extra line with all the arguments for debugging purposes in logfile - Pull request #900 at 42ea7ad: DMI updates
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -753,7 +753,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                     car.SoundHeardInternallyCorrection[MSTSWagon.LeftWindowFrontIndex] = LeftWindowFront.AnimationKeyFraction();
                 if (RightWindowFront.FrameCount > 0)
                     car.SoundHeardInternallyCorrection[MSTSWagon.RightWindowFrontIndex] = RightWindowFront.AnimationKeyFraction();
-            }
+        }
         }
 
 
@@ -774,18 +774,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)
@@ -800,33 +800,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];
+                 }
+              }
                 }
             }
 
