Merge pull request #695 from Csantucci/MP-containers-official

Container loaded wagons in Multiplayer mode .
Blueprint approved and PR merged.
Thanks, Carlo

Author: cjakeman

Source/Orts.Simulation/MultiPlayer/MPManager.cs

@@ -645,6 +645,17 @@ private void RemovePlayer()
                             if (hasOtherPlayer == false) 
                             {
                                 AddOrRemoveLocomotives(p.Username, p.Train, false);
+                                if (p.Train.Cars.Count > 0)
+                                {
+                                    foreach (TrainCar car in p.Train.Cars)
+                                    {
+                                        car.Train = null; // WorldPosition.XNAMatrix.M42 -= 1000;
+                                        car.IsPartOfActiveTrain = false;  // to stop sounds
+                                                                          // remove containers if any
+                                        if (car.FreightAnimations?.Animations != null)
+                                            car.FreightAnimations?.HideDiscreteFreightAnimations();
+                                    }
+                                }
                                 p.Train.RemoveFromTrack();
                                 Simulator.Trains.Remove(p.Train);
                             }

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -23,6 +23,7 @@
 using Orts.Simulation;
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks;
+using Orts.Simulation.RollingStocks.SubSystems;
 using Orts.Simulation.Signalling;
 using ORTS.Common;
 using ORTS.Scripting.Api;
@@ -278,8 +279,9 @@ public class MSGPlayer : MSGRequired
         public string leadingID;
         public string[] cars;
         public string[] ids;
-        public int[] flipped; //if a wagon is engine
-        public int[] lengths; //if a wagon is engine
+        public int[] flipped;
+        public int[] lengths;
+        public string[] fadiscretes;
         public string url;
         public int version;
         public string MD5 = "";
@@ -361,6 +363,7 @@ private void ParseTrainCars(string m)
             ids = new string[numCars];
             flipped = new int[numCars];
             lengths = new int[numCars];
+            fadiscretes = new string[numCars];
             int index, last;
             for (var i = 0; i < numCars; i++)
             {
@@ -373,6 +376,7 @@ private void ParseTrainCars(string m)
                 ids[i] = carinfo[0];
                 flipped[i] = int.Parse(carinfo[1]);
                 lengths[i] = int.Parse(carinfo[2]);
+                fadiscretes[i] = carinfo[3];
             }
 
         }
