Merge pull request #1029 from SteelFill/multi_track_profiles

twpol · web-flow · commit da57f73bdce9 · 2025-04-24T23:10:00.000+01:00
Superelevation Follow Up Fixes
diff --git a/Source/Orts.Formats.Msts/TrackSectionsFile.cs b/Source/Orts.Formats.Msts/TrackSectionsFile.cs
@@ -182,8 +182,18 @@ public SectionIdx(STFReader stf)
                     STFException.TraceWarning(stf, "Invalid track section " + token);
 			}
 			stf.SkipRestOfBlock();
-		}
-		public uint NoSections;
+        }
+        public SectionIdx(TrackPath path)
+        {
+            X = 0;
+            Y = 0;
+            Z = 0;
+            A = 0;
+            NoSections = path.NoSections;
+            TrackSections = path.TrackSections;
+        }
+
+        public uint NoSections;
 		public double X,Y,Z;  // Offset
 		public double A;  // Angular offset 
 		public uint[] TrackSections;
diff --git a/Source/Orts.Simulation/Simulation/AIs/AITrain.cs b/Source/Orts.Simulation/Simulation/AIs/AITrain.cs
@@ -378,10 +378,8 @@ public override void InitializeMoving() // TODO
                 float initialThrottlepercent = InitialThrottlepercent;
                 MUDynamicBrakePercent = -1;
                 AITrainBrakePercent = 0;
-                // Percent slope = rise / run -> the Y position of the forward vector gives us the 'rise'
-                // Derive the 'run' by assuming a hypotenuse length of 1, so run = sqrt(1 - rise^2)
-                float rise = FirstCar.WorldPosition.XNAMatrix.M32;
-                FirstCar.CurrentElevationPercent = 100f * (rise / (float)Math.Sqrt(1 - rise * rise));
+                // Force calculate gradient at the front of the train
+                FirstCar.UpdateGravity();
                 // Give it a bit more gas if it is uphill
                 if (FirstCar.CurrentElevationPercent < -2.0) initialThrottlepercent = 40f;
                 // Better block gas if it is downhill
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -1861,18 +1861,8 @@ public virtual void InitializeMoving()
                 MSTSLocomotive lead = (MSTSLocomotive)Cars[LeadLocomotiveIndex];
                 if (lead is MSTSSteamLocomotive) MUReverserPercent = 25;
 
-                // Percent slope = rise / run -> the Y position of the forward vector gives us the 'rise'
-                // Derive the 'run' by assuming a hypotenuse length of 1, so run = sqrt(1 - rise^2)
-                float rise = lead.WorldPosition.XNAMatrix.M32;
-                lead.CurrentElevationPercent = 100f * (rise / (float)Math.Sqrt(1 - rise * rise));
-
-                //TODO: next if block has been inserted 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 block should be deleted
-                //         
-                if (lead.IsDriveable && (lead as MSTSLocomotive).UsingRearCab)
-                {
-                    lead.CurrentElevationPercent = -lead.CurrentElevationPercent;
-                }
+                // Force calculate gradient at the lead locomotive
+                lead.UpdateGravity();
                 // give it a bit more gas if it is uphill
                 if (lead.CurrentElevationPercent < -2.0) initialThrottlepercent = 40f;
                 // better block gas if it is downhill
@@ -4512,9 +4502,9 @@ public void RepositionRearTraveller()
 
                     // Update car's curve radius and superelevation based on bogie position and move traveller to front bogie
                     // Also determine roll angle for superelevation by averaging both bogies
-                    float roll = traveller.GetVisualElevation();
+                    float roll = traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation);
                     car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
+                    roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
 
                     // Normalize across tile boundaries
                     x += 2048 * (tileX - traveller.TileX);
@@ -4532,9 +4522,7 @@ public void RepositionRearTraveller()
                     car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
 
                     // Update gravity force when position is updated, but before any secondary motion is added
-                    Vector3 fwd = car.WorldPosition.XNAMatrix.Backward;
-                    car.GravityForceN = car.MassKG * TrainCar.GravitationalAccelerationMpS2 * fwd.Y;
-                    car.CurrentElevationPercent = 100f * (fwd.Y / (float)Math.Sqrt(1 - fwd.Y * fwd.Y));
+                    car.UpdateGravity();
 
                     // Apply superelevation to car
                     car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
