Automatic merge of T1.5.1-905-gaf8fb30c5 and 14 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 #903 at 9bead33: Downloading route content (Github, zip)
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #916 at 992cc97: Distributed Power Air Brake Synchronization
- Pull request #919 at 7aafe02: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #920 at a94e403: Update RailDriver in Manual
- Pull request #923 at d0208cd: Add curve squeal to route

Author: openrails-bot

Source/Orts.Formats.Msts/RouteFile.cs

@@ -121,6 +121,7 @@ public Tr_RouteFile(STFReader stf)
                 // sms file number in Ttype.dat when train over switch
                 new STFReader.TokenProcessor("ortsswitchsmsnumber", ()=>{ SwitchSMSNumber = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortscurvesmsnumber", ()=>{ CurveSMSNumber = stf.ReadIntBlock(null); }),
+                new STFReader.TokenProcessor("ortscurvesquealsmsnumber", ()=>{ CurveSquealSMSNumber = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortscurveswitchsmsnumber", ()=>{ CurveSwitchSMSNumber = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortsopendoorsinaitrains", ()=>{ OpenDoorsInAITrains = stf.ReadBoolBlock(false); }),
 
@@ -175,9 +176,10 @@ public Tr_RouteFile(STFReader stf)
         public string DefaultTurntableSMS;
         public bool ? OpenDoorsInAITrains; // true if option active
 
-        public int SwitchSMSNumber = -1; // defines the number of the switch SMS files in file ttypedat
+        public int SwitchSMSNumber = -1; // defines the number of the switch SMS files in file ttype.dat
         public int CurveSMSNumber = -1; // defines the number of the curve SMS files in file ttype.dat
         public int CurveSwitchSMSNumber = -1; // defines the number of the curve-switch SMS files in file ttype.dat
+        public int CurveSquealSMSNumber = -1; // defines the number of the curve squeal SMS files in file ttype.dat
 
     }
 

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -1869,7 +1869,7 @@ public override void Save(BinaryWriter outf)
 
             outf.Write(WheelBrakeSlideProtectionActive);
             outf.Write(WheelBrakeSlideProtectionTimerS);
-            outf.Write(AngleOfAttackRad);
+            outf.Write(AngleOfAttackmRad);
             outf.Write(DerailClimbDistanceM);
             outf.Write(DerailPossible);
             outf.Write(DerailExpected);
@@ -1932,7 +1932,7 @@ public override void Restore(BinaryReader inf)
 
             WheelBrakeSlideProtectionActive = inf.ReadBoolean();
             WheelBrakeSlideProtectionTimerS = inf.ReadInt32();
-            AngleOfAttackRad = inf.ReadSingle();
+            AngleOfAttackmRad = inf.ReadSingle();
             DerailClimbDistanceM = inf.ReadSingle();
             DerailPossible = inf.ReadBoolean();
             DerailExpected = inf.ReadBoolean();

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

@@ -204,7 +204,7 @@ public static Interpolator SteamHeatBoilerFuelUsageGalukpH()
         public bool DerailmentCoefficientEnabled = true;
         public float MaximumWheelFlangeAngleRad;
         public float WheelFlangeLengthM;
-        public float AngleOfAttackRad;
+        public float AngleOfAttackmRad;
         public float DerailClimbDistanceM;
         public bool DerailPossible = false;
         public bool DerailExpected = false;
@@ -968,6 +968,8 @@ public virtual void Update(float elapsedClockSeconds)
                 CurrentElevationPercent = -CurrentElevationPercent;
             }
 
+            AngleOfAttackmRad = GetAngleofAttackmRad();
+
             UpdateCurveSpeedLimit(); // call this first as it will provide inputs for the curve force.
             UpdateCurveForce(elapsedClockSeconds);
             UpdateTunnelForce();
@@ -1681,10 +1683,6 @@ public void UpdateTrainDerailmentRisk(float elapsedClockSeconds)
                     // Calculate Nadal derailment coefficient limit
                     NadalDerailmentCoefficient = ((float) Math.Tan(MaximumWheelFlangeAngleRad) - wagonAdhesion) / (1f + wagonAdhesion * (float) Math.Tan(MaximumWheelFlangeAngleRad));
 
-                    // Calculate Angle of Attack - AOA = sin-1(2 * bogie wheel base / curve radius)
-                    AngleOfAttackRad = (float)Math.Asin(2 * RigidWheelBaseM / CurrentCurveRadiusM);
-                    var angleofAttackmRad = AngleOfAttackRad * 1000f; // Convert to micro radians
-
                     // Calculate the derail climb distance - uses the general form equation 2.4 from the above publication
                     var parameterA_1 = ((100 / (-1.9128f * MathHelper.ToDegrees(MaximumWheelFlangeAngleRad) + 146.56f)) + 3.1f) * Me.ToIn(WheelFlangeLengthM);
 
@@ -1698,7 +1696,7 @@ public void UpdateTrainDerailmentRisk(float elapsedClockSeconds)
 
                     var parameterB = parameterB_1 + parameterB_2;
 
-                    DerailClimbDistanceM = Me.FromFt( (float)((parameterA * parameterB * Me.ToIn(WheelFlangeLengthM)) / ((angleofAttackmRad + (parameterB * Me.ToIn(WheelFlangeLengthM))))) );
+                    DerailClimbDistanceM = Me.FromFt( (float)((parameterA * parameterB * Me.ToIn(WheelFlangeLengthM)) / ((AngleOfAttackmRad + (parameterB * Me.ToIn(WheelFlangeLengthM))))) );
 
                     // calculate the time taken to travel the derail climb distance
                     var derailTimeS = DerailClimbDistanceM / AbsSpeedMpS;
@@ -1769,6 +1767,26 @@ public void UpdateTrainDerailmentRisk(float elapsedClockSeconds)
 
         #endregion
 
+        /// <summary>
+        /// Get the Angle of attack for a car as it goes through a curve
+        /// </summary>
+        /// <returns>angle in micro radians</returns>
+        /// 
+        public float GetAngleofAttackmRad ()
+        {
+            if (CurrentCurveRadiusM > 0)
+            {
+                // Calculate Angle of Attack - AOA = sin-1(2 * bogie wheel base / curve radius)
+                var angleofAttackmRad = (float)Math.Asin(2 * RigidWheelBaseM / CurrentCurveRadiusM) * 1000f; // Convert to micro radians
+                return angleofAttackmRad;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+
         /// <summary>
         /// Get the current direction that curve is heading relative to the train.
         /// </summary>

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -1236,8 +1236,9 @@ void TextPageForceInfo(TableData table)
                 Viewer.Catalog.GetString("Brk Slide"),
                 Viewer.Catalog.GetString("Bear Temp"),
                 Viewer.Catalog.GetString(" "),
-                Viewer.Catalog.GetString("DerailCoeff")
-                
+                Viewer.Catalog.GetString("DrailCof"),
+                Viewer.Catalog.GetString("AoA")
+
                 );
             TableAddLine(table);
 
@@ -1266,6 +1267,7 @@ void TextPageForceInfo(TableData table)
                 TableSetCell(table, 17, "{0} {1}", FormatStrings.FormatTemperature(car.WheelBearingTemperatureDegC, car.IsMetric, false), car.DisplayWheelBearingTemperatureStatus);
                 TableSetCell(table, 18, car.Flipped ? Viewer.Catalog.GetString("Flipped") : "");
                 TableSetCell(table, 19, "{0:F2}{1}", car.DerailmentCoefficient, car.DerailExpected ? "!!!" : car.DerailPossible ? "???" : "");
+                TableSetCell(table, 20, "{0:F2}", car.AngleOfAttackmRad);
                 TableAddLine(table);
 
             }