Automatic merge of T1.5.1-1090-g9915d87ce6 and 21 pull requests

- Pull request #891 at 9a1d6b2: Auto save
- Pull request #954 at 588a3c2: Multiple Track Profiles & Superelevation Improvements
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #976 at 877cc94:  Increased center of gravity range
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #882 at 8f695a4: Blueprint/train car operations UI window
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #922 at a3bc9e7: Autopilot for timetable mode
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage
- Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects
- Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains
- Pull request #977 at a30c659: adds cache for SD files
- Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 4a4b032: Downloading route content (Github, zip)
- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #952 at 8347095: Investigation - Pulsing graphics

Author: openrails-bot

Source/Documentation/How to Provide Track Profiles for Open Rails Dynamic Track.docm

@@ -228,8 +228,8 @@ public string ENVFileName(SeasonType seasonType, WeatherType weatherType)
 
     public class SuperElevationStandard
     {
-        public float MaxFreightUnderbalanceM = 0.05f; // Default 5 cm ~ 2 inches
-        public float MaxPaxUnderbalanceM = 0.075f; // Default 7.5 cm ~ 3 inches
+        public float MaxFreightUnderbalanceM = float.PositiveInfinity;
+        public float MaxPaxUnderbalanceM = float.PositiveInfinity;
         public float MinCantM = 0.0125f; // Default 1.25 cm ~ 0.5 inches
         public float MaxCantM = -1.0f; // Specified by user settings by default
         public float MinSpeedMpS = MpS.FromKpH(25.0f); // Default 25 kmh ~ 15 mph
@@ -241,6 +241,8 @@ public class SuperElevationStandard
         public SuperElevationStandard()
         {
             // Initialize new instance with default values
+            MaxFreightUnderbalanceM = 0.05f; // Default 5 cm ~ 2 inches
+            MaxPaxUnderbalanceM = 0.075f; // Default 7.5 cm ~ 3 inches
         }
         public SuperElevationStandard(STFReader stf)
         {
@@ -256,6 +258,21 @@ public SuperElevationStandard(STFReader stf)
                 new STFReader.TokenProcessor("maxrunoffslope", () => { RunoffSlope = stf.ReadFloatBlock(STFReader.UNITS.None, null); }),
                 new STFReader.TokenProcessor("maxrunoffspeed", () => { RunoffSpeedMpS = stf.ReadFloatBlock(STFReader.UNITS.Speed, null); }),
             });
+
+            // Sanity check values of underbalance
+            if (MaxFreightUnderbalanceM > 10.0f)
+            {
+                if (MaxPaxUnderbalanceM > 10.0f)
+                {
+                    // Neither underbalance has been defined
+                    MaxFreightUnderbalanceM = 0.05f; // Default 5 cm ~ 2 inches
+                    MaxPaxUnderbalanceM = 0.075f; // Default 7.5 cm ~ 3 inches
+                }
+                else // Only passenger was defined
+                    MaxFreightUnderbalanceM = MaxPaxUnderbalanceM;
+            }
+            else if (MaxPaxUnderbalanceM > 10.0f) // Only freight was defined
+                MaxPaxUnderbalanceM = MaxFreightUnderbalanceM;
         }
     }
 

Source/Orts.Formats.Msts/RouteFile.cs

@@ -785,18 +785,21 @@ public class TrVectorSection
         public int WFNameX { get; set; }
         /// <summary>The TileZ in the WorldFile</summary>
         public int WFNameZ { get; set; }
-        /// <summary>The superelevation at the start,
-        /// negative number will apply no visual superelevation but retains physics superelevation</summary>
-        public float StartElevM { get; set; }
-        /// <summary>The superelevation at the midpoint,
-        /// negative number will apply no visual superelevation but retains physics superelevation</summary>
-        public float MidElevM { get; set; }
-        /// <summary>The superelevation at the end,
-        /// negative number will apply no visual superelevation but retains physics superelevation</summary>
-        public float EndElevM { get; set; }
+
+        /// <summary>Interpolator storing the amount of physics superelevation in meters vs distance along
+        /// the track section normalized from 0 to 1.</summary>
+        public Interpolator PhysElevTable;
+
+        /// <summary>Interpolator storing the angle of visual superelevation in radians vs distance along
+        /// the track section normalized from 0 to 1.</summary>
+        public Interpolator VisElevTable;
         /// <summary>Nominal amount of superelevation based on speed and radius.
         /// Actual superelevation used will depend on adjacent curves and superelevation settings.</summary>
         public float NomElevM { get; set; } = -1.0f;
