View own smoke in 3D cabs

Csantucci · Csantucci · commit 6db58239d5ad · 2019-06-12T19:27:27.000+02:00
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -263,7 +263,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             {
                 if (ThreeDimentionCabViewer != null)
                     ThreeDimentionCabViewer.PrepareFrame(frame, elapsedTime);
-                return;
+                //return;
             }
 
             // Wiper animation
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -692,9 +692,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,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
`263`	`263`	`{`
`264`	`264`	`if (ThreeDimentionCabViewer != null)`
`265`	`265`	`ThreeDimentionCabViewer.PrepareFrame(frame, elapsedTime);`
`266`		`- return;`
	`266`	`+ //return;`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`// Wiper animation`
Original file line number	Diff line number	Diff line change
`@@ -692,9 +692,9 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)`
`692`	`692`	`}`
`693`	`693`	`else`
`694`	`694`	`{`
`695`		`- // Skip drawing if CAB view - draw 2D view instead - by GeorgeS`
	`695`	`+ // Skip drawing if 2D or 3D Cab view - Cab view already drawn - by GeorgeS changed by DennisAT`
`696`	`696`	`if (Viewer.Camera.AttachedCar == this.MSTSWagon &&`
`697`		`- Viewer.Camera.Style == Camera.Styles.Cab)`
	`697`	`+ (Viewer.Camera.Style == Camera.Styles.Cab \|\| Viewer.Camera.Style == Camera.Styles.ThreeDimCab))`
`698`	`698`	`return;`
`699`	`699`
`700`	`700`	`// We are outside the passenger cabin`