Correction for player locomotive on turntable

Roeterdink · Roeterdink · commit 779a81933960 · 2023-01-22T11:59:58.000+01:00
diff --git a/Source/Orts.Simulation/Simulation/Timetables/TTTurntable.cs b/Source/Orts.Simulation/Simulation/Timetables/TTTurntable.cs
@@ -1847,16 +1847,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");
@@ -1871,12 +1870,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");
@@ -1904,7 +1903,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");
@@ -1913,7 +1912,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");
@@ -1928,12 +1927,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
@@ -854,7 +854,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
`@@ -1847,16 +1847,15 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1847`	`1847`	`// check if train position on turntable`
`1848`	`1848`	`if (!trainOnTable.FrontOnBoard)`
`1849`	`1849`	`{`
`1850`		`- if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1850`	`+ if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1851`	`1851`	`{`
`1852`	`1852`	`trainOnTable.SetFrontState(true);`
`1853`	`1853`	`parentTrain.Simulator.Confirmer.Information("Front of train is on table");`
`1854`		`-`
`1855`	`1854`	`}`
`1856`	`1855`	`}`
`1857`	`1856`	`else if (!trainOnTable.BackOnBoard)`
`1858`	`1857`	`{`
`1859`		`- if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1858`	`+ if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1860`	`1859`	`{`
`1861`	`1860`	`trainOnTable.SetBackState(true);`
`1862`	`1861`	`parentTrain.Simulator.Confirmer.Information("Rear of train is on table");`
`@@ -1871,12 +1870,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1871`	`1870`	`if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N \|\| Math.Abs(parentTrain.MUReverserPercent) <= 1))`
`1872`	`1871`	`{`
`1873`	`1872`	`// check if train still on turntable`
`1874`		`- if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1873`	`+ if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1875`	`1874`	`{`
`1876`	`1875`	`trainOnTable.SetFrontState(false);`
`1877`	`1876`	`parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");`
`1878`	`1877`	`}`
`1879`		`- if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1878`	`+ if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1880`	`1879`	`{`
`1881`	`1880`	`trainOnTable.SetBackState(false);`
`1882`	`1881`	`parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");`
`@@ -1904,7 +1903,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1904`	`1903`	`// check if train position on turntable`
`1905`	`1904`	`if (!trainOnTable.FrontOnBoard)`
`1906`	`1905`	`{`
`1907`		`- if (WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1906`	`+ if (parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1908`	`1907`	`{`
`1909`	`1908`	`trainOnTable.SetFrontState(true);`
`1910`	`1909`	`parentTrain.Simulator.Confirmer.Information("Front of train is on table");`
`@@ -1913,7 +1912,7 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1913`	`1912`	`}`
`1914`	`1913`	`else if (!trainOnTable.BackOnBoard)`
`1915`	`1914`	`{`
`1916`		`- if (WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1915`	`+ if (parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1917`	`1916`	`{`
`1918`	`1917`	`trainOnTable.SetBackState(true);`
`1919`	`1918`	`parentTrain.Simulator.Confirmer.Information("Rear of train is on table");`
`@@ -1928,12 +1927,12 @@ public bool UpdateTurntableStatePlayer(float elapsedClockSeconds)`
`1928`	`1927`	`if (loco.ThrottlePercent < 1 && Math.Abs(loco.SpeedMpS) < 0.05 && (loco.Direction == Direction.N \|\| Math.Abs(parentTrain.MUReverserPercent) <= 1))`
`1929`	`1928`	`{`
`1930`	`1929`	`// check if train still on turntable`
`1931`		`- if (!WorldLocation.Within(parentTrain.FrontTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1930`	`+ if (!parentTurntable.CheckOnSection(parentTrain.FrontTDBTraveller))`
`1932`	`1931`	`{`
`1933`	`1932`	`trainOnTable.SetFrontState(false);`
`1934`	`1933`	`parentTrain.Simulator.Confirmer.Information("Front of train slipped off table");`
`1935`	`1934`	`}`
`1936`		`- if (!WorldLocation.Within(parentTrain.RearTDBTraveller.WorldLocation, parentTurntable.WorldPosition.WorldLocation, parentTurntable.Length / 2))`
	`1935`	`+ if (!parentTurntable.CheckOnSection(parentTrain.RearTDBTraveller))`
`1937`	`1936`	`{`
`1938`	`1937`	`trainOnTable.SetBackState(false);`
`1939`	`1938`	`parentTrain.Simulator.Confirmer.Information("Rear of train slipped off table");`