@@ -4633,9 +4621,9 @@ public void CalculatePositionOfCars(float elapsedTime, float distance)
 
                     // Update car's curve radius and superelevation based on bogie position and move traveller to front bogie
                     // Outputs rotation angle for superelevation, used below
-                    float roll = traveller.GetVisualElevation();
+                    float roll = traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation);
                     car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
+                    roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
 
                     // Normalize across tile boundaries
                     x += 2048 * (tileX - traveller.TileX);
@@ -4653,9 +4641,7 @@ public void CalculatePositionOfCars(float elapsedTime, float distance)
                     car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
 
                     // Update gravity force when position is updated, but before any secondary motion is added
-                    Vector3 fwd = car.WorldPosition.XNAMatrix.Backward;
-                    car.GravityForceN = car.MassKG * TrainCar.GravitationalAccelerationMpS2 * fwd.Y;
-                    car.CurrentElevationPercent = 100f * (fwd.Y / (float)Math.Sqrt(1 - fwd.Y * fwd.Y));
+                    car.UpdateGravity();
 
                     // Apply superelevation to car
                     car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
@@ -4714,9 +4700,9 @@ public void CalculatePositionOfEOT()
 
                 // Update car's curve radius and superelevation based on bogie position and move traveller to front bogie
                 // Outputs rotation angle for superelevation, used below
-                float roll = traveller.GetVisualElevation();
+                float roll = traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation);
                 car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                roll = (roll + traveller.GetVisualElevation()) / 2.0f;
+                roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
 
                 // Normalize across tile boundaries
                 x += 2048 * (tileX - traveller.TileX);
@@ -4734,9 +4720,7 @@ public void CalculatePositionOfEOT()
                 car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
 
                 // Update gravity force when position is updated, but before any secondary motion is added
-                Vector3 fwd = car.WorldPosition.XNAMatrix.Backward;
-                car.GravityForceN = car.MassKG * TrainCar.GravitationalAccelerationMpS2 * fwd.Y;
-                car.CurrentElevationPercent = 100f * (fwd.Y / (float)Math.Sqrt(1 - fwd.Y * fwd.Y));
+                car.UpdateGravity();
 
                 // Apply superelevation to car
                 car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -985,15 +985,6 @@ public virtual void Update(float elapsedClockSeconds)
 
             AbsSpeedMpS = Math.Abs(_SpeedMpS);
 
-            //TODO: next if block has been inserted 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 block should be deleted
-            //      
-            if (IsDriveable && Train != null & Train.IsPlayerDriven && (this as MSTSLocomotive).UsingRearCab)
-            {
-                GravityForceN = -GravityForceN;
-                CurrentElevationPercent = -CurrentElevationPercent;
-            }
-
             UpdateCurveSpeedLimit(elapsedClockSeconds);
             UpdateCurveForce(elapsedClockSeconds);
             UpdateTunnelForce();
@@ -2835,8 +2826,7 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
             m.Backward = fwd;
 
             // Update gravity force when position is updated, but before any secondary motion is added
-            GravityForceN = MassKG * GravitationalAccelerationMpS2 * fwd.Y;
-            CurrentElevationPercent = 100f * (fwd.Y / (float)Math.Sqrt(1 - fwd.Y * fwd.Y));
+            UpdateGravity(m);
 
             // Consider body roll from superelevation and from tilting.
             UpdateTilting(traveler, elapsedTimeS, speed, direction);
@@ -3468,6 +3458,36 @@ public LatLonDirection GetLatLonDirection()
 
             return new LatLonDirection(latLon, directionDeg); ;
         }
+
+        /// <summary>
+        /// Update the gravity force and % gradient of this train car at the current position
+        /// </summary>
+        public void UpdateGravity()
+        {
+            UpdateGravity(WorldPosition.XNAMatrix);
+        }
+
+        /// <summary>
+        /// Update the gravity force and % gradient of this train car at an arbitrary position
+        /// </summary>
+        /// <param name="orientation">Matrix giving the train car orientation used to determine gravity.</param>
+        public void UpdateGravity(Matrix orientation)
+        {
+            // Percent slope = 100 * rise / run -> the Y component of the forward vector gives us the 'rise'
+            // Derive the 'run' by assuming a hypotenuse length of 1, so per Pythagoras run = sqrt(1 - rise^2)
+            float rise = orientation.Backward.Y;
+
+            GravityForceN = MassKG * GravitationalAccelerationMpS2 * rise;
+            CurrentElevationPercent = 100f * (rise / (float)Math.Sqrt(1 - rise * rise));
+
+            // Reverse gravity force and % gradient on locomotives operated from the rear cab
+            // FUTURE: Change rear cabs to not require such forbidden manipulations of physics
+            if (IsDriveable && Train != null & Train.IsPlayerDriven && (this as MSTSLocomotive).UsingRearCab)
+            {
+                GravityForceN = -GravityForceN;
+                CurrentElevationPercent = -CurrentElevationPercent;
+            }
+        }
     }
 
     public class WheelAxle : IComparer<WheelAxle>
