Automatic merge of T1.5.1-1695-gade019506 and 16 pull requests

- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting
- Pull request #900 at 4629736: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
- Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at b96d6fa: Train Forces popup Window.
- Pull request #1064 at 52410f9: Add Train Info tab to Help window (F1)
- Pull request #1066 at 62c89c1: Log derailment, using TraceInformation.
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 335f998: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #1000 at d8d9709: Locomotive operation from control car
- Pull request #1057 at 254b6d4: Switchable brake system
- Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051
- Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts
- Pull request #1055 at 5c78967: Route Based TTrack Sounds
- Pull request #1049 at 4dd8c4f: Re-organise document storage and access

Author: openrails-bot

Source/Orts.Formats.Msts/TrackSectionsFile.cs

@@ -183,16 +183,6 @@ public SectionIdx(STFReader stf)
 			}
 			stf.SkipRestOfBlock();
 		}
-        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 

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

@@ -4586,9 +4586,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(Simulator.Settings.UseSuperElevation);
+                    float roll = traveller.GetVisualElevation();
                     car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                    roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
+                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                     // Normalize across tile boundaries
                     x += 2048 * (tileX - traveller.TileX);
@@ -4739,9 +4739,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(Simulator.Settings.UseSuperElevation);
+                    float roll = traveller.GetVisualElevation();
                     car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                    roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
+                    roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                     // Normalize across tile boundaries
                     x += 2048 * (tileX - traveller.TileX);
@@ -4820,9 +4820,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(Simulator.Settings.UseSuperElevation);
+                float roll = traveller.GetVisualElevation();
                 car.UpdateCurvePhys(traveller, new[] { 0, car.CarBogieCentreLengthM });
-                roll = (roll + traveller.GetVisualElevation(Simulator.Settings.UseSuperElevation)) / 2.0f;
+                roll = (roll + traveller.GetVisualElevation()) / 2.0f;
 
                 // Normalize across tile boundaries
                 x += 2048 * (tileX - traveller.TileX);

Source/RunActivity/Viewer3D/DynamicTrack.cs

@@ -1503,9 +1503,6 @@ 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++;

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -879,21 +879,16 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
 
 #endif
 
