Add STF parsing

Author: cesarBLG

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

@@ -68,9 +68,9 @@ public class MSTSWagon : TrainCar
     {
         public Pantographs Pantographs;
         public ScriptedPassengerCarPowerSupply PassengerCarPowerSupply => PowerSupply as ScriptedPassengerCarPowerSupply;
-        
-        public Door RightDoor;
-        public Door LeftDoor;
+        public Doors Doors;        
+        public Door RightDoor => Doors.RightDoor;
+        public Door LeftDoor => Doors.LeftDoor;
         public bool MirrorOpen;
         public bool UnloadingPartsOpen;
         public bool WaitForAnimationReady; // delay counter to start loading/unliading is on;
@@ -346,8 +346,7 @@ public MSTSWagon(Simulator simulator, string wagFilePath)
             : base(simulator, wagFilePath)
         {
             Pantographs = new Pantographs(this);
-            RightDoor = new Door(this, true);
-            LeftDoor = new Door(this, false);
+            Doors = new Doors(this);
         }
 
         public void Load()
@@ -954,8 +953,7 @@ public void GetMeasurementUnits()
         public override void Initialize()
         {
             Pantographs.Initialize();
-            RightDoor.Initialize();
-            LeftDoor.Initialize();
+            Doors.Initialize();
             PassengerCarPowerSupply?.Initialize();
 
             base.Initialize();
@@ -1380,6 +1378,10 @@ public virtual void Parse(string lowercasetoken, STFReader stf)
                 case "wagon(ortspantographs":
                     Pantographs.Parse(lowercasetoken, stf);
                     break;
+                case "wagon(ortsdoors(closingdelay":
+                case "wagon(ortsdoors(openingdelay":
+                    Doors.Parse(lowercasetoken, stf);
+                    break;
                 case "wagon(ortspowersupply":
                 case "wagon(ortspowerondelay":
                 case "wagon(ortsbattery(mode":
@@ -1544,8 +1546,7 @@ public virtual void Copy(MSTSWagon copy)
             foreach (MSTSCoupling coupler in copy.Couplers)
                 Couplers.Add(coupler);
             Pantographs.Copy(copy.Pantographs);
-            LeftDoor.Copy(copy.LeftDoor);
-            RightDoor.Copy(copy.RightDoor);
+            Doors.Copy(copy.Doors);
             if (copy.FreightAnimations != null)
             {
                 FreightAnimations = new FreightAnimations(copy.FreightAnimations, this);
@@ -1679,8 +1680,7 @@ public override void Save(BinaryWriter outf)
             foreach (MSTSCoupling coupler in Couplers)
                 coupler.Save(outf);
             Pantographs.Save(outf);
-            LeftDoor.Save(outf);
-            RightDoor.Save(outf);
+            Doors.Save(outf);
             PassengerCarPowerSupply?.Save(outf);
             if (FreightAnimations != null)
             {
@@ -1733,8 +1733,7 @@ public override void Restore(BinaryReader inf)
             MaxHandbrakeForceN = inf.ReadSingle();
             Couplers = ReadCouplersFromSave(inf).ToList();
             Pantographs.Restore(inf);
-            LeftDoor.Restore(inf);
-            RightDoor.Restore(inf);
+            Doors.Restore(inf);
             PassengerCarPowerSupply?.Restore(inf);
             if (FreightAnimations != null)
             {
@@ -1907,8 +1906,7 @@ public override void Update(float elapsedClockSeconds)
 
             Pantographs.Update(elapsedClockSeconds);
 
-            LeftDoor.Update(elapsedClockSeconds);
-            RightDoor.Update(elapsedClockSeconds);
+            Doors.Update(elapsedClockSeconds);
 
             MSTSBrakeSystem.Update(elapsedClockSeconds);
 

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

@@ -31,12 +31,81 @@ public enum DoorState
         Opening,
         Open,
     }
+    public class Doors : ISubSystem<Doors>
+    {
+        public Door RightDoor;
+        public Door LeftDoor;
+
+        public Doors(MSTSWagon wagon)
+        {
+            LeftDoor = new Door(wagon, false);
+            RightDoor = new Door(wagon, true);
+        }
+
+        public virtual void Parse(string lowercasetoken, STFReader stf)
+        {
+            switch (lowercasetoken)
+            {
+                case "wagon(ortsdoors(closingdelay": 
+                {
+                    float delayS = stf.ReadFloatBlock(STFReader.UNITS.Time, 0f);
+                    LeftDoor.ClosingDelayS = delayS;
+                    RightDoor.ClosingDelayS = delayS;
+                    break;
+                }
+                case "wagon(ortsdoors(openingdelay": 
+                {
+                    float delayS = stf.ReadFloatBlock(STFReader.UNITS.Time, 0f);
+                    LeftDoor.OpeningDelayS = delayS;
+                    RightDoor.OpeningDelayS = delayS;
+                    break;
+                }
+            }
+        }
+
+        public void Copy(Doors other)
+        {
+            LeftDoor.Copy(other.LeftDoor);
+            RightDoor.Copy(other.RightDoor);
+        }
+
+        public virtual void Initialize()
+        {
+            LeftDoor.Initialize();
+            RightDoor.Initialize();
+        }
+
+        /// <summary>
+        /// Initialization when simulation starts with moving train
+        /// </summary>
+        public virtual void InitializeMoving()
+        {
+        }
+
+        public virtual void Save(BinaryWriter outf)
+        {
+            LeftDoor.Save(outf);
+            RightDoor.Save(outf);
+        }
+
+        public virtual void Restore(BinaryReader inf)
+        {
+            LeftDoor.Restore(inf);
+            RightDoor.Restore(inf);
+        }
+
+        public virtual void Update(float elapsedClockSeconds)
+        {
+            LeftDoor.Update(elapsedClockSeconds);
+            RightDoor.Update(elapsedClockSeconds);
+        }
+    }
     public class Door : ISubSystem<Door>
     {
 
         // Parameters
-        public float OpeningDelayS { get; protected set; } = 0f;
-        public float ClosingDelayS { get; protected set; } = 0f;
+        public float OpeningDelayS { get; set; } = 0f;
+        public float ClosingDelayS { get; set; } = 0f;
 
         // Variables
         readonly MSTSWagon Wagon;
@@ -59,16 +128,6 @@ public Door(MSTSWagon wagon, bool right)
 
         public virtual void Parse(string lowercasetoken, STFReader stf)
         {
-            switch (lowercasetoken)
-            {
-                case "wagon(ortsdoors(closingdelay":
-                    ClosingDelayS = stf.ReadFloatBlock(STFReader.UNITS.Time, 0f);
-                    break;
-
-                case "engine(ortsdoors(openingdelay":
-                    OpeningDelayS = stf.ReadFloatBlock(STFReader.UNITS.Time, 0f);
-                    break;
-            }
         }
 
         public void Copy(Door other)