Skip to content

Commit 8962438

Browse files
committed
Fix TrainCarOperations undesired camera3 camera2 behavior.
1 parent 220b61e commit 8962438

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Source/RunActivity/Viewer3D/Cameras.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ public enum AttachedTo { Front, Rear }
987987
protected float LowWagonOffsetLimit;
988988
protected float HighWagonOffsetLimit;
989989
public int oldCarPosition;
990+
public bool IsCameraFront;
990991
public override bool IsUnderground
991992
{
992993
get

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,11 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
482482
}
483483
else if (OldCarPosition != CarPosition || (trainCarOperations.CarIdClicked && CarPosition == 0))
484484
{
485-
Owner.Viewer.FrontCamera.Activate();
485+
if (Owner.Viewer.FrontCamera.AttachedCar != null && Owner.Viewer.FrontCamera.IsCameraFront)
486+
Owner.Viewer.FrontCamera.Activate();
487+
488+
if (Owner.Viewer.BackCamera.AttachedCar != null && !Owner.Viewer.FrontCamera.IsCameraFront)
489+
Owner.Viewer.BackCamera.Activate();
486490
}
487491
OldCarPosition = CarPosition;
488492
Layout();

Source/RunActivity/Viewer3D/Viewer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,11 +1087,13 @@ void HandleUserInput(ElapsedTime elapsedTime)
10871087
}
10881088
if (UserInput.IsPressed(UserCommand.CameraOutsideFront))
10891089
{
1090+
FrontCamera.IsCameraFront = true;
10901091
CheckReplaying();
10911092
new UseFrontCameraCommand(Log);
10921093
}
10931094
if (UserInput.IsPressed(UserCommand.CameraOutsideRear))
10941095
{
1096+
FrontCamera.IsCameraFront = false;
10951097
CheckReplaying();
10961098
new UseBackCameraCommand(Log);
10971099
}

0 commit comments

Comments
 (0)