+        /// <summary>Inward/outward offset from the centerline of the track about which this track section
+        /// is rotated during superelevation.
+        /// 0 = centered, positive = centerline moves to inside of curve, negative = centerline moves to outside of curve</summary>
+        public float ElevOffsetM { get; set; } = 0.0f;
         /// <summary>The index of the superelevation track profile suitable for this section</summary>
         public int TRPIndex { get; set; } = -1;
 

Source/Orts.Formats.Msts/TrackDatabaseFile.cs

@@ -1141,8 +1141,7 @@ public float GetCurrentCurveRadius()
             }
             else if (ts.SectionCurve != null)
             {
-                float maxv = tvs.MidElevM;
-                maxv = 0.14f * speed / 40f;//max 8 degree
+                float maxv = 0.14f * speed / 40f;//max 8 degree
                 //maxv *= speed / 40f;
                 //if (maxv.AlmostEqual(0f, 0.001f)) maxv = 0.02f; //short curve, add some effect anyway
                 var sign = -Math.Sign(ts.SectionCurve.Angle);

Source/Orts.Formats.OR/AETraveller.cs

@@ -4507,8 +4507,10 @@ public void RepositionRearTraveller()
                     var z = traveller.Z;
 
                     // Update car's curve radius and superelevation based on bogie position and move traveller to front bogie
-                    // Outputs rotation angle for superelevation, used below
-                    car.UpdateCurveData(traveller, new[] { 0, car.CarBogieCentreLengthM }, out float roll);
+                    // Also determine roll angle for superelevation by averaging both bogies
+                    float roll = traveller.GetVisualElevation();
+                    car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
+                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                     // normalize across tile boundaries
                     while (tileX > traveller.TileX)
@@ -4639,7 +4641,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
-                    car.UpdateCurveData(traveller, new[] {0, car.CarBogieCentreLengthM}, out float roll);
+                    float roll = traveller.GetVisualElevation();
+                    car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
+                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                     // normalize across tile boundaries
                     while (tileX > traveller.TileX)
@@ -4730,7 +4734,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
-                car.UpdateCurveData(traveller, new[] { 0, car.CarBogieCentreLengthM }, out float roll);
+                float roll = traveller.GetVisualElevation();
+                car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
+                roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                 // normalize across tile boundaries
                 while (tileX > traveller.TileX)

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

@@ -2744,9 +2744,7 @@ protected void SetUpWheelsArticulation(int carIndex)
 
         public void ComputePosition(Traveller traveler, bool backToFront, float elapsedTimeS, float distance, float speed)
         {
-            // Superelevation visual roll angle, will be determined during parts update
-            float rollAngle;
-            float[] bogieRoll;
+            // Position of bogies relative to model center, used for determining curve physics
             float[] bogieOffsets = new float[Parts.Count - 1];
 
             for (var j = 0; j < Parts.Count; j++)
@@ -2764,7 +2762,7 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
                     l++;
                 }
 
-                bogieRoll = UpdateCurveData(new Traveller(traveler), bogieOffsets, out rollAngle);
+                UpdateCurvePhys(new Traveller(traveler), bogieOffsets);
 
                 o = -CarLengthM / 2 - CentreOfGravityM.Z;
                 for (var k = 0; k < WheelAxles.Count; k++)
@@ -2775,7 +2773,12 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
                     var x = traveler.X + 2048 * (traveler.TileX - tileX);
                     var y = traveler.Y;
                     var z = traveler.Z + 2048 * (traveler.TileZ - tileZ);
-                    WheelAxles[k].Part.AddWheelSetLocation(1, o, x, y, z);
+
+                    Vector3 location = new Vector3(x, y, z) + traveler.CalcElevationPositionOffset(Simulator.Settings.UseSuperElevation > 0, out float r);
+                    // This car is flipped, so flip roll direction.
+                    r *= -1;
+
+                    WheelAxles[k].Part.AddWheelSetLocation(1, o, location.X, location.Y, location.Z, r);
                 }
                 o = CarLengthM / 2 - CentreOfGravityM.Z - o;
                 traveler.Move(o);
@@ -2791,7 +2794,7 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
                     l++;
                 }
 
