Automatic merge of T1.5.1-1718-gda57f73bd and 15 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 #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at bbc0013: Train Forces popup Window.
- 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 #1049 at 6a0c471: Re-organise document storage and access
- Pull request #1057 at 254b6d4: 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 #1071 at 722dd3f: Change cover image for v1.6
- Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12
- Pull request #1076 at d1ff8fd: Allow depart early

Author: openrails-bot

Source/Orts.Common/Conversions.cs

@@ -782,6 +782,13 @@ public static string FormatForce(float forceN, bool isMetric)
             return String.Format(CultureInfo.CurrentCulture, kilo ? "{0:F1} {1}" : "{0:F0} {1}", force, unit);
         }
 
+        public static string FormatLargeForce(float forceN, bool isMetric)
+        {
+            var force = isMetric ? forceN : N.ToLbf(forceN);
+            var unit = isMetric ? kN : klbf;
+            return String.Format(CultureInfo.CurrentCulture, "{0:F1} {1}", force * 1e-3f, unit);
+        }
+
         public static string FormatTemperature(float temperatureC, bool isMetric, bool isDelta)
         {
             var temperature = isMetric ? temperatureC : isDelta ? C.ToDeltaF(temperatureC) : C.ToF(temperatureC);

Source/Orts.Common/Input/UserCommand.cs

@@ -64,6 +64,7 @@ public enum UserCommand
         [GetString("Display Train Car Operations Window")] DisplayTrainCarOperationsWindow,
         [GetString("Display Train Dpu Window")] DisplayTrainDpuWindow,
         [GetString("Display Next Station Window")] DisplayNextStationWindow,
+        [GetString("Display Train Forces Window")] DisplayTrainForcesWindow,
         [GetString("Display Compass Window")] DisplayCompassWindow,
         [GetString("Display Train List Window")] DisplayTrainListWindow,
         [GetString("Display EOT List Window")] DisplayEOTListWindow,

Source/Orts.Settings/InputSettings.cs

@@ -518,6 +518,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DisplayTrainOperationsWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Control | KeyModifiers.Alt);
             Commands[(int)UserCommand.DisplayTrainDpuWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Shift);
             Commands[(int)UserCommand.DisplayEOTListWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Control);
+            Commands[(int)UserCommand.DisplayTrainForcesWindow] = new UserCommandKeyInput(0x41, KeyModifiers.Alt);
             Commands[(int)UserCommand.DisplayControlRectangle] = new UserCommandKeyInput(0x3F, KeyModifiers.Control);
 
             Commands[(int)UserCommand.GameAutopilotMode] = new UserCommandKeyInput(0x1E, KeyModifiers.Alt);

Source/Orts.Settings/UserSettings.cs

@@ -390,6 +390,8 @@ public string DirectXFeatureLevel
         public int[] WindowPosition_ComposeMessage { get; set; }
         [Default(new[] { 100, 0 })]
         public int[] WindowPosition_TrainList { get; set; }
+        [Default(new[] { 50, 50 })]
+        public int[] WindowPosition_TrainForces { get; set; }
         [Default("")]
         public string LastViewNotificationDate { get; set; }
 

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

@@ -3480,7 +3480,11 @@ public LatLonDirection GetLatLonDirection()
 
             return new LatLonDirection(latLon, directionDeg); ;
         }
+        
+        public int GetWagonNumAxles() { return WagonNumAxles; }
 
+        public float GetGravitationalAccelerationMpS2() { return GravitationalAccelerationMpS2; }
+        
         /// <summary>
         /// Update the gravity force and % gradient of this train car at the current position
         /// </summary>

Source/RunActivity/Content/TrainForcesSprites.png

@@ -45,6 +45,9 @@
       <Link>Native\X64\OpenAL32.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\TrainForcesSprites.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\blank.bmp">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Source/RunActivity/RunActivity.csproj

@@ -102,6 +102,7 @@ public class Viewer
         public CarOperationsWindow CarOperationsWindow { get; private set; } // F9 sub-window for car operations
         public TrainDpuWindow TrainDpuWindow { get; private set; } // Shift + F9 train distributed power window
         public NextStationWindow NextStationWindow { get; private set; } // F10 window
+        public TrainForcesWindow TrainForcesWindow { get; private set; } // Alt-F7 window
         public CompassWindow CompassWindow { get; private set; } // 0 window
         public TracksDebugWindow TracksDebugWindow { get; private set; } // Control-Alt-F6
         public SignallingDebugWindow SignallingDebugWindow { get; private set; } // Control-Alt-F11 window
@@ -512,6 +513,7 @@ internal void Initialize()
             CarOperationsWindow = new CarOperationsWindow(WindowManager);
             TrainDpuWindow = new TrainDpuWindow(WindowManager);
             NextStationWindow = new NextStationWindow(WindowManager);
+            TrainForcesWindow = new TrainForcesWindow(WindowManager);
             CompassWindow = new CompassWindow(WindowManager);
             TracksDebugWindow = new TracksDebugWindow(WindowManager);
             SignallingDebugWindow = new SignallingDebugWindow(WindowManager);
@@ -1060,6 +1062,7 @@ void HandleUserInput(ElapsedTime elapsedTime)
 
             if (UserInput.IsPressed(UserCommand.DisplayNextStationWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) NextStationWindow.TabAction(); else NextStationWindow.Visible = !NextStationWindow.Visible;
             if (UserInput.IsPressed(UserCommand.DisplayCompassWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) CompassWindow.TabAction(); else CompassWindow.Visible = !CompassWindow.Visible;
+            if (UserInput.IsPressed(UserCommand.DisplayTrainForcesWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainForcesWindow.TabAction(); else TrainForcesWindow.Visible = !TrainForcesWindow.Visible;
             if (UserInput.IsPressed(UserCommand.DebugTracks)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TracksDebugWindow.TabAction(); else TracksDebugWindow.Visible = !TracksDebugWindow.Visible;
             if (UserInput.IsPressed(UserCommand.DebugSignalling)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) SignallingDebugWindow.TabAction(); else SignallingDebugWindow.Visible = !SignallingDebugWindow.Visible;
             if (UserInput.IsPressed(UserCommand.DisplayTrainListWindow)) TrainListWindow.Visible = !TrainListWindow.Visible;