Automatic merge of T1.5.1-866-gbae4730e2 and 17 pull requests

- Pull request #570 at 3539862: 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 #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 9c456aa: Blueprint/train car operations UI window
- Pull request #885 at 8f94333: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #897 at 42f1dd9: feat: Improved system information collection
- Pull request #903 at 0d6d045: Downloading route content (Github, zip)
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #908 at ad3362c: feat: supports switching adhesion precisions
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #912 at 659396e: New Triple Valve Features Vol. 2
- Pull request #914 at e236654: Adjustments to Duplex steam
- Pull request #915 at 6d911d7: Correct calculation error with curve friction
- Pull request #916 at 11ac52c: Distributed Power Air Brake Synchronization

Author: openrails-bot

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

@@ -204,6 +204,8 @@ public float CurrentLocomotiveSteamHeatBoilerWaterCapacityL
         public float BoilerPressurePSI;     // Steam Gauge pressure - what the engineer sees.
         public float MaxBoilerPressurePSI = 180f;  // maximum boiler pressure, safety valve setting
 
+        public float SandingSteamUsageLBpS;       // Sanding Steam Usage
+
         // Vacuum Reservoir and Exhauster Settings
 
         // Steam heating Flags
@@ -248,12 +250,14 @@ public enum SlipControlType
         float DebugSpeed = 1; // Used for debugging adhesion coefficient
 
         // parameters for Track Sander based upon compressor air and abrasive table for 1/2" sand blasting nozzle @ 50psi
-        public float MaxTrackSandBoxCapacityM3 = Me3.FromFt3(40.0f);  // Capacity of sandbox - assume 40.0 cu ft
+        public float MaxTrackSandBoxCapacityM3; // Capacity of sandbox
         public float CurrentTrackSandBoxCapacityM3; 
-        public float TrackSanderAirComsumptionM3pS = Me3.FromFt3(195.0f) / 60.0f;  // Default value - cubic feet per min (CFM) 195 ft3/m
-        public float TrackSanderAirPressurePSI = 50.0f;
-        public float TrackSanderSandConsumptionM3pS = Me3.FromFt3(11.6f) / 3600.0f; // Default value - 11.6 ft3/h
+        public float TrackSanderAirComsumptionM3pS;
+        public float TrackSanderSandConsumptionM3pS;
         public float SandWeightKgpM3 = 1600; // One cubic metre of sand weighs about 1.54-1.78 tonnes. 
+        public float TrackSanderSteamConsumptionForwardLbpS;
+        public float TrackSanderSteamConsumptionReverseLbpS;
+
 
         // Vacuum Braking parameters
         readonly static float OneAtmospherePSI = Bar.ToPSI(1);
@@ -1763,6 +1767,33 @@ public override void Initialize()
                 }
             }
 
+            // Initialise track sanding parameters
+            if (MaxTrackSandBoxCapacityM3 == 0)
+            {
+                MaxTrackSandBoxCapacityM3 = Me3.FromFt3(40.0f);  // Capacity of sandbox - assume 40.0 cu ft
+            }
+
+            if (TrackSanderAirComsumptionM3pS == 0)
+            {
+                TrackSanderAirComsumptionM3pS = Me3.FromFt3(195.0f) / 60.0f;  // Default value - cubic feet per min (CFM) 195 ft3/m
+            }
+
+            if (TrackSanderSandConsumptionM3pS == 0)
+            {
+                TrackSanderSandConsumptionM3pS = Me3.FromFt3(11.6f) / 3600.0f; // Default value - 11.6 ft3/h
+            }
+
+            if (TrackSanderSteamConsumptionForwardLbpS == 0 && SandingSystemType == SandingSystemTypes.Steam)
+            {
+                TrackSanderSteamConsumptionForwardLbpS = 300f / 3600f; // Default value - 300lbs/hr
+            }
+
+            if (TrackSanderSteamConsumptionReverseLbpS == 0 && SandingSystemType == SandingSystemTypes.Steam)
+            {
+                TrackSanderSteamConsumptionReverseLbpS = 300f / 3600f; // Default value - 300lbs/hr
+            }
+
+
             base.Initialize();
             if (DynamicBrakeBlendingEnabled) airPipeSystem = BrakeSystem as AirSinglePipe;
 