-            // Bogie angle animation
+            // truck 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;
-
-                // 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)
-                {
-                    // 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))
@@ -910,7 +905,7 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
                     // 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;
 

Source/RunActivity/Viewer3D/SuperElevation.cs

@@ -59,34 +59,27 @@ public static bool DecomposeStaticSuperElevation(Viewer viewer, TrackObj trackOb
             // each subsection.  The rotation component changes only in heading.  The translation 
             // component steps along the path to reflect the root of each subsection.
 
-            bool dontRender = false; // Should this shape be left as a static object?
-            bool removePhys = false; // Should superelevation physics be removed from this object?
-            SectionIdx[] SectionIdxs;
+            TrackShape shape;
 
-            // Using the track object, determine the track sections
-            // Most track sections can be recovered directly from a TrackShape object
-            if (viewer.Simulator.TSectionDat.TrackShapes.TryGetValue(trackObj.SectionIdx, out TrackShape shape))
+            try
             {
-                if (shape.RoadShape)
-                    return false; // Roads don't use superelevation, no use in processing them.
+                shape = viewer.Simulator.TSectionDat.TrackShapes.Get(trackObj.SectionIdx);
 
-                // Can't render superelevation on tunnel shapes
-                dontRender = shape.TunnelShape;
-                // Can't render superelevation and shouldn't have physics superelevation on junctions and crossovers
-                dontRender |= removePhys = (shape.NumPaths > 1 && shape.ClearanceDistance != 0);
-                SectionIdxs = shape.SectionIdxs;
-            }   // Some route-specific shapes (DynaTrax) won't be populated in the TrackShapes list, check the TrackPaths list
-            else if (viewer.Simulator.TSectionDat.TSectionIdx.TrackPaths.TryGetValue(trackObj.SectionIdx, out TrackPath path))
+                if (shape.RoadShape == true)
+                    return false; // Roads don't use superelevation, no use in processing them.
+            }
+            catch (Exception)
             {
-                // Translate given data into a SectionIdx object that the rest of the method can interpret
-                // Assumptions: Each piece of DynaTrax is a single section with origin 0, 0, 0 and 0 angle,
-                // and the entire section of DynaTrax is defined by the track sections given in the track path
-                SectionIdxs = new SectionIdx[1];
-                SectionIdxs[0] = new SectionIdx(path);
+                return false; // Won't be able to render with superelevation
             }
-            else
-                return false; // Can't find section info, won't be able to render with superelevation
 
+            SectionIdx[] SectionIdxs = shape.SectionIdxs;
+
+            // Can't render superelevation on tunnel shapes
+            // NOTE: Even if we don't render superelevation, we still need to run through processing to remove superelevation from track sections
+            bool dontRender = shape.TunnelShape;
+            // Sometimes junctions get caught here, physics superelevation should be removed for those as well
+            bool removePhys = false;
             // 0 = centered, positive = rotation axis moves to inside of curve, negative = moves to outside of curve
             float rollOffsetM = 0.0f;
 
@@ -130,18 +123,27 @@ public static bool DecomposeStaticSuperElevation(Viewer viewer, TrackObj trackOb
             // Iterate through all subsections
             foreach (SectionIdx id in SectionIdxs)
             {
+                // If section angle offset is not zero, that means we have a complicated track shape (eg: junction)
+                // If any sections have identical starting conditions, that means we have a junction
+                // These should not be rendered using superelevation
+                if (!dontRender && id.A != 0.0f)
+                    dontRender = true;
+                if (!dontRender && !removePhys
+                    && SectionIdxs.Any(idx => idx != id && idx.X == id.X && idx.Y == id.Y && idx.Z == id.Z))
+                {
+                    dontRender = true;
+                    removePhys = true;
+                }
+
                 // The following vectors represent local positioning relative to root of original section:
-                Vector3 offset = new Vector3((float)id.X, (float)id.Y, -(float)id.Z); // Offset from section origin for this series of sections
+                Vector3 offset = new Vector3((float)id.X, (float)id.Y, (float)id.Z); // Offset from section origin for this series of sections
                 Vector3 localV = Vector3.Zero; // Local position of subsection (in x-z plane)
                 Vector3 heading = Vector3.Forward; // Local heading (unit vector)
 
                 WorldPosition worldMatrix = new WorldPosition(worldMatrixInput); // Copy origin location
 
                 worldMatrix.XNAMatrix.Translation = Vector3.Transform(offset, worldMatrix.XNAMatrix);
 
-                // If the section is rotated, apply that rotation now so we don't need to in the future
-                worldMatrix.XNAMatrix = Matrix.CreateRotationY(MathHelper.ToRadians(-(float)id.A)) * worldMatrix.XNAMatrix;
-
                 WorldPosition nextRoot = new WorldPosition(worldMatrix); // Will become initial root
                 Vector3 sectionOrigin = worldMatrix.XNAMatrix.Translation; // Original position for entire section
                 worldMatrix.XNAMatrix.Translation = Vector3.Zero; // worldMatrix now rotation-only
@@ -221,17 +223,14 @@ public static void ClearJunctionSuperElevation(Viewer viewer, TrackObj trackObj,
             foreach (SectionIdx id in SectionIdxs)
             {
                 // The following vectors represent local positioning relative to root of original section:
-                Vector3 offset = new Vector3((float)id.X, (float)id.Y, -(float)id.Z); // Offset from section origin for this series of sections
+                Vector3 offset = new Vector3((float)id.X, (float)id.Y, (float)id.Z); // Offset from section origin for this series of sections
                 Vector3 localV = Vector3.Zero; // Local position of subsection (in x-z plane)
                 Vector3 heading = Vector3.Forward; // Local heading (unit vector)
 
                 WorldPosition worldMatrix = new WorldPosition(worldMatrixInput); // Copy origin location
 
                 worldMatrix.XNAMatrix.Translation = Vector3.Transform(offset, worldMatrix.XNAMatrix);
 
-                // If the section is rotated, apply that rotation now so we don't need to in the future
-                worldMatrix.XNAMatrix = Matrix.CreateRotationY(MathHelper.ToRadians(-(float)id.A)) * worldMatrix.XNAMatrix;
-
                 WorldPosition nextRoot = new WorldPosition(worldMatrix); // Will become initial root
                 Vector3 sectionOrigin = worldMatrix.XNAMatrix.Translation; // Original position for entire section
                 worldMatrix.XNAMatrix.Translation = Vector3.Zero; // worldMatrix now rotation-only
@@ -827,9 +826,6 @@ public override void LinearGen()
                 // Very short length track, use minimum of two sections
                 if (NumSections == 0)
                     NumSections = 2;
-                // Limit the number of sections to prevent overflowing the number of triangles
-                else if (NumSections > 250)
-                    NumSections = 250;
                 // Ensure an even number of sections
                 if (NumSections % 2 == 1)
                     NumSections++;