Automatic merge of T1.5.1-1695-gade019506 and 17 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 a57d23d: 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 #1000 at d8d9709: Locomotive operation from control car
- Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes
- Pull request #1057 at 50c3789: 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 #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #1049 at 4dd8c4f: Re-organise document storage and access

Author: openrails-bot

Source/Contrib/ContentManager/ContentInfo.cs

@@ -189,19 +189,21 @@ public static string GetText(Content content)
                     details.AppendFormat("NumEngines:\t{1}{0}", Environment.NewLine, data.NumEngines);
                     details.AppendFormat("NumCars:\t{1}{0}", Environment.NewLine, data.NumCars);
                     details.AppendFormat("Axles:\t{1}{0}", Environment.NewLine, data.NumAxles);
-                    details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
-                    details.AppendFormat("Weight:\t{1}{0}", Environment.NewLine, FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
+                    details.AppendFormat("Weight:\t{1}  (trailing: {2}){0}", Environment.NewLine, FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK),
+                        FormatStrings.FormatLargeMass(data.TrailingMassKG, IsMetric, IsUK));
                     details.AppendFormat("Length:\t{1}{0}", Environment.NewLine, FormatStrings.FormatShortDistanceDisplay(data.LengthM, IsMetric));
-                    details.AppendFormat("Power:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
+                    details.AppendFormat("MaxPower:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
                     details.AppendFormat("MaxTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxTractiveForceN, IsMetric));
+                    details.AppendFormat("MaxContTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxContinuousTractiveForceN, IsMetric));
                     details.AppendFormat("MaxDynBrk:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxDynamicBrakeForceN, IsMetric));
                     if (!IsMetric && !IsUK)
                     {
-                        details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.MassKG));
-                        details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.MassKG, data.NumOperativeBrakes));
-                        details.AppendFormat("TpEPA:\t{1}{0}", Environment.NewLine, FormatTonsPerEPA(data.MassKG, data.MaxTractiveForceN));
-                        details.AppendFormat("TpEDBA:\t{1}{0}", Environment.NewLine, FormatTonsPerEDBA(data.MassKG, data.MaxDynamicBrakeForceN));
+                        details.AppendFormat("HPT:\t{1}{0}", Environment.NewLine, FormatHPT(data.MaxPowerW, data.TrailingMassKG));
+                        details.AppendFormat("TpOB:\t{1}{0}", Environment.NewLine, FormatTPOB(data.TrailingMassKG, data.NumOperativeBrakes));
+                        details.AppendFormat("TpEPA:\t{1}{0}", Environment.NewLine, FormatTonsPerEPA(data.TrailingMassKG, data.MaxContinuousTractiveForceN));
+                        details.AppendFormat("TpEDBA:\t{1}{0}", Environment.NewLine, FormatTonsPerEDBA(data.TrailingMassKG, data.MaxDynamicBrakeForceN));
                     }
+                    details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
                     details.AppendFormat("MinCouplerStrength:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinCouplerStrengthN, IsMetric));
                     details.AppendFormat("MinDerailForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinDerailForceN, IsMetric));
                     details.AppendLine();
@@ -216,7 +218,7 @@ public static string GetText(Content content)
                     details.AppendFormat("Type:\t{1}{0}", Environment.NewLine, data.Type);
                     details.AppendFormat("SubType:\t{1}{0}", Environment.NewLine, data.SubType);
                     details.AppendFormat("Name:\t{1}{0}", Environment.NewLine, data.Name);
-                    details.AppendFormat("Weight:\t{1} ({2}){0}", Environment.NewLine, FormatStrings.FormatMass(data.MassKG, IsMetric), FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
+                    details.AppendFormat("Weight:\t{1}  ({2}){0}", Environment.NewLine, FormatStrings.FormatMass(data.MassKG, IsMetric), FormatStrings.FormatLargeMass(data.MassKG, IsMetric, IsUK));
                     details.AppendFormat("Length:\t{1}{0}", Environment.NewLine, FormatStrings.FormatShortDistanceDisplay(data.LengthM, IsMetric));
                     if (data.Type != CarType.Engine)
                     {
@@ -225,11 +227,13 @@ public static string GetText(Content content)
                     else
                     {
                         details.AppendFormat("Axles:\t{1}+{2}{0}", Environment.NewLine, data.NumDriveAxles, data.NumAllAxles - data.NumDriveAxles);
-                        details.AppendFormat("MaxPowerW:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
-                        details.AppendFormat("MaxForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxForceN, IsMetric));
-                        details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric));
+                        details.AppendFormat("MaxPower:\t{1}{0}", Environment.NewLine, FormatStrings.FormatPower(data.MaxPowerW, IsMetric, IsImperialBHP, IsImperialBTUpS));
+                        details.AppendFormat("MaxTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxForceN, IsMetric));
+                        details.AppendFormat("MaxContTE:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxContinuousForceN, IsMetric));
+                        details.AppendFormat("MaxDynBrk:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxDynamicBrakeForceN, IsMetric));
                     }
                     details.AppendFormat("MaxBrakeF:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MaxBrakeForceN, IsMetric));
+                    if (data.MaxSpeedMps > 0f) { details.AppendFormat("MaxSpeed:\t{1}{0}", Environment.NewLine, FormatStrings.FormatSpeedLimit(data.MaxSpeedMps, IsMetric)); }
                     details.AppendFormat("MinCouplerStrength:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinCouplerStrengthN, IsMetric));
                     details.AppendFormat("MinDerailForce:\t{1}{0}", Environment.NewLine, FormatStrings.FormatForce(data.MinDerailForceN, IsMetric));
                     details.AppendLine();

Source/Contrib/ContentManager/Models/Car.cs

@@ -48,6 +48,8 @@ public class Car
         public readonly float MaxBrakeForceN;
         public readonly float MaxPowerW;
         public readonly float MaxForceN;
+        public readonly float MaxContinuousForceN;
+        public readonly float MaxDynamicBrakeForceN;
         public readonly float MaxSpeedMps;
         public readonly float MinCouplerStrengthN;
         public readonly float MinDerailForceN;
@@ -76,6 +78,8 @@ public Car(Content content)
                 Name = engFile.Name;
                 MaxPowerW = engFile.MaxPowerW;
                 MaxForceN = engFile.MaxForceN;
+                MaxContinuousForceN = engFile.MaxContinuousForceN;
+                MaxDynamicBrakeForceN = engFile.MaxDynamicBrakeForceN;
                 MaxSpeedMps = engFile.MaxSpeedMps;
                 Description = engFile.Description;
 

Source/Contrib/ContentManager/Models/Consist.cs

@@ -32,8 +32,10 @@ public class Consist
         public readonly float LengthM = 0F;
         public readonly int NumAxles = 0;
         public readonly float MassKG = 0F;
+        public readonly float TrailingMassKG = 0F;
         public readonly float MaxPowerW = 0F;
         public readonly float MaxTractiveForceN = 0F;
+        public readonly float MaxContinuousTractiveForceN = 0F;
         public readonly float MaxDynamicBrakeForceN = 0F;
         public readonly float MaxBrakeForce = 0F;
         public readonly int NumOperativeBrakes = 0;
@@ -74,7 +76,6 @@ public Consist(Content content)
                         MaxBrakeForce += wagonFile.MaxBrakeForceN;
                         MinCouplerStrengthN = Math.Min(MinCouplerStrengthN, wagonFile.MinCouplerStrengthN);
                         var subType = wagonFile.WagonType;
-                        if (wagonFile.MaxBrakeForceN > 0) { NumOperativeBrakes++; }
 
                         if (engFile != null)
                         {
@@ -93,13 +94,20 @@ public Consist(Content content)
                                 EngCount++;
                                 MaxPowerW += engFile.MaxPowerW;
                                 MaxTractiveForceN += engFile.MaxForceN;
+                                MaxContinuousTractiveForceN += engFile.MaxContinuousForceN > 0f ? engFile.MaxContinuousForceN : engFile.MaxForceN;
                                 MaxDynamicBrakeForceN += engFile.MaxDynamicBrakeForceN;
                             }
                             else { WagCount++; }
                         }
                         else if (!wag.IsEOT && wagonFile.WagonSize.LengthM > 1.1) // exclude legacy EOT
                         {
                             WagCount++;
+                            TrailingMassKG += wagonFile.MassKG;
+                            if (wagonFile.MaxBrakeForceN > 0 && wagonFile.BrakeSystemType != null && !wagonFile.BrakeSystemType.Contains("manual_braking") &&
+                                !wagonFile.BrakeSystemType.Contains("air_piped") && !wagonFile.BrakeSystemType.Contains("vacuum_piped"))
+                            {
+                                NumOperativeBrakes++;
+                            }
                         }
 
                         // see MSTSWagon.LoadFromWagFile()

Source/Orts.Formats.Msts/EngineFile.cs

@@ -31,6 +31,7 @@ public class EngineFile
         public string EngineType;
         public float MaxPowerW;
         public float MaxForceN;
+        public float MaxContinuousForceN;
         public float MaxDynamicBrakeForceN;
         public float MaxSpeedMps;
         public int NumDriveAxles;  // ORTS
@@ -51,6 +52,7 @@ public EngineFile(string filePath)
                             new STFReader.TokenProcessor("type", ()=>{ EngineType = stf.ReadStringBlock(null); }),
                             new STFReader.TokenProcessor("maxpower", ()=>{ MaxPowerW = stf.ReadFloatBlock( STFReader.UNITS.Power, null); }),
                             new STFReader.TokenProcessor("maxforce", ()=>{ MaxForceN = stf.ReadFloatBlock( STFReader.UNITS.Force, null); }),
+                            new STFReader.TokenProcessor("maxcontinuousforce", ()=>{ MaxContinuousForceN = stf.ReadFloatBlock( STFReader.UNITS.Force, null); }),
                             new STFReader.TokenProcessor("dynamicbrakesmaximumforce", ()=>{ MaxDynamicBrakeForceN = stf.ReadFloatBlock( STFReader.UNITS.Force, null); }),
                             new STFReader.TokenProcessor("maxvelocity", ()=>{ MaxSpeedMps = stf.ReadFloatBlock( STFReader.UNITS.Speed, null); }),
                             new STFReader.TokenProcessor("ortsnumberdriveaxles", ()=>{ NumDriveAxles = stf.ReadIntBlock(null); }),

Source/Orts.Formats.Msts/WagonFile.cs

@@ -34,6 +34,8 @@ public class WagonFile
         public CarSize WagonSize;
         public int NumWagAxles;  // ORTS
         public float NumWagWheels;  // MSTS
+        public string BrakeSystemType;
+        public string BrakeEquipmentType;
         public float MaxBrakeForceN;
         public float MinCouplerStrengthN = ImpossiblyHighForceN;
 
@@ -111,6 +113,8 @@ public WagonFile(string filePath)
                             new STFReader.TokenProcessor("size", ()=>{ WagonSize = new CarSize( stf); }),
                             new STFReader.TokenProcessor("ortsnumberaxles", ()=>{ NumWagAxles = stf.ReadIntBlock(null); }),
                             new STFReader.TokenProcessor("numwheels", ()=>{ NumWagWheels = stf.ReadFloatBlock( STFReader.UNITS.None, null); }),
+                            new STFReader.TokenProcessor("brakesystemtype", ()=>{ BrakeSystemType = stf.ReadStringBlock(null).ToLower(); }),
+                            new STFReader.TokenProcessor("brakeequipmenttype", ()=>{ BrakeEquipmentType = stf.ReadStringBlock(null).ToLower(); }),
                             new STFReader.TokenProcessor("maxbrakeforce", ()=>{ MaxBrakeForceN = stf.ReadFloatBlock(STFReader.UNITS.Force, null); }),
                             new STFReader.TokenProcessor("coupling", ()=>{ new CouplingSpring( ref MinCouplerStrengthN, stf); })
                         });

Source/RunActivity/Viewer3D/Popups/HelpWindow.cs

@@ -37,6 +37,7 @@
 using SharpFont;
 using static Orts.Viewer3D.WebServices.TrainCarOperationsWebpage.OperationsSend;
 using SharpDX.Direct3D9;
+using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 
 namespace Orts.Viewer3D.Popups
 {
@@ -1209,7 +1210,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             float engMaxContTractiveForceN = 0f; float engMaxDynBrakeForceN = 0f; string forceSeparator = "";  // when set, indicates that subsequent engines are in a separate block
 
             float wagMassKg = 0f; string massSeparator = ""; // when set, indicates that subsequent engines are in a separate block
-            int numOperativeBrakes = 0;
+            float trailingMassKg = 0f; int numOperativeBrakes = 0;
             bool isMetric = false; bool isUK = false;  // isImperial* does not seem to be used in simulation
 
             if (TrainInfoSpriteSheet == null) { TrainInfoSpriteSheet = SharedTextureManager.Get(Owner.Viewer.RenderProcess.GraphicsDevice, Path.Combine(Owner.Viewer.ContentPath, "TrainInfoSprites.png")); }
@@ -1250,6 +1251,8 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                     numCars++;
                     numAxles += wag.GetWagonNumAxles();
                     wagMassKg += wag.MassKG;
+                    trailingMassKg += wag.MassKG;
+                    if (wag.MaxBrakeForceN > 0 && car.BrakeSystem != null && !(car.BrakeSystem is SingleTransferPipe) && !(car.BrakeSystem is ManualBraking)) { numOperativeBrakes++; }
 
                     // handle transition from engines to wagons
                     if (engCount > 0 || (engCount == 0 && numCars == 0))
@@ -1270,7 +1273,6 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                     if (couplerStrength < lowestCouplerStrengthN) { lowestCouplerStrengthN = couplerStrength; }
                     var derailForce = GetDerailForce(wag);
                     if (derailForce < lowestDerailForceN) { lowestDerailForceN = derailForce; }
-                    if (wag.MaxBrakeForceN > 0) { numOperativeBrakes++; }  // simplistic: real world has cutout brakes, and no brakes on some articulated car-segments
 
                     carInfoList.Add(new CarInfo(wag.MassKG, isEng));
                 }
@@ -1328,7 +1330,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Horespower per Ton:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0.0}", hpt), LabelAlignment.Left));
 
-                float tpob = numOperativeBrakes > 0 ? Kg.ToTUS(totMassKg) / numOperativeBrakes : 0;
+                float tpob = numOperativeBrakes > 0 ? Kg.ToTUS(trailingMassKg) / numOperativeBrakes : 0;
                 line = scrollbox.AddLayoutHorizontalLineOfText();
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Tons per Operative Brake:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0}", tpob), LabelAlignment.Left));