@@ -3245,6 +3276,7 @@ public void UpdateTrackSander(float elapsedClockSeconds)
 
             if (Sander && AbsSpeedMpS < SanderSpeedOfMpS)  // If sander switch is on, and not blocked by speed, adjust parameters
             {
+                // Calculate sand consumption for sander
                 if (CurrentTrackSandBoxCapacityM3 > 0.0) // if sand still in sandbox then sanding is available
                 {
                     // Calculate consumption of sand, and drop in sand box level
@@ -3257,9 +3289,17 @@ public void UpdateTrackSander(float elapsedClockSeconds)
                     }
                 }
 
+                // Calculate steam, air or gravity consumption for different sander modes
                 if (SandingSystemType == SandingSystemTypes.Steam)
                 {
-
+                    if (Direction == Direction.Reverse)
+                    {
+                        SandingSteamUsageLBpS = TrackSanderSteamConsumptionReverseLbpS;
+                    }
+                    else
+                    {
+                        SandingSteamUsageLBpS = TrackSanderSteamConsumptionForwardLbpS;
+                    }
 
                 }
                 else

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -411,7 +411,6 @@ public float TenderCoalMassKG              // Decreased by firing and increased
         float BoilerHeatTransferCoeffWpM2K = 45.0f; // Heat Transfer of locomotive boiler 45 Wm2K
         float TotalSteamUsageLBpS;                  // Running total for complete current steam usage
         float GeneratorSteamUsageLBpS = 1.0f;       // Generator Steam Usage
-        float SandingSteamUsageLBpS;       // Sanding Steam Usage
         float RadiationSteamLossLBpS = 2.5f;        // Steam loss due to radiation losses
         float BlowerBurnEffect;                     // Effect of Blower on burning rate
         float FlueTempDiffK;                        // Current difference in flue temp at current firing and steam usage rates.
@@ -691,8 +690,6 @@ public float TenderCoalMassKG              // Decreased by firing and increased
         public float SanderSteamExhaustVelocityMpS;
         public float SanderSteamExhaustParticleDurationS;
 
-        float SanderSteamConsumptionLbpS = 17; // Assume 1000lbs/hr steam consumption for the sander
-
         public float Cylinders2_11SteamVolumeM3pS;
         public float Cylinders2_12SteamVolumeM3pS;
         public float Cylinders2_21SteamVolumeM3pS;
@@ -6631,11 +6628,10 @@ private void UpdateAuxiliaries(float elapsedClockSeconds, float absSpeedMpS)
                 CylCockSteamUsageDisplayLBpS = 0.0f;
             }
 
-            // Calculate sanding steam Usage if turned on
+            // Calculate sanding steam Usage if a steam based system and turned on
             // Assume steam sanding usage is 1000lbs/hr
-            if (Sander && SandingSystemType == SandingSystemTypes.Steam) 
+            if (Sander && SandingSystemType == SandingSystemTypes.Steam)
             {
-                SandingSteamUsageLBpS = SanderSteamConsumptionLbpS; 
                 BoilerMassLB -= elapsedClockSeconds * SandingSteamUsageLBpS; // Reduce boiler mass to reflect steam usage by generator  
                 BoilerHeatBTU -= elapsedClockSeconds * SandingSteamUsageLBpS * (BoilerSteamHeatBTUpLB - BoilerWaterHeatBTUpLB);  // Reduce boiler Heat to reflect steam usage by generator
                 BoilerHeatOutBTUpS += SandingSteamUsageLBpS * (BoilerSteamHeatBTUpLB - BoilerWaterHeatBTUpLB);  // Reduce boiler Heat to reflect steam usage by generator

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -648,8 +648,7 @@ public Direction Direction
         public int LocoNumDrvAxles; // Number of drive axles on locomotive
         protected float MSTSLocoNumDrvWheels; // Number of drive axles on locomotive - used to read MSTS value as default
         public float DriverWheelRadiusM = Me.FromIn(30.0f); // Drive wheel radius of locomotive wheels - Wheel radius of loco drive wheels can be anywhere from about 10" to 40".
-
-        public enum SteamEngineTypes
+                public enum SteamEngineTypes
         {
             Unknown,
             Simple,
@@ -664,6 +663,7 @@ public enum SandingSystemTypes
             Unknown,
             Air,
             Steam,
+            Gravity,
         }
 
         public SandingSystemTypes SandingSystemType;