@@ -414,13 +418,17 @@ public MSGPlayer(string n, string cd, string c, string p, Train t, int tn, strin
             ids = new string[t.Cars.Count];
             flipped = new int[t.Cars.Count];
             lengths = new int[t.Cars.Count];
+            fadiscretes = new string[t.Cars.Count];
             for (var i = 0; i < t.Cars.Count; i++)
             {
                 cars[i] = t.Cars[i].RealWagFilePath;
                 ids[i] = t.Cars[i].CarID;
                 if (t.Cars[i].Flipped == true) flipped[i] = 1;
                 else flipped[i] = 0;
                 lengths[i] = (int)(t.Cars[i].CarLengthM * 100);
+                fadiscretes[i] = "0";
+                if (t.Cars[i].FreightAnimations != null)
+                    fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
             }
             if (t.LeadLocomotive != null) leadingID = t.LeadLocomotive.CarID;
             else leadingID = "NA";
@@ -438,13 +446,12 @@ public override string ToString()
             for (var i = 0; i < cars.Length; i++)
             {
                 var c = cars[i];
-                var index = c.LastIndexOf("\\trains\\trainset\\", StringComparison.OrdinalIgnoreCase);
-                if (index > 0)
+                var index = c.LastIndexOf("\\trains\\trainset\\", StringComparison.OrdinalIgnoreCase); 
                 {
                     c = c.Remove(0, index + 17);
                 }//c: wagon path without folder name
 
-                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\t";
+                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\n" + fadiscretes[i] + "\t";
             }
 
             tmp += "\r" + MPManager.Instance().version + "\r" + MD5;
@@ -523,6 +530,8 @@ public override void HandleMsg()
                     {
                         MPManager.OnlineTrains.Players.Add(user, p1);
                         p1.CreatedTime = MPManager.Simulator.GameTime;
+                        // re-insert train reference in cars
+                        InsertTrainReference(p1Train);
                         MPManager.Instance().AddOrRemoveTrain(p1Train, true);
                         if (MPManager.IsServer()) MPManager.Instance().AddOrRemoveLocomotives(user, p1Train, true);
                         MPManager.Instance().lostPlayer.Remove(user);
@@ -674,6 +683,8 @@ public void HandleMsg(OnlinePlayer p)
                     p.path = p1.path;
                     p.Username = p1.Username;
                     MPManager.OnlineTrains.Players.Add(user, p);
+                    // re-insert train reference in cars
+                    InsertTrainReference(p1Train);
                     MPManager.Instance().AddOrRemoveTrain(p.Train, true);
                     if (MPManager.IsServer()) MPManager.Instance().AddOrRemoveLocomotives(user, p.Train, true);
                     MPManager.Instance().lostPlayer.Remove(user);
@@ -722,6 +733,16 @@ public void HandleMsg(OnlinePlayer p)
 
         }
 
+        private void InsertTrainReference(Train train)
+        {
+            foreach (var car in train.Cars)
+            {
+                car.Train = train;
+                car.IsPartOfActiveTrain = true;
+                car.FreightAnimations?.ShowDiscreteFreightAnimations();
+            }
+        }
+
         public void SendToPlayer(OnlinePlayer p, string msg)
         {
 #if DEBUG_MULTIPLAYER
@@ -1224,6 +1245,7 @@ public class MSGTrain : Message
         string[] ids;
         int[] flipped; //if a wagon is engine
         int[] lengths;
+        string[] fadiscretes;
         int TrainNum;
         int direction;
         int TileX, TileZ;
@@ -1263,6 +1285,7 @@ public MSGTrain(string m)
             ids = new string[areas.Length - 2];
             flipped = new int[areas.Length - 2];
             lengths = new int[areas.Length - 2];
+            fadiscretes = new string[areas.Length - 2];
             for (var i = 0; i < cars.Length; i++)
             {
                 index = areas[i].IndexOf('\"');
@@ -1274,6 +1297,7 @@ public MSGTrain(string m)
                 ids[i] = carinfo[0];
                 flipped[i] = int.Parse(carinfo[1]);
                 lengths[i] = int.Parse(carinfo[2]);
+                fadiscretes[i] = carinfo[3];
             }
             index = areas[areas.Length - 2].IndexOf('\n');
             last = areas[areas.Length - 2].Length;
@@ -1289,13 +1313,17 @@ public MSGTrain(Train t, int n)
             ids = new string[t.Cars.Count];
             flipped = new int[t.Cars.Count];
             lengths = new int[t.Cars.Count];
+            fadiscretes = new string[t.Cars.Count];
             for (var i = 0; i < t.Cars.Count; i++)
             {
                 cars[i] = t.Cars[i].RealWagFilePath;
                 ids[i] = t.Cars[i].CarID;
                 lengths[i] = (int)t.Cars[i].CarLengthM;
                 if (t.Cars[i].Flipped == true) flipped[i] = 1;
                 else flipped[i] = 0;
+                fadiscretes[i] = "0";
+                if (t.Cars[i].FreightAnimations != null)
+                    fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
             }
             TrainNum = n;
             direction = t.RearTDBTraveller.Direction == Traveller.TravellerDirection.Forward ? 1 : 0;
@@ -1324,6 +1352,8 @@ public override void HandleMsg() //only client will get message, thus will set s
                     direction == 1 ? Traveller.TravellerDirection.Forward : Traveller.TravellerDirection.Backward)
             };
 
+            string[] faDiscreteSplit;
+            List<LoadData> loadDataList = new List<LoadData>();
             for (var i = 0; i < cars.Length; i++)
             {
                 string wagonFilePath = MPManager.Simulator.BasePath + @"\trains\trainset\" + cars[i];
@@ -1332,6 +1362,24 @@ public override void HandleMsg() //only client will get message, thus will set s
                 {
                     car = RollingStock.Load(MPManager.Simulator, train, wagonFilePath);
                     car.CarLengthM = lengths[i];
+                    if (fadiscretes[i][0] != '0')
+                    {
+                        int numDiscretes = fadiscretes[i][0];
+                        // There are discrete freight animations, add them to wagon
+                        faDiscreteSplit = fadiscretes[i].Split('&');
+                        loadDataList.Clear();
+                        for (int j = 1; j < faDiscreteSplit.Length; j++)
+                        {
+                            var faDiscrete = faDiscreteSplit[j];
+                            string[] loadDataItems = faDiscrete.Split('%');
+                            LoadData loadData = new LoadData();
+                            loadData.Name = loadDataItems[0];
+                            loadData.Folder = loadDataItems[1];
+                            Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
+                            loadDataList.Add(loadData);
+                        }
+                        car.FreightAnimations?.Load(loadDataList);
+                    }
                 }
                 catch (Exception error)
                 {
@@ -1395,7 +1443,7 @@ public override string ToString()
                     c = c.Remove(0, index + 17);
                 }//c: wagon path without folder name
 
-                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\t";
+                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\n" + fadiscretes[i] + "\t";
             }
             tmp += "\n" + name  + "\t";
             return " " + tmp.Length + ": " + tmp;
