Make branch standalone from other branches

Author: SteelFill

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -4597,7 +4597,7 @@ public class CarManager
         public static Dictionary<string, MSTSWagon> LoadedCars = new Dictionary<string, MSTSWagon>();
     }
 
-    public struct ParticleEmitterData
+    public class ParticleEmitterData
     {
         public Vector3 PositionM;
         public Vector3 PositionVariationM = Vector3.Zero;
@@ -4628,9 +4628,6 @@ public struct ParticleEmitterData
 
         public bool ChaoticRandomization = false; // Changes the style of RNG used for particle motion
 
-        public int ShapeIndex = -1;
-        public string ShapeHierarchy;
-
         public ParticleEmitterData(STFReader stf)
         {
             stf.MustMatch("(");
@@ -4677,8 +4674,6 @@ public ParticleEmitterData(STFReader stf)
                 new STFReader.TokenProcessor("ortsmaxparticles", ()=>{ MaxParticles = stf.ReadIntBlock(null); }),
                 new STFReader.TokenProcessor("ortsratemultiplier", ()=>{ RateFactor = stf.ReadFloatBlock(STFReader.UNITS.None, null); }),
                 new STFReader.TokenProcessor("ortsusechaoticrandomization", ()=>{ ChaoticRandomization = stf.ReadBoolBlock(true); }),
-                new STFReader.TokenProcessor("ortsshapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null); }),
-                new STFReader.TokenProcessor("ortsshapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null); }),
             });
         }
     }

Source/RunActivity/Viewer3D/ParticleEmitter.cs

@@ -26,6 +26,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using ORTS.Common;
 using Orts.Simulation.RollingStocks;
+using Orts.Viewer3D.RollingStock;
 
 namespace Orts.Viewer3D
 {
@@ -47,7 +48,7 @@ public class ParticleEmitterViewer
         int InputCycle;
 #endif
 
-        public ParticleEmitterViewer(Viewer viewer, ParticleEmitterData data, WorldPosition worldPosition)
+        public ParticleEmitterViewer(Viewer viewer, ParticleEmitterData data, MSTSWagonViewer car, WorldPosition worldPosition)
         {
             Viewer = viewer;
             EmitterData = data;
@@ -338,6 +339,8 @@ struct ParticleVertex
 
         internal WorldPosition WorldPosition;
 
+        internal MSTSWagonViewer CarViewer;
+
         // Particle buffer goes like this:
         //   +--active>-----new>--+
         //   |                    |
@@ -370,6 +373,7 @@ public ParticleEmitterPrimitive(ParticleEmitterViewer particleViewer, ParticleEm
             ParticleDuration = 3;
             ParticleColor = Color.White;
 
+            CarViewer = car;
             WorldPosition = worldPosition;
 
             // Initialize the particle accumulator to a random value to de-sync particle emitters from eachother
@@ -413,35 +417,6 @@ public ParticleEmitterPrimitive(ParticleEmitterViewer particleViewer, ParticleEm
                     0.9f + (float)Viewer.Random.NextDouble() * 0.2f,
                 };
             }
-
-            // Initialization step for emitter shape attachment
-            if (EmitterData.ShapeIndex != -1)
-            {
-                if (EmitterData.ShapeIndex < 0 || EmitterData.ShapeIndex >= CarViewer.TrainCarShape.ResultMatrices.Count())
-                {
-                    Trace.TraceWarning("Particle emitter in car {0} has invalid shape index defined, shape index {1} does not exist",
-                        (CarViewer.Car as MSTSWagon).WagFilePath, EmitterData.ShapeIndex);
-                    EmitterData.ShapeIndex = 0;
-                }
-            }
-            else
-            {
-                if (!String.IsNullOrEmpty(EmitterData.ShapeHierarchy))
-                {
-                    if (CarViewer.TrainCarShape.SharedShape.MatrixNames.Contains(EmitterData.ShapeHierarchy))
-                    {
-                        EmitterData.ShapeIndex = CarViewer.TrainCarShape.SharedShape.MatrixNames.IndexOf(EmitterData.ShapeHierarchy);
-                    }
-                    else
-                    {
-                        Trace.TraceWarning("Particle emitter in car {0} has invalid shape index defined, matrix name {1} does not exist",
-                            (CarViewer.Car as MSTSWagon).WagFilePath, EmitterData.ShapeHierarchy);
-                        EmitterData.ShapeIndex = 0;
-                    }
-                }
-                else
-                    EmitterData.ShapeIndex = 0;
-            }
         }
 
         void VertexBuffer_ContentLost()
@@ -561,7 +536,7 @@ public void Update(float currentTime, ElapsedTime elapsedTime)
                 {
                     Matrix transform = WorldPosition.XNAMatrix;
                     transform.Translation = Vector3.Zero; // Only want rotation data for this step
-                    transform = CarViewer.TrainCarShape.ResultMatrices[EmitterData.ShapeIndex] * transform;
+                    // rotation = CarViewer.TrainCarShape.ResultMatrices[EmitterData.ShapeIndex] * rotation; // Future: ShapeHierarchy goes here
 
                     Matrix rotation = transform;
                     rotation.Translation = Vector3.Zero; // Last step needed translational effects, next step does not

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -123,7 +123,7 @@ public MSTSWagonViewer(Viewer viewer, MSTSWagon car)
                 from effect in MSTSWagon.EffectData
                 select new KeyValuePair<string, List<ParticleEmitterViewer>>(effect.Key, new List<ParticleEmitterViewer>(
                     from data in effect.Value
-                    select new ParticleEmitterViewer(viewer, data, car.WorldPosition)))).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+                    select new ParticleEmitterViewer(viewer, data, this, car.WorldPosition)))).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
 
             // Initaialise particle viewers for special steam effects
             foreach (var emitter in ParticleDrawers)