-                bogieRoll = UpdateCurveData(new Traveller(traveler), bogieOffsets, out rollAngle);
+                UpdateCurvePhys(new Traveller(traveler), bogieOffsets);
 
                 o = CarLengthM / 2 - CentreOfGravityM.Z;
                 for (var k = WheelAxles.Count - 1; k >= 0; k--)
@@ -2802,7 +2805,10 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
                     var x = traveler.X + 2048 * (traveler.TileX - tileX);
                     var y = traveler.Y;
                     var z = traveler.Z + 2048 * (traveler.TileZ - tileZ);
-                    WheelAxles[k].Part.AddWheelSetLocation(1, o, x, y, z);
+
+                    Vector3 location = new Vector3(x, y, z) + traveler.CalcElevationPositionOffset(Simulator.Settings.UseSuperElevation > 0, out float r);
+
+                    WheelAxles[k].Part.AddWheelSetLocation(1, o, location.X, location.Y, location.Z, r);
                 }
                 o = CarLengthM / 2 + CentreOfGravityM.Z + o;
                 traveler.Move(o);
@@ -2812,9 +2818,21 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
             for (int i = 1; i < Parts.Count; i++)
             {
                 TrainCarPart p = Parts[i];
-                p.FindCenterLine();
-                if (p.SumWgt > 1.5)
+                
+                if (p.SumWgt > 1.5f)
+                {
+                    p.FindCenterLine();
                     p0.AddPartLocation(1, p);
+                }
+                else if (p.SumWgt > 0.5f) // Handle edge case of single axle pony trucks
+                {
+                    double d = p.OffsetM - p.SumOffset / p.SumWgt;
+                    if (-.2 < d && d < .2)
+                        continue;
+                    // Add a fake "wheel" to serve as a pivot point
+                    p.AddWheelSetLocation(1, p.OffsetM, p0.Pos[0] + p.OffsetM * p0.Dir[0], p0.Pos[1] + p.OffsetM * p0.Dir[1], p0.Pos[2] + p.OffsetM * p0.Dir[2], 0);
+                    p.FindCenterLine();
+                }
             }
             p0.FindCenterLine();
             Vector3 fwd = new Vector3(p0.Dir[0], p0.Dir[1], -p0.Dir[2]);
@@ -2832,11 +2850,11 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
             m.Backward = fwd;
 
             // Roll the car for superelevation
-            Matrix superelevationRoll = Matrix.CreateRotationZ(rollAngle);
-            m = superelevationRoll * m;
+            m = Matrix.CreateRotationZ(p0.Roll) * m;
 
             // Rolling stock seems to always sit 0.275 meters above the track height
             float railOffset = 0.275f;
+
             Vector3 pos = new Vector3(p0.Pos[0], p0.Pos[1], -p0.Pos[2]);
             m.Translation = pos + m.Up * railOffset;
 
@@ -2845,29 +2863,6 @@ public void ComputePosition(Traveller traveler, bool backToFront, float elapsedT
             WorldPosition.TileZ = tileZ;
 
             UpdatedTraveler(traveler, elapsedTimeS, distance, speed);
-
-            // Determine superelevation angle for bogies
-            for (int i = 1; i < Parts.Count; i++)
-            {
-                TrainCarPart p = Parts[i];
-                if (p.SumWgt < .5) // No wheels on this bogie, skip it
-                    continue;
-                if (p.SumWgt < 1.5)
-                {   // single axle pony trunk
-                    double d = p.OffsetM - p.SumOffset / p.SumWgt;
-                    if (-.2 < d && d < .2)
-                        continue;
-                    // Add a fake "wheel" to serve as a pivot point
-                    p.AddWheelSetLocation(1, p.OffsetM, p0.Pos[0] + p.OffsetM * p0.Dir[0], p0.Pos[1] + p.OffsetM * p0.Dir[1], p0.Pos[2] + p.OffsetM * p0.Dir[2]);
-                    p.FindCenterLine();
-                }
-
-                // Generate superelevation rotation matrix for the bogie
-                if (Flipped == backToFront)
-                    p.Rotation = Matrix.CreateRotationZ(bogieRoll[i - 1]);
-                else
-                    p.Rotation = Matrix.CreateRotationZ(bogieRoll[(Parts.Count - 1) - i]);
-            }
         }
 
         #region Traveller-based updates