@@ -1413,6 +1461,7 @@ public class MSGUpdateTrain : Message
         string[] ids;
         int[] flipped; //if a wagon is engine
         int[] lengths; //if a wagon is engine
+        string[] fadiscretes;
         int TrainNum;
         int direction;
         int TileX, TileZ;
@@ -1456,6 +1505,7 @@ public MSGUpdateTrain(string m)
             ids = new string[areas.Length - 1];
             flipped = new int[areas.Length - 1];
             lengths = new int[areas.Length - 1];
+            fadiscretes = new string[areas.Length - 1];
             for (var i = 0; i < cars.Length; i++)
             {
                 index = areas[i].IndexOf('\"');
@@ -1467,6 +1517,7 @@ public MSGUpdateTrain(string m)
                 ids[i] = carinfo[0];
                 flipped[i] = int.Parse(carinfo[1]);
                 lengths[i] = int.Parse(carinfo[2]);
+                fadiscretes[i] = carinfo[3];
             }
 
             //System.Console.WriteLine(this.ToString());
@@ -1479,13 +1530,17 @@ public MSGUpdateTrain(string u, Train t, int n)
             ids = new string[t.Cars.Count];
             flipped = new int[t.Cars.Count];
             lengths = new int[t.Cars.Count];
+            fadiscretes = new string[t.Cars.Count];
             for (var i = 0; i < t.Cars.Count; i++)
             {
                 cars[i] = t.Cars[i].RealWagFilePath;
                 ids[i] = t.Cars[i].CarID;
                 lengths[i] = (int)t.Cars[i].CarLengthM;
                 if (t.Cars[i].Flipped == true) flipped[i] = 1;
                 else flipped[i] = 0;
+                fadiscretes[i] = "0";
+                if (t.Cars[i].FreightAnimations != null)
+                    fadiscretes[i] = t.Cars[i].FreightAnimations.FADiscretesString();
             }
             TrainNum = n;
             direction = t.RearTDBTraveller.Direction == Traveller.TravellerDirection.Forward ? 1 : 0;
@@ -1524,6 +1579,8 @@ public override void HandleMsg() //only client will get message, thus will set s
                 Traveller traveller = new Traveller(MPManager.Simulator.TSectionDat, MPManager.Simulator.TDB.TrackDB.TrackNodes, TileX, TileZ, X, Z, direction == 1 ? Traveller.TravellerDirection.Forward : Traveller.TravellerDirection.Backward);
                 List<TrainCar> tmpCars = new List<TrainCar>();
 
+                string[] faDiscreteSplit;
+                List<LoadData> loadDataList = new List<LoadData>();
                 for (var i = 0; i < cars.Length; i++)
                 {
                     string wagonFilePath = MPManager.Simulator.BasePath + @"\trains\trainset\" + cars[i];
@@ -1534,6 +1591,24 @@ public override void HandleMsg() //only client will get message, thus will set s
                         if (car == null)
                             car = RollingStock.Load(MPManager.Simulator, train, wagonFilePath);
                         car.CarLengthM = lengths[i];
+                        if (fadiscretes[i][0] != '0')
+                        {
+                            int numDiscretes = fadiscretes[i][0];
+                            // There are discrete freight animations, add them to wagon
+                            faDiscreteSplit = fadiscretes[i].Split('&');
+                            loadDataList.Clear();
+                            for (int j = 1; j < faDiscreteSplit.Length; j++)
+                            {
+                                var faDiscrete = faDiscreteSplit[j];
+                                string[] loadDataItems = faDiscrete.Split('%');
+                                LoadData loadData = new LoadData();
+                                loadData.Name = loadDataItems[0];
+                                loadData.Folder = loadDataItems[1];
+                                Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
+                                loadDataList.Add(loadData);
+                            }
+                            car.FreightAnimations?.Load(loadDataList);
+                        }
                     }
                     catch (Exception error)
                     {
@@ -1639,7 +1714,7 @@ public override string ToString()
                     c = c.Remove(0, index + 17);
                 }//c: wagon path without folder name
 
-                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\t";
+                tmp += "\"" + c + "\"" + " " + ids[i] + "\n" + flipped[i] + "\n" + lengths[i] + "\n" + fadiscretes[i] + "\t";
             }
             return " " + tmp.Length + ": " + tmp;
         }