diff --git a/Source/RunActivity/Viewer3D/DynamicTrack.cs b/Source/RunActivity/Viewer3D/DynamicTrack.cs
@@ -1503,6 +1503,9 @@ public virtual void CircArcGen()
                     }
                     break;
             }
+            // Limit the number of sections to prevent overflowing the number of triangles
+            if (NumSections > 250)
+                NumSections = 250;
             // Ensure an even number of sections
             if (NumSections % 2 == 1)
                 NumSections++;
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -882,33 +882,38 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
 
 #endif
 
-            // truck angle animation
+            // Bogie angle animation
             Matrix inverseLocation = Matrix.Invert(Car.WorldPosition.XNAMatrix);
 
             foreach (var p in Car.Parts)
             {
                 if (p.iMatrix <= 0)
                     continue;
 
-                // Determine orientation of bogie in absolute space
                 Matrix m = Matrix.Identity;
-                Vector3 fwd = new Vector3(p.Dir[0], p.Dir[1], -p.Dir[2]);
-                // Only do this calculation if the bogie position has been calculated
-                if (!(fwd.X == 0 && fwd.Y == 0 && fwd.Z == 0))
+
+                // Bogie rotation calculation doesn't work on turntables
+                // Assume bogies aren't rotated when on a turntable
+                if (Car.Train?.ControlMode != Train.TRAIN_CONTROL.TURNTABLE)
                 {
-                    fwd.Normalize();
-                    Vector3 side = Vector3.Cross(Vector3.Up, fwd);
-                    if (!(side.X == 0 && side.Y == 0 && side.Z == 0))
-                        side.Normalize();
-                    Vector3 up = Vector3.Cross(fwd, side);
-                    m.Right = side;
-                    m.Up = up;
-                    m.Backward = fwd;
-
-                    // Convert absolute rotation into rotation relative to train car
-                    m = Matrix.CreateRotationZ(p.Roll) * m * inverseLocation;
+                    // Determine orientation of bogie in absolute space
+                    Vector3 fwd = new Vector3(p.Dir[0], p.Dir[1], -p.Dir[2]);
+                    // Only do this calculation if the bogie position has been calculated
+                    if (!(fwd.X == 0 && fwd.Y == 0 && fwd.Z == 0))
+                    {
+                        fwd.Normalize();
+                        Vector3 side = Vector3.Cross(Vector3.Up, fwd);
+                        if (!(side.X == 0 && side.Y == 0 && side.Z == 0))
+                            side.Normalize();
+                        Vector3 up = Vector3.Cross(fwd, side);
+                        m.Right = side;
+                        m.Up = up;
+                        m.Backward = fwd;
+
+                        // Convert absolute rotation into rotation relative to train car
+                        m = Matrix.CreateRotationZ(p.Roll) * m * inverseLocation;
+                    }
                 }
-
                 // Insert correct translation (previous step likely introduced garbage data)
                 m.Translation = TrainCarShape.SharedShape.Matrices[p.iMatrix].Translation;
 
diff --git a/Source/RunActivity/Viewer3D/SuperElevation.cs b/Source/RunActivity/Viewer3D/SuperElevation.cs

Original file line number	Diff line number	Diff line change
`@@ -1503,6 +1503,9 @@ public virtual void CircArcGen()`
`1503`	`1503`	`}`
`1504`	`1504`	`break;`
`1505`	`1505`	`}`
	`1506`	`+ // Limit the number of sections to prevent overflowing the number of triangles`
	`1507`	`+ if (NumSections > 250)`
	`1508`	`+ NumSections = 250;`
`1506`	`1509`	`// Ensure an even number of sections`
`1507`	`1510`	`if (NumSections % 2 == 1)`
`1508`	`1511`	`NumSections++;`