Automatic merge of T1.5.1-947-g34e078c205 and 15 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- 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 3ca0eb1: Blueprint/train car operations UI window
- 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 #903 at 7af1f91: Downloading route content (Github, zip)
- Pull request #912 at 6b9fca4: New Triple Valve Features Vol. 2
- Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #923 at fc1ac91: Add curve squeal to route
- Pull request #924 at 6c2c3cd: Default Asset Improvements
- Pull request #927 at a28da45: AI Train Power Supply/Lights Fix
- Pull request #929 at a406a69: Add support for common circuit breaker variants
- Pull request #938 at ebe8047: Fix Missing Initializations From Copy in MSTSWagon.cs

Author: openrails-bot

Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt

@@ -205,10 +205,6 @@ public enum DirectXFeature
         public int DayAmbientLight { get; set; }
         [Default(AntiAliasingMethod.MSAA2x)]
         public int AntiAliasing { get; set; }
-        [Default(false)]
-        public bool GltfAnimations { get; set; }
-        [Default(true)]
-        public bool GltfTangentsAlwaysCalculatedPerPixel { get; set; }
 
         // Simulation settings:
 

Source/3rdPartyLibs/glTFLoader/extras.schema.json

@@ -39,17 +39,6 @@ public ConsistFile(string filePath)
             Name = Train.TrainCfg.Name;
         }
 
-        /// <summary>
-        /// Allows to use a procedurally generated consist file.
-        /// </summary>
-        public ConsistFile(Stream inputStream, string filePath)
-        {
-            using (var stf = new STFReader(inputStream, filePath, System.Text.Encoding.UTF8, false))
-                stf.ParseFile(new STFReader.TokenProcessor[] {
-                    new STFReader.TokenProcessor("train", ()=>{ Train = new Train_Config(stf); }),
-                });
-        }
-
         public override string ToString()
         {
             return Name;

Source/3rdPartyLibs/glTFLoader/glTFLoader.dll

@@ -4990,7 +4990,6 @@ public void ToggleCabRadio( bool newState)
         public void ToggleWipers(bool newState)
         {
             SignalEvent(newState ? Event.WiperOn : Event.WiperOff);
-            if (ConsistGenerator.GltfVisualTestRun) Train.SignalEvent(newState ? Event.WiperOn : Event.WiperOff);
         }
 
         public void SetBailOff(bool bailOff)
@@ -5058,14 +5057,12 @@ public void GenericItem1Toggle()
         {
             GenericItem1 = !GenericItem1;
             SignalEvent(GenericItem1? Event.GenericItem1On : Event.GenericItem1Off); // hook for sound trigger
-            if (ConsistGenerator.GltfVisualTestRun) Train.SignalEvent(GenericItem1 ? Event.GenericItem1On : Event.GenericItem1Off);
         }
 
         public void GenericItem2Toggle()
         {
             GenericItem2 = !GenericItem2;
             SignalEvent(GenericItem2 ? Event.GenericItem2On : Event.GenericItem2Off); // hook for sound trigger
-            if (ConsistGenerator.GltfVisualTestRun) Train.SignalEvent(GenericItem2 ? Event.GenericItem2On : Event.GenericItem2Off);
         }
 
         public override bool GetCabFlipped()
@@ -5148,10 +5145,6 @@ public override void SignalEvent(Event evt)
                         }
                         break;
                     }
-                case Event.GenericItem1On: if (ConsistGenerator.GltfVisualTestRun) GenericItem1 = true; break;
-                case Event.GenericItem1Off: if (ConsistGenerator.GltfVisualTestRun) GenericItem1 = false; break;
-                case Event.GenericItem2On: if (ConsistGenerator.GltfVisualTestRun) GenericItem2 = true; break;
-                case Event.GenericItem2Off: if (ConsistGenerator.GltfVisualTestRun) GenericItem2 = false; break;
             }
 
             base.SignalEvent(evt);

Source/ORTS.Common/ConsistGenerator.cs

@@ -430,9 +430,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
             if (File.Exists(orFile))
                 wagFilePath = orFile;
 
