Bug fix for https://bugs.launchpad.net/or/+bug/1944725 Switching 3D cab the camera position is incorrect.

Csantucci · Csantucci · commit d6a3bf6281e5 · 2021-09-23T15:17:31.000+02:00
diff --git a/Source/RunActivity/Viewer3D/Cameras.cs b/Source/RunActivity/Viewer3D/Cameras.cs
@@ -1866,8 +1866,9 @@ protected override void SetCameraCar(TrainCar car)
             // View is only reset on move to a different cab or "Ctl + 8".
             if (attachedCar.CabViewpoints != null)
             {
-                if (ActViewPoint != prevViewPoint)
+                if (car.CarID != prevcar || ActViewPoint != prevViewPoint)
                 {
+                    prevcar = car.CarID;
                     prevViewPoint = ActViewPoint;
                     viewPointLocation = attachedCar.CabViewpoints[ActViewPoint].Location;
                     viewPointRotationXRadians = attachedCar.CabViewpoints[ActViewPoint].RotationXRadians;

Original file line number	Diff line number	Diff line change
`@@ -1866,8 +1866,9 @@ protected override void SetCameraCar(TrainCar car)`
`1866`	`1866`	`// View is only reset on move to a different cab or "Ctl + 8".`
`1867`	`1867`	`if (attachedCar.CabViewpoints != null)`
`1868`	`1868`	`{`
`1869`		`- if (ActViewPoint != prevViewPoint)`
	`1869`	`+ if (car.CarID != prevcar \|\| ActViewPoint != prevViewPoint)`
`1870`	`1870`	`{`
	`1871`	`+ prevcar = car.CarID;`
`1871`	`1872`	`prevViewPoint = ActViewPoint;`
`1872`	`1873`	`viewPointLocation = attachedCar.CabViewpoints[ActViewPoint].Location;`
`1873`	`1874`	`viewPointRotationXRadians = attachedCar.CabViewpoints[ActViewPoint].RotationXRadians;`