@@ -3882,4 +3957,4 @@ public override string ToString()
 
 #endregion MSGFlip
 
-}
+}

Source/Orts.Simulation/MultiPlayer/OnlineTrains.cs

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
+using Orts.Formats.Msts;
 using Orts.Simulation;
 using Orts.Simulation.AIs;
 using Orts.Simulation.Physics;
@@ -182,7 +183,8 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
                 }
                 else throw new Exception();
             }
-
+            string[] faDiscreteSplit;
+            List<LoadData> loadDataList = new List<LoadData>();
             for (var i = 0; i < player.cars.Length; i++)// cars.Length-1; i >= 0; i--) {
             {
                 string wagonFilePath = MPManager.Simulator.BasePath + @"\trains\trainset\" + player.cars[i];
@@ -191,7 +193,26 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
                 try
                 {
                     car = RollingStock.Load(MPManager.Simulator, train, wagonFilePath);
+                    car.CarID = player.ids[i];
                     car.CarLengthM = player.lengths[i] / 100.0f;
+                    if (player.fadiscretes[i][0] != '0')
+                    {
+                        int numDiscretes = player.fadiscretes[i][0];
+                        // There are discrete freight animations, add them to wagon
+                        faDiscreteSplit = player.fadiscretes[i].Split('&');
+                        loadDataList.Clear();
+                        for (int j = 1; j < faDiscreteSplit.Length; j++)
+                        {
+                            var faDiscrete = faDiscreteSplit[j];
+                            string[] loadDataItems = faDiscrete.Split('%');
+                            LoadData loadData = new LoadData();
+                            loadData.Name = loadDataItems[0];
+                            loadData.Folder = loadDataItems[1];
+                            Enum.TryParse(loadDataItems[2], out loadData.LoadPosition);
+                            loadDataList.Add(loadData);
+                        }
+                        car.FreightAnimations?.Load(loadDataList);
+                    }
                 }
                 catch (Exception error)
                 {
@@ -203,7 +224,6 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
                     continue;
 
                 car.Flipped = player.flipped[i] != 0;
-                car.CarID = player.ids[i];
 
                 if (car is MSTSWagon w)
                 {

Source/Orts.Simulation/Simulation/AIs/AI.cs

@@ -919,7 +919,7 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini
                     TrainCar car = RollingStock.Load(Simulator, train, wagonFilePath);
                     car.Flipped = wagon.Flip;
                     car.UiD = wagon.UiD;
-                    car.FreightAnimations?.Load(car as MSTSWagon, wagon.LoadDataList);
+                    car.FreightAnimations?.Load(wagon.LoadDataList);
                     train.Length += car.CarLengthM;
                     if (car is EOT)
                     {

Source/Orts.Simulation/Simulation/Container.cs

@@ -82,6 +82,7 @@ public enum Status
         public Matrix RelativeContainerMatrix = Matrix.Identity;
         public MSTSWagon Wagon;
         public string LoadFilePath;
+        public bool Visible = true;
         public Container(FreightAnimationDiscrete freightAnimDiscreteCopy, FreightAnimationDiscrete freightAnimDiscrete, bool stacked = false)
         {
             Wagon = freightAnimDiscrete.Wagon;
@@ -125,6 +126,7 @@ public Container(BinaryReader inf, FreightAnimationDiscrete freightAnimDiscrete,
             Name = inf.ReadString();
             BaseShapeFileFolderSlash = inf.ReadString();
             ShapeFileName = inf.ReadString();
+            LoadFilePath = inf.ReadString();
             IntrinsicShapeOffset.X = inf.ReadSingle();
             IntrinsicShapeOffset.Y = inf.ReadSingle();
             IntrinsicShapeOffset.Z = inf.ReadSingle();
@@ -222,6 +224,7 @@ public void Save(BinaryWriter outf, bool fromContainerStation = false)
             outf.Write(Name);
             outf.Write(BaseShapeFileFolderSlash);
             outf.Write(ShapeFileName);
+            outf.Write(LoadFilePath);
             outf.Write(IntrinsicShapeOffset.X);
             outf.Write(IntrinsicShapeOffset.Y);
             outf.Write(IntrinsicShapeOffset.Z);

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

@@ -976,7 +976,7 @@ public override void Initialize()
                         break;
                 }
             }
-            FreightAnimations?.Load(this, FreightAnimations.LoadDataList, true);
+            FreightAnimations?.Load(FreightAnimations.LoadDataList, true);
             InitializeLoadPhysics();
         }