Merge pull request #858 from cesarBLG/multiple-axles-visuals

Fix wheel animation problems

Author: cesarBLG

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

@@ -2018,6 +2018,7 @@ public override void Update(float elapsedClockSeconds)
 
                     AntiSlip = true; // Always set AI trains to AntiSlip
                     SimpleAdhesion();   // Simple adhesion model used for AI trains
+                    AdvancedAdhesionModel = false;
                     if (Train.IsActualPlayerTrain) FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
                     WheelSpeedMpS = Flipped ? -AbsSpeedMpS : AbsSpeedMpS;            //make the wheels go round
                     break;

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -726,9 +726,8 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
             float AnimationWheelRadiusM = MSTSWagon.WheelRadiusM; // Radius of non driven wheels
             float AnimationDriveWheelRadiusM = MSTSWagon.DriverWheelRadiusM; // Radius of driven wheels
 
-            if (MSTSWagon.IsDriveable && MSTSWagon.Simulator.UseAdvancedAdhesion && !MSTSWagon.Simulator.Settings.SimpleControlPhysics)
+            if (MSTSWagon is MSTSLocomotive loco && loco.AdvancedAdhesionModel)
             {
-                var loco = MSTSWagon as MSTSLocomotive;
                 //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.
                 // To achieve the same result with other means, without flipping trainset physics, the line should be changed as follows:
                 //                                distanceTravelledM = MSTSWagon.WheelSpeedMpS * elapsedTime.ClockSeconds;