-            using (STFReader stf = ConsistGenerator.IsWagonRecognized(wagFilePath)
-                ? new STFReader(ConsistGenerator.GetWagon(wagFilePath), wagFilePath, System.Text.Encoding.UTF8, true)
-                : new STFReader(wagFilePath, true))
+            using (STFReader stf = new STFReader(wagFilePath, true))
             {
                 while (!stf.Eof)
                 {
@@ -3048,7 +3046,7 @@ private void UpdateWheelBearingTemperature(float elapsedClockSeconds)
         private void UpdateWindForce()
         {
             // Calculate compensation for  wind
-            // There are two components due to wind - 
+            // There are two components due to wind -
             // Drag, impact of wind on train, will increase resistance when head on, will decrease resistance when acting as a tailwind.
             // Lateral resistance - due to wheel flange being pushed against rail due to side wind.
             // Calculation based upon information provided in AREA 1942 Proceedings - https://archive.org/details/proceedingsofann431942amer - pg 56
@@ -3060,7 +3058,7 @@ private void UpdateWindForce()
                 var directionRad = (float)Math.Atan2(WorldPosition.XNAMatrix.M13, WorldPosition.XNAMatrix.M11);
                 var directionDeg = MathHelper.ToDegrees(directionRad);
 
-                // If car is flipped, then the car's direction will be reversed by 180 compared to the rest of the train, and thus for calculation purposes only, 
+                // If car is flipped, then the car's direction will be reversed by 180 compared to the rest of the train, and thus for calculation purposes only,
                 // it is necessary to reverse the "assumed" direction of the car back again. This shouldn't impact the visual appearance of the car.
                 if (Flipped)
                 {
@@ -3070,12 +3068,12 @@ private void UpdateWindForce()
                     // If this results in an angle greater then 360, then convert it back to an angle between 0 & 360.
                     if (directionDeg > 360)
                         directionDeg -= 360;
-                }                   
+                }
 
                 // If a westerly direction (ie -ve) convert to an angle between 0 and 360
                 if (directionDeg < 0)
                     directionDeg += 360;
-                
+
                 // Find angle between wind and direction of train
                 var resultantWindComponentDeg = 0.0f;
                 if (Train.PhysicsWindDirectionDeg > directionDeg)
@@ -3097,7 +3095,7 @@ private void UpdateWindForce()
                 var windResultantSpeedMpS = (float)Math.Sqrt(AbsSpeedMpS * AbsSpeedMpS + Train.PhysicsWindSpeedMpS * Train.PhysicsWindSpeedMpS + 2.0f * AbsSpeedMpS * Train.PhysicsWindSpeedMpS * (float)Math.Cos(resultantWindComponentRad));
 
                 // Calculate Drag Resistance
-                // The drag resistance will be the difference between the STILL firction calculated using the standard Davies equation, 
+                // The drag resistance will be the difference between the STILL firction calculated using the standard Davies equation,
                 // and that produced using the wind resultant speed (combination of wind speed and train speed)
                 var tempStillDragResistanceForceN = AbsSpeedMpS * AbsSpeedMpS * DavisCNSSpMM;
                 var tempCombinedDragResistanceForceN = windResultantSpeedMpS * windResultantSpeedMpS * DavisCNSSpMM; // R3 of Davis formula taking into account wind
@@ -3107,7 +3105,7 @@ private void UpdateWindForce()
                 // This difference will be added or subtracted from the overall friction force depending upon the estimated wind direction.
                 if (tempCombinedDragResistanceForceN > tempStillDragResistanceForceN)
                 {
-                // Wind typically headon to train - increase resistance - +ve differential
+                    // Wind typically headon to train - increase resistance - +ve differential
                     windDragResistanceForceN = tempCombinedDragResistanceForceN - tempStillDragResistanceForceN;
                 }
                 else

Source/ORTS.Settings/UserSettings.cs

@@ -19,7 +19,6 @@
 using Orts.Parsers.Msts;
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks.SubSystems;
-using ORTS.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -139,9 +138,7 @@ public GenericWAGFile(string filenamewithpath)
 
             public void WagFile(string filenamewithpath)
             {
-                using (STFReader stf = ConsistGenerator.IsWagonRecognized(filenamewithpath)
-                    ? new STFReader(ConsistGenerator.GetWagon(filenamewithpath), filenamewithpath, System.Text.Encoding.UTF8, false)
-                    : new STFReader(filenamewithpath, false))
+                using (STFReader stf = new STFReader(filenamewithpath, false))
                     stf.ParseBlock(new STFReader.TokenProcessor[] {
                         new STFReader.TokenProcessor("engine", ()=>{ Engine = new EngineClass(stf); }),
                         new STFReader.TokenProcessor("_openrails", ()=>{ OpenRails = new OpenRailsData(stf); }),

Source/Orts.Formats.Msts/ConsistFile.cs

@@ -1301,7 +1301,7 @@ private Train InitializePlayerTrain()
             // place rear of train on starting location of aiPath.
             train.RearTDBTraveller = new Traveller(TSectionDat, TDB.TrackDB.TrackNodes, aiPath);
 
-            ConsistFile conFile = ConsistGenerator.IsConsistRecognized(conFileName) ? new ConsistFile(ConsistGenerator.GetConsist(conFileName), conFileName) : new ConsistFile(conFileName);
+            ConsistFile conFile = new ConsistFile(conFileName);
             CurveDurability = conFile.Train.TrainCfg.Durability;   // Finds curve durability of consist based upon the value in consist file
             train.TcsParametersFileName = conFile.Train.TrainCfg.TcsParametersFileName;
 
@@ -1318,7 +1318,7 @@ private Train InitializePlayerTrain()
                     wagonFilePath = wagonFolder + @"\" + wagon.Name + ".eot";
                 }
 
-                if (!File.Exists(wagonFilePath) && !ConsistGenerator.IsWagonRecognized(wagonFilePath))
+                if (!File.Exists(wagonFilePath))
                 {
                     // First wagon is the player's loco and required, so issue a fatal error message
                     if (wagon == conFile.Train.TrainCfg.WagonList[0])