Deprecate superelevation minimum length setting, calculate minimum length on the fly, fix static consist superelevation

Author: SteelFill

Source/Menu/Options.Designer.cs

@@ -326,7 +326,6 @@ orderby folder.Key
 
             // Experimental tab
             numericUseSuperElevation.Value = Settings.UseSuperElevation;
-            numericSuperElevationMinLen.Value = Settings.SuperElevationMinLen;
             numericSuperElevationGauge.Value = Settings.SuperElevationGauge;
             trackLODBias.Value = Settings.LODBias;
             trackLODBias_ValueChanged(null, null);
@@ -517,7 +516,6 @@ void buttonOK_Click(object sender, EventArgs e)
 
             // Experimental tab
             Settings.UseSuperElevation = (int)numericUseSuperElevation.Value;
-            Settings.SuperElevationMinLen = (int)numericSuperElevationMinLen.Value;
             Settings.SuperElevationGauge = (int)numericSuperElevationGauge.Value;
             Settings.LODBias = trackLODBias.Value;
             Settings.SignalLightGlow = checkSignalLightGlow.Checked;

Source/Menu/Options.cs

@@ -289,8 +289,6 @@ public enum DirectXFeature
         // Experimental settings:
         [Default(0)]
         public int UseSuperElevation { get; set; }
-        [Default(50)]
-        public int SuperElevationMinLen { get; set; }
         [Default(1435)]
         public int SuperElevationGauge { get; set; }
         [Default(0)]

Source/ORTS.Settings/UserSettings.cs

@@ -4537,7 +4537,7 @@ public void RepositionRearTraveller()
 
                     // Position car based on MSTS position, and rotate based on superelevation
                     car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
-                    car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ(roll) * car.WorldPosition.XNAMatrix;
+                    car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
 
                     // note the railcar sits 0.275meters above the track database path  TODO - is this always consistent?
                     float railOffset = 0.275f;
@@ -4670,7 +4670,7 @@ public void CalculatePositionOfCars(float elapsedTime, float distance)
 
                     // Position car based on MSTS position, and rotate based on superelevation
                     car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
-                    car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ(roll) * car.WorldPosition.XNAMatrix;
+                    car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
 
                     // note the railcar sits 0.275meters above the track database path  TODO - is this always consistent?
                     float railOffset = 0.275f;
@@ -4763,7 +4763,7 @@ public void CalculatePositionOfEOT()
 
                 // Position car based on MSTS position, and rotate based on superelevation
                 car.WorldPosition.XNAMatrix *= Simulator.XNAMatrixFromMSTSCoordinates(traveller.X, traveller.Y, traveller.Z, x, y, z);
-                car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ(roll) * car.WorldPosition.XNAMatrix;
+                car.WorldPosition.XNAMatrix = Matrix.CreateRotationZ((car.Flipped ? -1.0f : 1.0f) * roll) * car.WorldPosition.XNAMatrix;
 
                 // note the railcar sits 0.275meters above the track database path  TODO - is this always consistent?
                 float railOffset = 0.275f;

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

@@ -130,7 +130,6 @@ public class Simulator
         public int CarVibrating;
         public int UseSuperElevation; //amount of superelevation
         public SuperElevation SuperElevation;
-        public int SuperElevationMinLen = 50;
         public float SuperElevationGauge = 1.435f;//1.435 guage
         public LoadStationsPopulationFile LoadStationsPopulationFile;
 
@@ -274,7 +273,6 @@ public Simulator(UserSettings settings, string activityPath, bool useOpenRailsDi
             BreakCouplers = Settings.BreakCouplers;
             CarVibrating = Settings.CarVibratingLevel; //0 no vib, 1-2 mid vib, 3 max vib
             UseSuperElevation = Settings.UseSuperElevation;
-            SuperElevationMinLen = Settings.SuperElevationMinLen;
             SuperElevationGauge = (float)Settings.SuperElevationGauge / 1000f;//gauge transfer from mm to m
             RoutePath = Path.GetDirectoryName(Path.GetDirectoryName(activityPath));
             if (useOpenRailsDirectory) RoutePath = Path.GetDirectoryName(RoutePath); // starting one level deeper!

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -136,13 +136,6 @@ void MarkSections(Simulator simulator, List<TrVectorSection> SectionList, float
         {
             if (SectionList.Count <= 0)
                 return; // Avoid errors with invalid section lists
-            else if (totLen < simulator.SuperElevationMinLen)
-            {
-                // Zero out any curves that are too short
-                foreach (TrVectorSection s in SectionList)
-                    s.NomElevM = 0;
-                return;
-            }
 
             // The superelevation standard we will use. null means no superelevation
             SuperElevationStandard standard = null;
@@ -178,7 +171,17 @@ void MarkSections(Simulator simulator, List<TrVectorSection> SectionList, float
             }
 
             if (standard == null)
+            {
+                foreach (TrVectorSection s in SectionList)
+                    s.NomElevM = 0;
                 return; // No superelevation needed, stop processing here
+            }
+            if ((standard.MinCantM / effectiveRunoffSlope) * 2.0f > totLen * 0.75f)
+            {
+                foreach (TrVectorSection s in SectionList)
+                    s.NomElevM = 0;
+                return; // Curve is so short that no meaningful superelevation can be applied
+            }
 
             // Determine proper level of superelevation for every section
             for (int i = 0; i < SectionList.Count; i++)