Merge pull request #1130 from mbm-OR/bugfix/Fix-F9-CarId-bug

Fix F9 points to an incorrect car ID.

Author: mbm-OR

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1839,14 +1839,15 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
             train.activityClearingDistanceM = train.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
             train2.activityClearingDistanceM = train2.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
 
-
             train.UncoupledFrom = train2;
             train2.UncoupledFrom = train;
-            
+
             train2.SpeedMpS = train.SpeedMpS;
 
+            train.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
             train.Cars[train.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
             train2.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
+            train2.Cars[train2.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
 
             train2.AITrainDirectionForward = train.AITrainDirectionForward;
 

Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png

@@ -29,6 +29,7 @@
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks;
 using Orts.Simulation.Signalling;
+using Orts.Viewer3D;
 using Orts.Viewer3D.Popups;
 using ORTS.Common;
 using ORTS.Common.Input;
@@ -992,6 +993,14 @@ public enum AttachedTo { Front, Rear }
         protected float HighWagonOffsetLimit;
         public int oldCarPosition;
         public bool IsCameraFront;
+        public bool IsVisibleTrainCarViewerOrWebpage;
+        public bool IsVisibleTrainCarWebPage;
+        public bool IsDownCameraOutsideFront;
+        public bool IsDownCameraOutsideRear;
+        public UserCommand? CameraCommand;
+        private static UserCommand? GetPressedKey(params UserCommand[] keysToTest) => keysToTest
+            .Where((UserCommand key) => UserInput.IsDown(key))
+            .FirstOrDefault();
         public override bool IsUnderground
         {
             get
@@ -1072,30 +1081,64 @@ protected override void OnActivate(bool sameCamera)
             var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);
             var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);
 
-            bool isVisibleTrainCarViewerOrWebpage;
             if (Viewer.TrainCarOperationsWebpage == null) 
             {
                 // when starting Open Rails by means of a restore Viewer.TrainCarOperationsWebpage not yet available
-                isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible;
+                IsVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible;
             }
             else
             {
-                isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+                IsVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
-            // Update the camera view
-            oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
+            if (IsVisibleTrainCarViewerOrWebpage)
+            {
+                // Update the camera view
+                oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
+            }
+
+            if (attachedCar != null && !IsVisibleTrainCarViewerOrWebpage)
+            {   // Reset behaviour of camera 2 and camera 3, after closing F9-window and F9-web.
+                var attachedCarPosition = Front ? Viewer.CameraOutsideFrontPosition : Viewer.CameraOutsideRearPosition;
+
+                Viewer.FirstLoop = false;
+                if (Front)
+                {
+                    SetCameraCar(trainCars[Viewer.CameraOutsideFrontPosition]);
+                    Viewer.CameraFrontUpdated = true;
+                }
+                else
+                {
+                    if (Viewer.CameraOutsideRearPosition == 0)
+                    {
+                        SetCameraCar(GetCameraCars().Last());
+                    }
+                    else
+                    {
+                        if (Viewer.CameraOutsideRearPosition < trainCars.Count)
+                        {
+                            SetCameraCar(trainCars[Viewer.CameraOutsideRearPosition]);
+                        }
+                        else
+                        {
+                            SetCameraCar(trainCars[trainCars.Count - 1]);
+                        }
+                    }
+                    Viewer.CameraRearUpdated = true;
+                }
+                Viewer.IsCameraPositionUpdated = Viewer.CameraFrontUpdated && Viewer.CameraRearUpdated;
+            }
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)
             {
                 if (Front)
                 {
-                    if (!isVisibleTrainCarViewerOrWebpage && isDownCameraOutsideFront)
+                    if (!IsVisibleTrainCarViewerOrWebpage && isDownCameraOutsideFront)
                     {
-                        SetCameraCar(GetCameraCars().First());
+                        if (Viewer.CameraOutsideFrontPosition == 0) SetCameraCar(GetCameraCars().First());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewerOrWebpage && carPosition >= 0)
+                    else if (IsVisibleTrainCarViewerOrWebpage && carPosition >= 0)
                     {
                         if (carPosition < trainCars.Count)
                         {
@@ -1114,12 +1157,12 @@ protected override void OnActivate(bool sameCamera)
                 }
                 else
                 {
-                    if (!isVisibleTrainCarViewerOrWebpage && isDownCameraOutsideRear)
+                    if (!IsVisibleTrainCarViewerOrWebpage && isDownCameraOutsideRear)
                     {
-                        SetCameraCar(GetCameraCars().Last());
+                        if (Viewer.CameraOutsideRearPosition == 0) SetCameraCar(GetCameraCars().Last());
                         oldCarPosition = 0;
                     }
-                    else if (carPosition < trainCars.Count && isVisibleTrainCarViewerOrWebpage && carPosition >= 0)
+                    else if (carPosition < trainCars.Count && IsVisibleTrainCarViewerOrWebpage && carPosition >= 0)
                     {
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;
@@ -1135,6 +1178,24 @@ protected override void OnActivate(bool sameCamera)
                 BrowseDistance = attachedCar.CarLengthM * 0.5f;
             }
             base.OnActivate(sameCamera);
+            CameraOutsidePosition();
+        }
+
+        public void CameraOutsidePosition()
+        {
+            if (!IsVisibleTrainCarViewerOrWebpage)
+            {
+                var attachedCarIdPos = attachedCar.Train.Cars.TakeWhile(x => x.CarID != attachedCar.CarID).Count();
+                if (Front)
+                {
+                    Viewer.CameraOutsideFrontPosition = attachedCarIdPos;
+                }
+                else if (!Front)
+                {
+                    Viewer.CameraOutsideRearPosition = attachedCarIdPos;
+                }
+            }
+            Viewer.IsCameraPositionUpdated = !IsVisibleTrainCarViewerOrWebpage;
         }
 
         protected override bool IsCameraFlipped()
@@ -1214,6 +1275,16 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
                 new ToggleBrowseBackwardsCommand(Viewer.Log);
             if (UserInput.IsPressed(UserCommand.CameraBrowseForwards))
                 new ToggleBrowseForwardsCommand(Viewer.Log);
+
+            UserCommand? CameraCommand = GetPressedKey(UserCommand.CameraCarPrevious, UserCommand.CameraCarNext,
+            UserCommand.CameraCarFirst, UserCommand.CameraCarLast);
+
+            if (CameraCommand == UserCommand.CameraCarPrevious || CameraCommand == UserCommand.CameraCarNext || CameraCommand == UserCommand.CameraCarFirst
+                || CameraCommand == UserCommand.CameraCarLast)
+            {   // updates camera out side car position
+                CameraOutsidePosition();
+                Viewer.IsDownCameraChanged = IsDownCameraOutsideFront = IsDownCameraOutsideRear = false;
+            }
         }
 
         public override void Update(ElapsedTime elapsedTime)