Merge pull request #70 from Csantucci/View-smoke-3D-cabs

twpol · web-flow · commit a55289c9cca5 · 2019-06-17T20:58:54.000+01:00
Bug fix to view own smoke in 3D cabs; by dennisat https://bugs.launchpad.net/or/+bug/1825701
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -263,7 +263,6 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             {
                 if (ThreeDimentionCabViewer != null)
                     ThreeDimentionCabViewer.PrepareFrame(frame, elapsedTime);
-                return;
             }
 
             // Wipers and bell animation
@@ -274,7 +273,6 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             if (Viewer.Camera.AttachedCar == this.MSTSWagon &&
                 Viewer.Camera.Style == Camera.Styles.Cab)
             {
-
                 if (_CabRenderer != null)
                     _CabRenderer.PrepareFrame(frame, elapsedTime);
             }
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -698,9 +698,9 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
             }
             else
             {
-                // Skip drawing if CAB view - draw 2D view instead - by GeorgeS
+                // Skip drawing if 2D or 3D Cab view - Cab view already drawn - by GeorgeS changed by DennisAT
                 if (Viewer.Camera.AttachedCar == this.MSTSWagon &&
-                    Viewer.Camera.Style == Camera.Styles.Cab)
+                    (Viewer.Camera.Style == Camera.Styles.Cab || Viewer.Camera.Style == Camera.Styles.ThreeDimCab))
                     return;
 
                 // We are outside the passenger cabin

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
`263`	`263`	`{`
`264`	`264`	`if (ThreeDimentionCabViewer != null)`
`265`	`265`	`ThreeDimentionCabViewer.PrepareFrame(frame, elapsedTime);`
`266`		`- return;`
`267`	`266`	`}`
`268`	`267`
`269`	`268`	`// Wipers and bell animation`
`@@ -274,7 +273,6 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
`274`	`273`	`if (Viewer.Camera.AttachedCar == this.MSTSWagon &&`
`275`	`274`	`Viewer.Camera.Style == Camera.Styles.Cab)`
`276`	`275`	`{`
`277`		`-`
`278`	`276`	`if (_CabRenderer != null)`
`279`	`277`	`_CabRenderer.PrepareFrame(frame, elapsedTime);`
`280`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -698,9 +698,9 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)`
`698`	`698`	`}`
`699`	`699`	`else`
`700`	`700`	`{`
`701`		`- // Skip drawing if CAB view - draw 2D view instead - by GeorgeS`
	`701`	`+ // Skip drawing if 2D or 3D Cab view - Cab view already drawn - by GeorgeS changed by DennisAT`
`702`	`702`	`if (Viewer.Camera.AttachedCar == this.MSTSWagon &&`
`703`		`- Viewer.Camera.Style == Camera.Styles.Cab)`
	`703`	`+ (Viewer.Camera.Style == Camera.Styles.Cab \|\| Viewer.Camera.Style == Camera.Styles.ThreeDimCab))`
`704`	`704`	`return;`
`705`	`705`
`706`	`706`	`// We are outside the passenger cabin`