Merge pull request #991 from mbm-OR/bugfix/Fix-TrainCarOperations-no-interact-AltPgDn-AltPgUp

mbm-OR · web-flow · commit 5d79907e1708 · 2024-11-27T13:26:21.000+01:00
Fix TrainCarOperations no interacts AltPgDn AltPgUp.
diff --git a/Source/RunActivity/Viewer3D/Cameras.cs b/Source/RunActivity/Viewer3D/Cameras.cs
@@ -987,6 +987,7 @@ public enum AttachedTo { Front, Rear }
         protected float LowWagonOffsetLimit;
         protected float HighWagonOffsetLimit;
         public int oldCarPosition;
+        public bool IsCameraFront;
         public override bool IsUnderground
         {
             get
@@ -1111,7 +1112,7 @@ protected override void OnActivate(bool sameCamera)
                         SetCameraCar(GetCameraCars().Last());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewerOrWebpage && carPosition >= 0)
+                    else if (carPosition < trainCars.Count && isVisibleTrainCarViewerOrWebpage && carPosition >= 0)
                     {
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
@@ -92,6 +92,7 @@ public class TrainCarOperationsViewerWindow : Window
         public int WindowHeightMax;
         public int WindowWidthMin;
         public int WindowWidthMax;
+        public bool CabCameraEnabled;
         public int windowHeight { get; set; } //required by TrainCarWindow
         public int CarPosition
         {
@@ -172,6 +173,8 @@ protected internal override void Restore(BinaryReader inf)
             CarPosition = inf.ReadInt32();
             ResetAllSymbols = inf.ReadBoolean();
 
+            CabCameraEnabled = Owner.Viewer.Camera is CabCamera || Owner.Viewer.Camera == Owner.Viewer.ThreeDimCabCamera;
+
             // Display window
             SizeTo(LocationRestore.Width, LocationRestore.Height);
             MoveTo(LocationRestore.X, LocationRestore.Y);
@@ -472,10 +475,18 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 {
                     // Updates CarPosition
                     CarPosition = CouplerChanged ? NewCarPosition : CarPosition;
-                    
-                    if (OldCarPosition != CarPosition || (trainCarOperations.CarIdClicked && CarPosition == 0))
+
+                    if (CabCameraEnabled)// Displays camera 1
                     {
-                        Owner.Viewer.FrontCamera.Activate();
+                        CabCameraEnabled = false;
+                    }
+                    else if (OldCarPosition != CarPosition || (trainCarOperations.CarIdClicked && CarPosition == 0))
+                    {
+                        if (Owner.Viewer.FrontCamera.AttachedCar != null && Owner.Viewer.FrontCamera.IsCameraFront)
+                            Owner.Viewer.FrontCamera.Activate();
+
+                        if (Owner.Viewer.BackCamera.AttachedCar != null && !Owner.Viewer.FrontCamera.IsCameraFront)
+                            Owner.Viewer.BackCamera.Activate();
                     }
                     OldCarPosition = CarPosition;
                     Layout();
@@ -498,7 +509,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
 
                 for (var position = 0 ; position < Owner.Viewer.PlayerTrain.Cars.Count; position++)
                 {
-                    if (trainCarOperations.WarningCarPosition[position])
+                    if (trainCarOperations.WarningCarPosition.Count > position && trainCarOperations.WarningCarPosition[position])
                     {
                         var carAngleCockAOpenAmount = Owner.Viewer.PlayerTrain.Cars[position].BrakeSystem.AngleCockAOpenAmount;
                         var carAngleCockBOpenAmount = Owner.Viewer.PlayerTrain.Cars[position].BrakeSystem.AngleCockBOpenAmount;
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
@@ -571,6 +571,18 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 var carOperations = Owner.Viewer.CarOperationsWindow;
                 var trainCarWebpage = Owner.Viewer.TrainCarOperationsWebpage;
 
+                // Allows interaction with <Alt>+<PageDown> and <Alt>+<PageUP>.
+                if (Owner.Viewer.Camera.AttachedCar != null && !(Owner.Viewer.Camera is CabCamera) && Owner.Viewer.Camera != Owner.Viewer.ThreeDimCabCamera && (trainCarViewer.Visible || Visible))
+                {
+                    var currentCameraCarID = Owner.Viewer.Camera.AttachedCar.CarID;
+                    if (PlayerTrain != null && (currentCameraCarID != trainCarViewer.CurrentCarID || CarPosition != trainCarViewer.CarPosition))
+                    {
+                        trainCarViewer.CurrentCarID = currentCameraCarID;
+                        trainCarViewer.CarPosition = CarPosition = PlayerTrain.Cars.TakeWhile(x => x.CarID != currentCameraCarID).Count();
+                        CarPositionChanged = true;
+                    }
+                }
+
                 trainCarViewer.TrainCarOperationsChanged = !trainCarViewer.Visible && trainCarViewer.TrainCarOperationsChanged ? false : trainCarViewer.TrainCarOperationsChanged;
 
                 CurrentDisplaySizeY = DisplaySizeY;
diff --git a/Source/RunActivity/Viewer3D/Viewer.cs b/Source/RunActivity/Viewer3D/Viewer.cs
@@ -1105,11 +1105,13 @@ void HandleUserInput(ElapsedTime elapsedTime)
             }
             if (UserInput.IsPressed(UserCommand.CameraOutsideFront))
             {
+                FrontCamera.IsCameraFront = true;
                 CheckReplaying();
                 new UseFrontCameraCommand(Log);
             }
             if (UserInput.IsPressed(UserCommand.CameraOutsideRear))
             {
+                FrontCamera.IsCameraFront = false;
                 CheckReplaying();
                 new UseBackCameraCommand(Log);
             }
diff --git a/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs b/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
@@ -464,6 +464,19 @@ private void fillStatusArrowLeft(int carPosition)
                 TrainCarSelected = true;
                 TrainCarSelectedPosition = Viewer.TrainCarOperationsWindow.SelectedCarPosition;
             }
+            else
+            {
+                // select traincar on webpage when traincar operations window (F9) not visible
+                if (Viewer.Camera.AttachedCar != null && !(Viewer.Camera is CabCamera) && Viewer.Camera != Viewer.ThreeDimCabCamera)
+                {
+                    var currentCameraCarID = Viewer.Camera.AttachedCar.CarID;
+                    if (Viewer.PlayerTrain != null)
+                    {
+                        TrainCarSelected = true;
+                        TrainCarSelectedPosition = Viewer.PlayerTrain.Cars.TakeWhile(x => x.CarID != currentCameraCarID).Count();
+                    }
+                }
+            }
 
             if (TrainCarSelected && (carPosition == TrainCarSelectedPosition))
             {

Original file line number	Diff line number	Diff line change
`@@ -987,6 +987,7 @@ public enum AttachedTo { Front, Rear }`
`987`	`987`	`protected float LowWagonOffsetLimit;`
`988`	`988`	`protected float HighWagonOffsetLimit;`
`989`	`989`	`public int oldCarPosition;`
	`990`	`+ public bool IsCameraFront;`
`990`	`991`	`public override bool IsUnderground`
`991`	`992`	`{`
`992`	`993`	`get`
`@@ -1111,7 +1112,7 @@ protected override void OnActivate(bool sameCamera)`
`1111`	`1112`	`SetCameraCar(GetCameraCars().Last());`
`1112`	`1113`	`oldCarPosition = 0;`
`1113`	`1114`	`}`
`1114`		`- else if (isVisibleTrainCarViewerOrWebpage && carPosition >= 0)`
	`1115`	`+ else if (carPosition < trainCars.Count && isVisibleTrainCarViewerOrWebpage && carPosition >= 0)`
`1115`	`1116`	`{`
`1116`	`1117`	`SetCameraCar(trainCars[carPosition]);`
`1117`	`1118`	`oldCarPosition = carPosition;`
Original file line number	Diff line number	Diff line change
`@@ -1105,11 +1105,13 @@ void HandleUserInput(ElapsedTime elapsedTime)`
`1105`	`1105`	`}`
`1106`	`1106`	`if (UserInput.IsPressed(UserCommand.CameraOutsideFront))`
`1107`	`1107`	`{`
	`1108`	`+ FrontCamera.IsCameraFront = true;`
`1108`	`1109`	`CheckReplaying();`
`1109`	`1110`	`new UseFrontCameraCommand(Log);`
`1110`	`1111`	`}`
`1111`	`1112`	`if (UserInput.IsPressed(UserCommand.CameraOutsideRear))`
`1112`	`1113`	`{`
	`1114`	`+ FrontCamera.IsCameraFront = false;`
`1113`	`1115`	`CheckReplaying();`
`1114`	`1116`	`new UseBackCameraCommand(Log);`
`1115`	`1117`	`}`