Merge pull request #690 from Csantucci/MP-turntable-official Sync turntables and transfertables in multiplayer mode

Author: Csantucci

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -27,6 +27,7 @@
 using Orts.Simulation.Signalling;
 using ORTS.Common;
 using ORTS.Scripting.Api;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -77,6 +78,7 @@ public static Message Decode(string m)
             else if (key == "SIGNALCHANGE") return new MSGSignalChange(m.Substring(index + 1));
             else if (key == "EXHAUST") return new MSGExhaust(m.Substring(index + 1));
             else if (key == "FLIP") return new MSGFlip(m.Substring(index + 1));
+            else if (key == "MOVINGTBL") return new MSGMovingTbl(m.Substring(index + 1));
             else throw new Exception("Unknown Keyword" + key);
         }
 
@@ -2856,6 +2858,7 @@ public override void HandleMsg()
     }
 #endregion MSGUncouple
 
+ 
 #region MSGCouple
     public class MSGCouple : Message
     {
@@ -3957,4 +3960,104 @@ public override string ToString()
 
 #endregion MSGFlip
 
+#region MSGMovingTbl
+
+    public class MSGMovingTbl : Message
+    {
+        private string user;
+        private MovingTable.SubMessageCode subMessageCode;
+        private int movingTableIndex;
+        private bool clockwise;
+        private float yangle;
+
+        public MSGMovingTbl(string m)
+        {
+            string[] areas = m.Split('\t');
+
+            movingTableIndex = int.Parse(areas[0].Trim());
+            user = areas[1].Trim();
+            subMessageCode = (MovingTable.SubMessageCode)int.Parse(areas[2].Trim());
+            clockwise = int.Parse(areas[3].Trim()) == 0 ? false : true;
+            yangle = float.Parse(areas[4].Trim());
+
+        }
+
+        public MSGMovingTbl(int mti, string u, MovingTable.SubMessageCode smc, bool cw, float y)
+        {
+            movingTableIndex = mti;
+            user = u;
+            subMessageCode = smc;
+            clockwise = cw;
+            yangle = y;
+        }
+
+        public override string ToString()
+        {
+            if (user == "") return "5: ALIVE"; //wrong, so just return an ALIVE string
+            string tmp = "MOVINGTBL " + movingTableIndex + "\t" + user + "\t" + (int)subMessageCode + "\t" + (clockwise ? 1 : 0) + "\t" + yangle + "\t";
+            return " " + tmp.Length + ": " + tmp;
+        }
+
+        public override void HandleMsg()
+        {
+            if (user != MPManager.GetUserName())
+            {
+                MPManager.Simulator.ActiveMovingTable = MPManager.Simulator.MovingTables[movingTableIndex];
+                if (MPManager.Simulator.ActiveMovingTable is Turntable turntable)
+                {
+                    switch (subMessageCode)
+                    {
+                        case MovingTable.SubMessageCode.GoToTarget:
+                            turntable.RemotelyControlled = true;
+                            if (Math.Abs(MathHelper.WrapAngle(turntable.YAngle - yangle)) > 0.2f)
+                            {
+                                turntable.YAngle = yangle;
+                                turntable.TargetY = yangle;
+                                turntable.AlignToRemote = true;
+                            }
+                            turntable.GeneralComputeTarget(clockwise);
+                            break;
+                        case MovingTable.SubMessageCode.StartingContinuous:
+                            turntable.YAngle = yangle;
+                            turntable.TargetY = yangle;
+                            turntable.AlignToRemote = true;
+                            turntable.GeneralStartContinuous(clockwise);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else if (MPManager.Simulator.ActiveMovingTable is Transfertable transfertable)
+                {
+                    switch (subMessageCode)
+                    {
+                        case MovingTable.SubMessageCode.GoToTarget:
+                            transfertable.RemotelyControlled = true;
+                            if (Math.Abs(transfertable.OffsetPos - yangle) > 2.8f)
+                            {
+                                transfertable.OffsetPos = yangle;
+                                transfertable.TargetOffset = yangle;
+                                transfertable.AlignToRemote = true;
+                            }
+                            transfertable.GeneralComputeTarget(clockwise);
+                            break;
+                        case MovingTable.SubMessageCode.StartingContinuous:
+                            transfertable.OffsetPos = yangle;
+                            transfertable.TargetOffset = yangle;
+                            transfertable.AlignToRemote = true;
+                            transfertable.GeneralStartContinuous(clockwise);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                if (MPManager.IsServer())
+                {
+                    MPManager.BroadCast(this.ToString());//if server receives this, will tell others, including whoever sent the information
+                }
+            }
+        }
+    }
+
+#endregion MSGMovingTbl
 }

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -1821,7 +1821,7 @@ public virtual void Update(float elapsedClockSeconds, bool auxiliaryUpdate = tru
         {
             if (!auxiliaryUpdate)
                 FormationReversed = false;
-            if (IsActualPlayerTrain && Simulator.ActiveMovingTable != null)
+            if ((IsActualPlayerTrain || TrainType == TRAINTYPE.REMOTE) && Simulator.ActiveMovingTable != null)
                 Simulator.ActiveMovingTable.CheckTrainOnMovingTable(this);
 
             if (IsActualPlayerTrain && Simulator.OriginalPlayerTrain != this && !CheckStations) // if player train is to check own stations

Source/Orts.Simulation/Simulation/Transfertables.cs

@@ -47,6 +47,10 @@ public float CenterOffsetComponent
         {
             get => VerticalTransfer ? CenterOffset.Y : CenterOffset.X;
         }
+        public float OffsetDiff
+        {
+            get => RemotelyControlled ? 2.8f : 1.4f;
+        }
         // Dynamic data
         public bool Forward; // forward motion on
         public bool Reverse; // reverse motion on
@@ -172,6 +176,18 @@ protected void InitializeOffsetsAndTrackNodes()
         /// Returns the Y angle to be compared.
         /// </summary>
         public override void ComputeTarget(bool isForward)
+        {
+            if (!Continuous) return;
+            if (MultiPlayer.MPManager.IsMultiPlayer())
+            {
+                SubMessCode = SubMessageCode.GoToTarget;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());
+            }
+            RemotelyControlled = false;
+            GeneralComputeTarget(isForward);
+        }
+
+        public void GeneralComputeTarget(bool isForward)
         {
             if (!Continuous) return;
             Continuous = false;
@@ -180,7 +196,6 @@ public override void ComputeTarget(bool isForward)
             Reverse = !isForward;
             if (Forward)
             {
-                var offsetDiff = 1.4f;
                 Connected = false;
                 if (Offsets.Count <= 0)
                 {
@@ -194,7 +209,7 @@ public override void ComputeTarget(bool isForward)
                         if (MyTrackNodesIndex[iOffset] != -1 && MyTrVectorSectionsIndex[iOffset] != -1)
                         {
                             var thisOffsetDiff = Offsets[iOffset] - OffsetPos;
-                            if (thisOffsetDiff < offsetDiff && thisOffsetDiff >= 0)
+                            if (thisOffsetDiff < OffsetDiff && thisOffsetDiff >= 0)
                             {
                                 ConnectedTarget = iOffset;
                                 break;
@@ -211,7 +226,6 @@ public override void ComputeTarget(bool isForward)
             }
             else if (Reverse)
             {
-                var offsetDiff = -1.4f;
                 Connected = false;
                 if (Offsets.Count <= 0)
                 {
@@ -225,7 +239,7 @@ public override void ComputeTarget(bool isForward)
                         if (MyTrackNodesIndex[iOffset] != -1 && MyTrVectorSectionsIndex[iOffset] != -1)
                         {
                             var thisOffsetDiff = Offsets[iOffset] - OffsetPos;
-                            if (thisOffsetDiff > offsetDiff && thisOffsetDiff <= 0)
+                            if (thisOffsetDiff > -OffsetDiff && thisOffsetDiff <= 0)
                             {
                                 ConnectedTarget = iOffset;
                                 break;
@@ -241,6 +255,7 @@ public override void ComputeTarget(bool isForward)
                 }
 
             }
+            RemotelyControlled = false;
             return;
         }
 
@@ -250,6 +265,28 @@ public override void ComputeTarget(bool isForward)
         /// </summary>
         /// 
         public override void StartContinuous(bool isForward)
+        {
+            if (TrainsOnMovingTable.Count == 1 && TrainsOnMovingTable[0].FrontOnBoard && TrainsOnMovingTable[0].BackOnBoard)
+            {
+                // Preparing for rotation
+                var train = TrainsOnMovingTable[0].Train;
+                if (Math.Abs(train.SpeedMpS) > 0.1 || (train.LeadLocomotiveIndex != -1 && (train.LeadLocomotive.ThrottlePercent >= 1 || train.TrainType != Train.TRAINTYPE.REMOTE && !(train.LeadLocomotive.Direction == Direction.N
+                 || Math.Abs(train.MUReverserPercent) <= 1))) || (train.ControlMode != Train.TRAIN_CONTROL.MANUAL && train.ControlMode != Train.TRAIN_CONTROL.TURNTABLE &&
+                 train.ControlMode != Train.TRAIN_CONTROL.EXPLORER && train.ControlMode != Train.TRAIN_CONTROL.UNDEFINED))
+                {
+                    if (SendNotifications) Simulator.Confirmer.Warning(Simulator.Catalog.GetStringFmt("Rotation can't start: check throttle, speed, direction and control mode"));
+                    return;
+                }
+            }
+            if (MultiPlayer.MPManager.IsMultiPlayer())
+            {
+                SubMessCode = SubMessageCode.StartingContinuous;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());
+            }
+            GeneralStartContinuous(isForward);
+        }
+
+        public void GeneralStartContinuous(bool isForward)
         {
             if (TrainsOnMovingTable.Count > 1 || (TrainsOnMovingTable.Count == 1 && TrainsOnMovingTable[0].FrontOnBoard ^ TrainsOnMovingTable[0].BackOnBoard))
             {
@@ -263,13 +300,6 @@ public override void StartContinuous(bool isForward)
             {
                 // Preparing for transfer
                 var train = TrainsOnMovingTable[0].Train;
-                if (Math.Abs(train.SpeedMpS) > 0.1 || (train.LeadLocomotiveIndex != -1 && (train.LeadLocomotive.ThrottlePercent >= 1 || !(train.LeadLocomotive.Direction == Direction.N 
-                 || Math.Abs(train.MUReverserPercent) <= 1))) || (train.ControlMode != Train.TRAIN_CONTROL.MANUAL && train.ControlMode != Train.TRAIN_CONTROL.TURNTABLE &&
-                 train.ControlMode != Train.TRAIN_CONTROL.EXPLORER && train.ControlMode != Train.TRAIN_CONTROL.UNDEFINED))
-                {
-                    Simulator.Confirmer.Warning(Simulator.Catalog.GetStringFmt("Transfer can't start: check throttle, speed, direction and control mode"));
-                    return;
-                }
                 if (train.ControlMode == Train.TRAIN_CONTROL.MANUAL || train.ControlMode == Train.TRAIN_CONTROL.EXPLORER || train.ControlMode == Train.TRAIN_CONTROL.UNDEFINED)
                 {
                     SaveConnected = Connected ^ !MyTrackNodesOrientation[ConnectedTrackEnd];