Merge pull request #778 from Roeterdink/CorrectionPlayerOnTurntable

cjakeman · web-flow · commit dca615cf40ce · 2023-02-27T20:01:36.000Z
Correction for player locomotive on turntable
diff --git a/Source/Orts.Simulation/Simulation/Timetables/TTTurntable.cs b/Source/Orts.Simulation/Simulation/Timetables/TTTurntable.cs
@@ -1858,16 +1858,15 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)
                     // check if train position on turntable
                     if (!trainOnTable.FrontOnBoard)
                     {
-                        if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                        if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))
                         {
                             trainOnTable.SetFrontState(true);
                             parentTrain.Simulator.Confirmer.Information("Front of train is on table");
-
                         }
                     }
                     else if (!trainOnTable.BackOnBoard)
                     {
-                        if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                        if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))
                         {
                             trainOnTable.SetBackState(true);
                             parentTrain.Simulator.Confirmer.Information("Rear of train is on table");
@@ -1882,12 +1881,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)
                         if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N || Math.Abs(parentTrain.MUReverserPercent) <= 1))
                         {
                             // check if train still on turntable
-                            if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                            if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))
                             {
                                 trainOnTable.SetFrontState(false);
                                 parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");
                             }
-                            if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                            if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))
                             {
                                 trainOnTable.SetBackState(false);
                                 parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");
@@ -1915,7 +1914,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)
                     // check if train position on turntable
                     if (!trainOnTable.FrontOnBoard)
                     {
-                        if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                        if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))
                         {
                             trainOnTable.SetFrontState(true);
                             parentTrain.Simulator.Confirmer.Information("Front of train is on table");
@@ -1924,7 +1923,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)
                     }
                     else if (!trainOnTable.BackOnBoard)
                     {
-                        if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                        if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))
                         {
                             trainOnTable.SetBackState(true);
                             parentTrain.Simulator.Confirmer.Information("Rear of train is on table");
@@ -1939,12 +1938,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)
                         if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N || Math.Abs(parentTrain.MUReverserPercent) <= 1))
                         {
                             // check if train still on turntable
-                            if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                            if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))
                             {
                                 trainOnTable.SetFrontState(false);
                                 parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");
                             }
-                            if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))
+                            if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))
                             {
                                 trainOnTable.SetBackState(false);
                                 parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");
diff --git a/Source/Orts.Simulation/Simulation/Turntables.cs b/Source/Orts.Simulation/Simulation/Turntables.cs
@@ -868,7 +868,30 @@ public override bool CheckMovingTableAligned(Train train, bool forward)
             return false;
         }
 
- 
+        /// <summary>
+        /// Check if train position is on turntable track section
+        /// </summary>
+
+        public bool CheckOnSection(Traveller trainPosition)
+        {
+            bool onTable = false;
+            int nodeIndex = -1;
+
+            for (int inode = 0; inode < MyTrackNodesIndex.Length && nodeIndex == -1; inode++)
+            {
+                if (MyTrackNodesIndex[inode] == trainPosition.TrackNodeIndex)
+                {
+                    nodeIndex = inode;
+                }
+            }
+
+            if (nodeIndex >= 0)
+            {
+                onTable = (trainPosition.TrackVectorSectionIndex == MyTrVectorSectionsIndex[nodeIndex]);
+            }
+
+            return (onTable);
+        }
 
         /// <summary>
         /// PerformUpdateActions: actions to be performed at every animation step

Original file line number	Diff line number	Diff line change
`@@ -1858,16 +1858,15 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1858`	`1858`	`// check if train position on turntable`
`1859`	`1859`	`if (!trainOnTable.FrontOnBoard)`
`1860`	`1860`	`{`
`1861`		`- if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1861`	`+ if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1862`	`1862`	`{`
`1863`	`1863`	`trainOnTable.SetFrontState(true);`
`1864`	`1864`	`parentTrain.Simulator.Confirmer.Information("Front of train is on table");`
`1865`		`-`
`1866`	`1865`	`}`
`1867`	`1866`	`}`
`1868`	`1867`	`else if (!trainOnTable.BackOnBoard)`
`1869`	`1868`	`{`
`1870`		`- if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1869`	`+ if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1871`	`1870`	`{`
`1872`	`1871`	`trainOnTable.SetBackState(true);`
`1873`	`1872`	`parentTrain.Simulator.Confirmer.Information("Rear of train is on table");`
`@@ -1882,12 +1881,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1882`	`1881`	`if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N \|\| Math.Abs(parentTrain.MUReverserPercent) <= 1))`
`1883`	`1882`	`{`
`1884`	`1883`	`// check if train still on turntable`
`1885`		`- if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1884`	`+ if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1886`	`1885`	`{`
`1887`	`1886`	`trainOnTable.SetFrontState(false);`
`1888`	`1887`	`parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");`
`1889`	`1888`	`}`
`1890`		`- if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1889`	`+ if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1891`	`1890`	`{`
`1892`	`1891`	`trainOnTable.SetBackState(false);`
`1893`	`1892`	`parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");`
`@@ -1915,7 +1914,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1915`	`1914`	`// check if train position on turntable`
`1916`	`1915`	`if (!trainOnTable.FrontOnBoard)`
`1917`	`1916`	`{`
`1918`		`- if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1917`	`+ if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1919`	`1918`	`{`
`1920`	`1919`	`trainOnTable.SetFrontState(true);`
`1921`	`1920`	`parentTrain.Simulator.Confirmer.Information("Front of train is on table");`
`@@ -1924,7 +1923,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1924`	`1923`	`}`
`1925`	`1924`	`else if (!trainOnTable.BackOnBoard)`
`1926`	`1925`	`{`
`1927`		`- if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1926`	`+ if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1928`	`1927`	`{`
`1929`	`1928`	`trainOnTable.SetBackState(true);`
`1930`	`1929`	`parentTrain.Simulator.Confirmer.Information("Rear of train is on table");`
`@@ -1939,12 +1938,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1939`	`1938`	`if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N \|\| Math.Abs(parentTrain.MUReverserPercent) <= 1))`
`1940`	`1939`	`{`
`1941`	`1940`	`// check if train still on turntable`
`1942`		`- if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1941`	`+ if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1943`	`1942`	`{`
`1944`	`1943`	`trainOnTable.SetFrontState(false);`
`1945`	`1944`	`parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");`
`1946`	`1945`	`}`
`1947`		`- if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1946`	`+ if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1948`	`1947`	`{`
`1949`	`1948`	`trainOnTable.SetBackState(false);`
`1950`	`1949`	`parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");`