@@ -2890,47 +2885,21 @@ internal void UpdatedTraveler(Traveller traveler, float elapsedTimeS, float dist
         /// This WILL move the traveller by the total amount of all the offsets.
         /// Directly sets the superelevation and curve radius for car physics.
         /// </summary>
-        /// <returns>Returns an array giving the angle of visual superelevation at each calculated point.</returns>
-        public float[] UpdateCurveData(Traveller traveller, float[] offsets, out float roll)
+        public void UpdateCurvePhys(Traveller traveller, float[] offsets)
         {
-            roll = 0;
-            bool visualElevationEnabled = Simulator.Settings.UseSuperElevation > 0;
-
             // Ensure at least one offset is given
             if (offsets == null || offsets.Length <= 0)
                 offsets = new[] { 0.0f };
 
             // Need to get superelevation at both ends of the car by offsetting the traveller
-            float[] visualElevation = traveller.GetSuperElevation(visualElevationEnabled, offsets, out float[] physicsElevation, out float[] curveRadii);
-
-            float[] angles = new float[visualElevation.Length];
+            traveller.GetCurveData(offsets, out float[] physicsElevation, out float[] curveRadii);
 
             // Superelevation MUST be limited to track gauge to avoid NaN errors
             SuperelevationM = Math.Min(physicsElevation.Average(), TrackGaugeM);
             // Set superelevation angle used by physics system
             SuperElevationAngleRad = (float)Math.Asin(SuperelevationM / TrackGaugeM);
 
             CurrentCurveRadiusM = curveRadii.Min();
-            float z = visualElevation.Average();
-
-            // Determine superelevation angle for animation, assuming there is any visual elevation
-            if (z != 0)
-            {
-                roll = (float)Math.Asin(z / TrackGaugeM);
-
-                if (Flipped)
-                    roll *= -1;
-
-                for (int v = 0; v < visualElevation.Length; v++)
-                {
-                    angles[v] = (float)Math.Asin(visualElevation[v] / TrackGaugeM);
-
-                    if (Flipped)
-                        angles[v] *= -1;
-                }
-            }
-
-            return angles;
         }
         #endregion
 
@@ -3559,7 +3528,6 @@ public class TrainCarPart
     {
         public float OffsetM; // distance from center of model, positive forward
         public int iMatrix; // matrix index in shape that needs to be moved
-        public Matrix Rotation = Matrix.Identity; // Matrix giving the roll angle of the bogie in absolute terms
         // line fitting variables
         public double SumWgt; // Sum of component weights
         public double SumOffset; // Sum of component weights times offsets
@@ -3568,6 +3536,8 @@ public class TrainCarPart
         public double[] SumPosOffset = new double[3]; // Sum of component locations [x, y, z] times offsets
         public float[] Pos = new float[3]; // Position [x, y, z] of this part, calculated with y-intercept of linear regression
         public float[] Dir = new float[3]; // Oritentation [x, y, z] of this part, calculated with slope of linear regression
+        public float SumRoll; // Sum of all roll angles of components
+        public float Roll; // Roll angle of this part
         public bool Bogie; // True if this is a bogie
         public TrainCarPart(float offset, int i)
         {
@@ -3583,13 +3553,14 @@ public void InitLineFit()
             SumWgt = SumOffset = SumOffsetSq = 0;
             for (int i = 0; i < 3; i++)
                 SumPos[i] = SumPosOffset[i] = 0;
+            SumRoll = 0;
         }
 
         /// <summary>
         /// Directly adds the 3D position values of a sub part to this part. The position
         /// of sub parts will be used to derive the position of this part.
         /// </summary>
-        public void AddWheelSetLocation(float weight, float offset, float x, float y, float z)
+        public void AddWheelSetLocation(float weight, float offset, float x, float y, float z, float roll)
         {
             SumWgt += weight;
             SumOffset += weight * offset;
@@ -3600,6 +3571,7 @@ public void AddWheelSetLocation(float weight, float offset, float x, float y, fl
             SumPosOffset[1] += weight * y * offset;
             SumPos[2] += weight * z;
             SumPosOffset[2] += weight * z * offset;
+            SumRoll += weight * roll;
         }
 
         /// <summary>
@@ -3616,6 +3588,7 @@ public void AddPartLocation(float weight, TrainCarPart part)
                 SumPos[i] += weight * position;
                 SumPosOffset[i] += weight * position * part.OffsetM;
             }
+            SumRoll += weight * part.Roll;
         }
 
         /// <summary>
@@ -3655,6 +3628,8 @@ public void FindCenterLine()
                     Dir[i] = 0;
                 }
             }
+
+            Roll = SumRoll / (float)SumWgt;
         }
     }
 }