Some tweaks, new vertex PositionControl feature for track profiles

Author: SteelFill

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

@@ -300,7 +300,7 @@ void MarkSections(Simulator simulator, List<TrVectorSection> SectionList, float
                     // Special case: Next section is a short straight, but isn't the end of the curve
                     // In this case, we force the straight section to maintain nonzero superelevation
                     if (count < SectionList.Count - 2 && SectionList[count + 1].NomElevM == 0.0f
-                        && lengths[count + 1] < (SectionList[count].NomElevM / effectiveRunoffSlope) * 2.0f)
+                        && lengths[count + 1] < (SectionList[count].NomElevM / effectiveRunoffSlope) * 1.5f)
                         SectionList[count + 1].NomElevM = (SectionList[count].NomElevM + SectionList[count + 2].NomElevM) / 2.0f;
 
                     endElevs[count] = Math.Min((SectionList[count].NomElevM + SectionList[count + 1].NomElevM) / 2.0f,

Source/Orts.Simulation/Simulation/SuperElevation.cs

@@ -863,6 +863,7 @@ public TrProfile(Viewer viewer, XmlReader reader)
                             v.Normal = new Vector3(float.Parse(s[0]), float.Parse(s[1]), float.Parse(s[2]));
                             s = reader.GetAttribute("TexCoord").Split(sep, StringSplitOptions.RemoveEmptyEntries);
                             v.TexCoord = new Vector2(float.Parse(s[0]), float.Parse(s[1]));
+                            v.PositionControl = Vertex.GetPositionControl(reader.GetAttribute("PositionControl"));
                             pl.Vertices.Add(v);
                             lodItem.NumVertices++; // Bump vertex count
                             if (pl.Vertices.Count > 1) lodItem.NumSegments++;
@@ -1171,21 +1172,54 @@ public struct Vertex
         public Vector3 Normal;                             // Normal vector (nx, ny, nz)
         public Vector2 TexCoord;                           // Texture coordinate (u, v)
 
+        /// <summary>
+        /// Enumeration of controls for vertex displacement
+        /// </summary>
+        public enum VertexPositionControl
+        {
+            /// <summary>
+            /// None -- The vertex position won't be adjusted by superelevation.
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// All -- The vertex position will be adjusted by superelevation.
+            /// </summary>
+            All,
+
+            /// <summary>
+            /// Inside -- The vertex position will only be adjusted when on the inside of the curve.
+            /// </summary>
+            Inside,
+
+            /// <summary>
+            /// Outside -- The vertex position will only be adjusted when on the outside of the curve.
+            /// </summary>
+            Outside
+        }
+
+        public VertexPositionControl PositionControl;
+
         // Vertex constructor (default)
-        public Vertex(float x, float y, float z, float nx, float ny, float nz, float u, float v)
+        public Vertex(float x, float y, float z, float nx, float ny, float nz, float u, float v,
+            VertexPositionControl control = VertexPositionControl.All)
         {
             Position = new Vector3(x, y, z);
             Normal = new Vector3(nx, ny, nz);
             TexCoord = new Vector2(u, v);
+            PositionControl = control;
         }
 
         // Vertex constructor (DAT)
         public Vertex(STFReader stf)
         {
-            Vertex v = new Vertex(); // Temp variable used to construct the struct in ParseBlock
-            v.Position = new Vector3();
-            v.Normal = new Vector3();
-            v.TexCoord = new Vector2();
+            Vertex v = new Vertex
+            {
+                Position = new Vector3(),
+                Normal = new Vector3(),
+                TexCoord = new Vector2(),
+                PositionControl = VertexPositionControl.All
+            }; // Temp variable used to construct the struct in ParseBlock
             stf.MustMatch("(");
             stf.ParseBlock(new STFReader.TokenProcessor[] {
                 new STFReader.TokenProcessor("position", ()=>{
@@ -1208,13 +1242,42 @@ public Vertex(STFReader stf)
                     v.TexCoord.Y = stf.ReadFloat(STFReader.UNITS.None, null);
                     stf.SkipRestOfBlock();
                 }),
+                new STFReader.TokenProcessor("positioncontrol", ()=>{
+                    v.PositionControl = GetPositionControl(stf.ReadStringBlock(null));
+                }),
             });
             this = v;
             // Checks for required member variables
             // No way to check for missing Position.
             if (Normal == Vector3.Zero) throw new Exception("improper Normal");
             // No way to check for missing TexCoord
         }
+
+        /// <summary>
+        /// Gets a member of the VertexPositionControl enumeration that corresponds to sPositionControl.
+        /// </summary>
+        /// <param name="sPositionControl">String that identifies desired PositionControl.</param>
+        /// <returns></returns>
+        public static VertexPositionControl GetPositionControl(string sPositionControl)
+        {
+            string s = sPositionControl.ToLower();
+            switch (s)
+            {
+                case "none":
+                    return VertexPositionControl.None;
+
+                case "inside":
+                    return VertexPositionControl.Inside;
+
+                case "outside":
+                    return VertexPositionControl.Outside;
+
+                case "all":
+                default:
+                    return VertexPositionControl.All;
+
+            }
+        }
     }
 
     public class DynamicTrackPrimitive : ShapePrimitive //RenderPrimitive

Source/RunActivity/Viewer3D/DynamicTrack.cs

@@ -740,9 +740,20 @@ public override ShapePrimitive BuildPrimitive(Viewer viewer, int iLOD, int iLODI
                         // Rotate the vertex position based on superelevation
                         if (Direction != 0)
                         {
-                            p -= RollOffset;
-                            p = Vector3.Transform(p, SuperElevationRoll);
-                            p += RollOffset;
+                            // Check if this vertex should be translated by superelevation
+                            bool reposition = v.PositionControl != Vertex.VertexPositionControl.None;
+
+                            if (Math.Sign(p.X) == Direction && v.PositionControl == Vertex.VertexPositionControl.Inside)
+                                reposition = false;
+                            else if (Math.Sign(p.X) == -Direction && v.PositionControl == Vertex.VertexPositionControl.Outside)
+                                reposition = false;
+
+                            if (reposition)
+                            {
+                                p -= RollOffset;
+                                p = Vector3.Transform(p, SuperElevationRoll);
+                                p += RollOffset;
+                            }
                         }
 
                         // In some extreme cases, track may have been rotated so much it's upside down