Merge pull request #597 from Csantucci/fix-walking-people

Csantucci · web-flow · commit 5ad4c624e894 · 2022-02-13T21:24:45.000+01:00
Bug fix for http://www.elvastower.com/forums/index.php?/topic/35981-walking-people-dont-walk-well/
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -3126,7 +3126,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             }*/ //removed with 3D digits
 
             if (TrainCarShape != null)
-                TrainCarShape.PrepareFrame(frame, elapsedTime, MatrixVisible);
+                TrainCarShape.ConditionallyPrepareFrame(frame, elapsedTime, MatrixVisible);
         }
 
         internal override void Mark()
diff --git a/Source/RunActivity/Viewer3D/Shapes.cs b/Source/RunActivity/Viewer3D/Shapes.cs
@@ -287,7 +287,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             SharedShape.PrepareFrame(frame, Location, XNAMatrices, Flags);
         }
 
-        public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, bool[] matrixVisible = null)
+        public void ConditionallyPrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, bool[] matrixVisible = null)
         {
             SharedShape.PrepareFrame(frame, Location, XNAMatrices, Flags, matrixVisible);
         }

Original file line number	Diff line number	Diff line change
`@@ -3126,7 +3126,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
`3126`	`3126`	`}*/ //removed with 3D digits`
`3127`	`3127`
`3128`	`3128`	`if (TrainCarShape != null)`
`3129`		`- TrainCarShape.PrepareFrame(frame, elapsedTime, MatrixVisible);`
	`3129`	`+ TrainCarShape.ConditionallyPrepareFrame(frame, elapsedTime, MatrixVisible);`
`3130`	`3130`	`}`
`3131`	`3131`
`3132`	`3132`	`internal override void Mark()`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
`287`	`287`	`SharedShape.PrepareFrame(frame, Location, XNAMatrices, Flags);`
`288`	`288`	`}`
`289`	`289`
`290`		`- public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, bool[] matrixVisible = null)`
	`290`	`+ public void ConditionallyPrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, bool[] matrixVisible = null)`
`291`	`291`	`{`
`292`	`292`	`SharedShape.PrepareFrame(frame, Location, XNAMatrices, Flags, matrixVisible);`
`293`	`293`	`}`