View OR freight animations in 3D cabs only if specific flag seg

Author: Csantucci

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs

@@ -308,6 +308,7 @@ public enum Type
         public float ZOffset = 0;
         public float FreightWeight = 0;
         public bool Flipped = false;
+        public bool Cab3DFreightAnim = false;
 
         // additions to manage consequences of variable weight on friction and brake forces
         public float FullStaticORTSDavis_A = -9999;
@@ -343,6 +344,7 @@ public FreightAnimationStatic(STFReader stf)
                     stf.MustMatch(")");
                 }),
                 new STFReader.TokenProcessor("flip", ()=>{ Flipped = stf.ReadBoolBlock(true);}),
+                new STFReader.TokenProcessor("cab3dfreightanim", ()=>{ Cab3DFreightAnim = stf.ReadBoolBlock(true);}),
                 // additions to manage consequences of variable weight on friction and brake forces
                 new STFReader.TokenProcessor("fullortsdavis_a", ()=>{ FullStaticORTSDavis_A = stf.ReadFloatBlock(STFReader.UNITS.Force, -1); }),
                 new STFReader.TokenProcessor("fullortsdavis_b", ()=>{ FullStaticORTSDavis_B = stf.ReadFloatBlock(STFReader.UNITS.Resistance, -1); }),
@@ -364,6 +366,7 @@ public FreightAnimationStatic(FreightAnimationStatic freightAnimStatic)
             YOffset = freightAnimStatic.YOffset;
             ZOffset = freightAnimStatic.ZOffset;
             Flipped = freightAnimStatic.Flipped;
+            Cab3DFreightAnim = freightAnimStatic.Cab3DFreightAnim;
             FreightWeight = freightAnimStatic.FreightWeight;
 
             // additions to manage consequences of variable weight on friction and brake forces

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -598,7 +598,7 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
             // It appears that only one MSTS type FA can be used per vehicle (to be confirmed?)
             // For coal load variation, C should be absent (set to 1 when read in WAG file) or >0 - sets FreightAnimFlag; and A > B
             // To disable coal load variation and insert a static (crew) shape on the tender breech, one of the conditions indicated above
-            if (FreightShape != null)
+            if (FreightShape != null && !(Viewer.Camera.AttachedCar == this.MSTSWagon && Viewer.Camera.Style == Camera.Styles.ThreeDimCab))
             {
                 // Define default position of shape
                 FreightShape.Location.XNAMatrix = Car.WorldPosition.XNAMatrix;
@@ -655,6 +655,9 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
             {
                 foreach (var freightAnim in FreightAnimations.Animations)
                 {
+                    if (freightAnim.Animation is FreightAnimationStatic)
+                        if ((freightAnim.Animation as FreightAnimationStatic).Cab3DFreightAnim ^
+                            (Viewer.Camera.AttachedCar == this.MSTSWagon && Viewer.Camera.Style == Camera.Styles.ThreeDimCab)) continue;
                     if (freightAnim.FreightShape != null && !((freightAnim.Animation is FreightAnimationContinuous) && (freightAnim.Animation as FreightAnimationContinuous).LoadPerCent == 0))
                     {
                         freightAnim.FreightShape.Location.XNAMatrix = Car.WorldPosition.XNAMatrix;