Automatic merge of T1.5.1-687-gd279e384a and 10 pull requests

- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #865 at 67014b7: Dispatcher window improvements
- Pull request #874 at f8dbeab: Dynamic brake controller refactoring
- Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #878 at 25f5e06: Implement Polach Adhesion
- Pull request #882 at d8a1c4d: Blueprint/train car operations UI window
- Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling
- Pull request #885 at c81447b: feat: Add notifications to Menu

Author: openrails-bot

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

@@ -195,8 +195,6 @@ public int ActivityDurationS
 
         public bool HasControlCarWithGear = false;
 
-        public float ScreenFrameRate;
-
         //To investigate coupler breaks on route
         private bool numOfCouplerBreaksNoted = false;
         public static int NumOfCouplerBreaks = 0;//Debrief Eval

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -2767,7 +2767,6 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)
                 axle.CurrentCurveRadiusM = CurrentCurveRadiusM;
                 axle.BogieRigidWheelBaseM = RigidWheelBaseM;
                 axle.CurtiusKnifflerZeroSpeed = ZeroSpeedAdhesionBase;
-                axle.ScreenFrameRate = Train.ScreenFrameRate;
             }
 
             LocomotiveAxles.Update(elapsedClockSeconds);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs

@@ -519,11 +519,6 @@ public float TransmissionEfficiency
         /// </summary>
         public float CurtiusKnifflerZeroSpeed;
 
-        /// <summary>
-        /// Simulator FPS
-        /// </summary>
-        public float ScreenFrameRate;
-
         /// <summary>
         /// Wheel adhesion as calculated by Polach
         /// </summary>
@@ -863,6 +858,8 @@ void Integrate(float elapsedClockSeconds)
             float screenFrameUpperLimit = 60;
             float screenFrameLowerLimit = 40;
 
+            var ScreenFrameRate = Simulator.SmoothedFrameRate;
+
             // Reduces the number of substeps if screen FPS drops below a nominal rate of 60 fps
             if ( (int)ScreenFrameRate >= screenFrameUpperLimit) // Screen FPS > 60, hold substeps @ maximum value
             {

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -32,10 +32,12 @@
 using ORTS.Common;
 using ORTS.Scripting.Api;
 using ORTS.Settings;
+using SharpDX.MediaFoundation;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.Remoting.Messaging;
 using Event = Orts.Common.Event;
 
 namespace Orts.Simulation
@@ -58,6 +60,20 @@ namespace Orts.Simulation
     /// </summary>
     public class Simulator
     {
+        /// <summary>
+        ///  Sets the frame rate object so its value can be read from anywhere in the Simulator and used to tune simulation algorithms.
+        /// </summary>
+        /// <param name="frameRate"></param>
+        public static void SetFrameRate(SmoothedData frameRate)
+        {
+            FrameRate = frameRate;
+        }
+        public static float SmoothedFrameRate
+        {
+            get { return FrameRate.SmoothedValue; }
+        }
+        private static SmoothedData FrameRate;
+
         public static GettextResourceManager Catalog { get; private set; }
         public static Random Random { get; private set; }
         public static double Resolution = 1000000; // resolution for calculation of random value with a pseudo-gaussian distribution
@@ -1355,8 +1371,8 @@ private Train InitializePlayerTrain()
             train.AITrainBrakePercent = 100; //<CSComment> This seems a tricky way for the brake modules to test if it is an AI train or not
             train.EqualReservoirPressurePSIorInHg = prevEQres; // The previous command modifies EQ reservoir pressure, causing issues with EP brake systems, so restore to prev value
 
-//            if ((PlayerLocomotive as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
-//                train.EOT = new EOT((PlayerLocomotive as MSTSLocomotive).EOTEnabled, false, train);
+            //            if ((PlayerLocomotive as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
+            //                train.EOT = new EOT((PlayerLocomotive as MSTSLocomotive).EOTEnabled, false, train);
 
             return (train);
         }
@@ -1432,8 +1448,8 @@ private AITrain InitializeAPPlayerTrain()
 
             if (conFileName.Contains("tilted")) train.IsTilting = true;
 
-//            if ((PlayerLocomotive as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
-//                train.EOT = new EOT((PlayerLocomotive as MSTSLocomotive).EOTEnabled, false, train);
+            //            if ((PlayerLocomotive as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
+            //                train.EOT = new EOT((PlayerLocomotive as MSTSLocomotive).EOTEnabled, false, train);
 
             return train;
         }
@@ -1487,7 +1503,7 @@ private void InitializeStaticConsists()
 
                         if (!File.Exists(wagonFilePath))
                         {
-                            Trace.TraceWarning($"Ignored missing {(wagon.IsEngine? "engine" : "wagon")} {wagonFilePath} in activity definition {activityObject.Train_Config.TrainCfg.Name}");
+                            Trace.TraceWarning($"Ignored missing {(wagon.IsEngine ? "engine" : "wagon")} {wagonFilePath} in activity definition {activityObject.Train_Config.TrainCfg.Name}");
                             continue;
                         }
 

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -474,10 +474,6 @@ void TextPageCommon(TableData table)
             TableAddLabelValue(table, Viewer.Catalog.GetString("FPS"), "{0:F0}", Viewer.RenderProcess.FrameRate.SmoothedValue);
             TableAddLine(table);
 
-            // Used in axle module to adjust substeps for frame rate drops
-            var mstsLocomotive = Viewer.PlayerLocomotive as MSTSLocomotive;
-            Viewer.PlayerTrain.ScreenFrameRate = Viewer.RenderProcess.FrameRate.SmoothedValue;
-
             if (Viewer.PlayerLocomotive.Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING)
                 TableAddLine(table, Viewer.Catalog.GetString("Autopilot") + "???");
 

Source/RunActivity/Viewer3D/Viewer.cs

@@ -366,6 +366,8 @@ public Viewer(Simulator simulator, Orts.Viewer3D.Processes.Game game)
                     SpeedpostDatFile = new SpeedpostDatFile(Simulator.RoutePath + @"\speedpost.dat", Simulator.RoutePath + @"\shapes\");
                 }
             }
+            // So the frame rate can be read from anywhere in the Simulator and used to tune simulation algorithms.
+            Simulator.SetFrameRate(this.RenderProcess.FrameRate);
 
             Initialize();
         }