Automatic merge of T1.5.1-684-gc6e0de1c4 and 9 pull requests

- Pull request #570 at c59c788: 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 #865 at 67014b7: Dispatcher window improvements
- Pull request #874 at f8dbeab: Dynamic brake controller refactoring
- Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #878 at 2df2ab4: Implement Polach Adhesion
- Pull request #882 at e92be5a: Blueprint/train car operations UI window
- Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling

Author: openrails-bot

Source/RunActivity/Viewer3D/Cameras.cs

@@ -1090,6 +1090,7 @@ protected override void OnActivate(bool sameCamera)
             var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);
             var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);
             var isVisibleTrainCarViewer = Viewer.TrainCarOperationsViewerWindow.Visible;
+            var trainCars = GetCameraCars();
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition || isDownCameraOutsideFront || isDownCameraOutsideRear)
             {
@@ -1100,9 +1101,8 @@ protected override void OnActivate(bool sameCamera)
                     SetCameraCar(GetCameraCars().First());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewer && carPosition >= 0)
-                    {
-                        var trainCars = GetCameraCars();
+                    else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())
+                    {                        
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;
                     }
@@ -1116,13 +1116,12 @@ protected override void OnActivate(bool sameCamera)
                 }
                 else
                 {
-                    var trainCars = GetCameraCars();
                     if (!isVisibleTrainCarViewer && isDownCameraOutsideRear)
                     {
                         SetCameraCar(GetCameraCars().Last());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewer && carPosition >= 0)
+                    else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())
                     {
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -25,6 +25,7 @@
 using Orts.Simulation.RollingStocks.SubSystems.Brakes;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
+using Orts.Viewer3D.RollingStock;
 using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Scripting.Api;
@@ -123,6 +124,7 @@ public struct ListLabel
         int LastPlayerTrainCars;
         bool LastPlayerLocomotiveFlippedState;
         int carPosition;
+        bool couplerFront = false;
         public TrainCarOperationsViewerWindow(WindowManager owner)
             : base(owner, Window.DecorationSize.X + CarListPadding + ((owner.TextFontDefault.Height + 12) * 20), Window.DecorationSize.Y + ((owner.TextFontDefault.Height + 12) * 2), Viewer.Catalog.GetString("Train Operations Viewer"))
         {
@@ -335,7 +337,7 @@ void AddSpace(bool full)
                         AddSpace(false);
                         if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))
                         {
-                            line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, carPosition));
+                            line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, CarPosition));
                             AddSpace(false);
                         }
                     }
@@ -361,24 +363,27 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
             if (updateFull)
             {
                 var carOperations = Owner.Viewer.CarOperationsWindow;
-                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;
-                TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];
-                bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) || (trainCar is MSTSDieselLocomotive);
+                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;                
 
-                if (PlayerTrain != Owner.Viewer.PlayerTrain || Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars || (Owner.Viewer.PlayerLocomotive != null &&
+                if (couplerFront || PlayerTrain != Owner.Viewer.PlayerTrain || Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars || (Owner.Viewer.PlayerLocomotive != null &&
                 LastPlayerLocomotiveFlippedState != Owner.Viewer.PlayerLocomotive.Flipped))
                 {
+                    couplerFront = false;
                     PlayerTrain = Owner.Viewer.PlayerTrain;
 
-                    if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count) { Visible = false; }
+                    if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count){ Visible = false; }
 
                     LastPlayerTrainCars = Owner.Viewer.PlayerTrain.Cars.Count;
+                    CarPosition = CarPosition >= LastPlayerTrainCars? LastPlayerTrainCars - 1: CarPosition;
                     if (Owner.Viewer.PlayerLocomotive != null) LastPlayerLocomotiveFlippedState = Owner.Viewer.PlayerLocomotive.Flipped;
 
                     Layout();
                     UpdateWindowSize();
                 }
 
+                TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];
+                bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) || (trainCar is MSTSDieselLocomotive);
+                
                 if (carPosition != CarPosition || TrainCarOperationsChanged || carOperations.CarOperationChanged
                     || trainCarOperations.modifiedSetting || carOperations.RearBrakeHoseChanged || carOperations.FrontBrakeHoseChanged)
                 {
@@ -453,8 +458,9 @@ void TrainCarOperationsCouplerFront_Click(Control arg1, Point arg2)
                 }
                 else
                 {
-                    new UncoupleCommand(Viewer.Log, CarPosition);
-                    if (Viewer.CarOperationsWindow.CarPosition > CarPosition)
+                    new UncoupleCommand(Viewer.Log, CarPosition - 1);
+                    TrainCarViewer.couplerFront = true;
+                    if (Viewer.CarOperationsWindow.CarPosition > CarPosition - 1)
                         Viewer.CarOperationsWindow.Visible = false;
                 }
             }

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -526,8 +526,8 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                     localScrollLayout(selectedCarPosition);
                 }
 
-                UserCommand? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer);
-                if (controlDiesel == UserCommand.ControlDieselHelper || controlDiesel == UserCommand.ControlDieselPlayer)
+                UserCommand ? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer, UserCommand.ControlInitializeBrakes);
+                if (controlDiesel == UserCommand.ControlDieselHelper || controlDiesel == UserCommand.ControlDieselPlayer || controlDiesel == UserCommand.ControlInitializeBrakes)
                 {
                     Layout();
                     powerSupplyStatus = Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus();