Solved zig-zag display of track layouts in TrackViewer. Taken from perpetualKid.

Csantucci · Chris Jakeman · commit 07af931251c9 · 2022-01-08T16:32:22.000Z
diff --git a/Source/Contrib/TrackViewer/Drawing/CloseToMouse.cs b/Source/Contrib/TrackViewer/Drawing/CloseToMouse.cs
@@ -62,22 +62,6 @@ public bool IsCloserThan(CloseToMouse otherItem)
             return this.ClosestMouseDistanceSquared < otherItem.ClosestMouseDistanceSquared;
         }
 
-        /// <summary>
-        /// get distance between two world locations not taking the height in account
-        /// </summary>
-        /// <param name="location1">first location</param>
-        /// <param name="location2">second location</param>
-        /// <returns>Distance squared</returns>
-        /// <remarks>Very similar to WordlLocation.GetDistanceSquared</remarks>
-        public static float GetGroundDistanceSquared(WorldLocation location1, WorldLocation location2)
-        {
-            float dx = location1.Location.X - location2.Location.X;
-            float dz = location1.Location.Z - location2.Location.Z;
-            dx += 2048 * (location1.TileX - location2.TileX);
-            dz += 2048 * (location1.TileZ - location2.TileZ);
-            return dx * dx + dz * dz;
-        }
- 
     }
 
     /// <summary>
@@ -144,7 +128,7 @@ public CloseToMouseJunctionOrEnd(TrackNode junctionOrEndNode, string description
         /// <param name="description">The type of item (needed for later printing in statusbar)</param>
         public void CheckMouseDistance(WorldLocation location, WorldLocation mouseLocation, TrackNode junctionOrEndNode, string description)
         {
-            float distanceSquared = CloseToMouse.GetGroundDistanceSquared(location, mouseLocation);
+            float distanceSquared = WorldLocation.GetDistanceSquared2D(location, mouseLocation);
             if (distanceSquared < ClosestDistanceSquared)
             {
                 ClosestDistanceSquared = distanceSquared;
@@ -210,7 +194,7 @@ public override void Reset()
         /// <param name="trItem">The track Item that will be stored when it is indeed the closest</param>
         public void CheckMouseDistance(WorldLocation location, WorldLocation mouseLocation, DrawableTrackItem trItem)
         {
-            float distanceSquared = CloseToMouse.GetGroundDistanceSquared(location, mouseLocation);
+            float distanceSquared = WorldLocation.GetDistanceSquared2D(location, mouseLocation);
 
             if (distanceSquared < ClosestDistanceSquared)
             {
@@ -317,7 +301,7 @@ public void CheckMouseDistance(WorldLocation location, WorldLocation mouseLocati
             TrackNode trackNode, TrVectorSection vectorSection, int tvsi, double pixelsPerMeter)
         {
             storedMouseLocation = mouseLocation;
-            float distanceSquared = CloseToMouse.GetGroundDistanceSquared(location, mouseLocation);
+            float distanceSquared = WorldLocation.GetDistanceSquared2D(location, mouseLocation);
             // to make unique distances becasue they also act as Key
             double distanceSquaredIndexed = ((double)distanceSquared) * (1 + 1e-16 * trackNode.Index);
             if (distanceSquaredIndexed < sortedTrackCandidates.First().Key)
@@ -386,8 +370,8 @@ DistanceLon CalcRealDistanceSquared(TrVectorSection trackVectorSection, TrackSec
                 X = storedMouseLocation.Location.X - trackVectorSection.X,
                 Z = storedMouseLocation.Location.Z - trackVectorSection.Z
             };
-            vectorToMouse.X += (storedMouseLocation.TileX - trackVectorSection.TileX) * 2048;
-            vectorToMouse.Z += (storedMouseLocation.TileZ - trackVectorSection.TileZ) * 2048;
+            vectorToMouse.X = (float)(vectorToMouse.X + (storedMouseLocation.TileX - trackVectorSection.TileX) * WorldLocation.TileSize);
+            vectorToMouse.Z = (float)(vectorToMouse.Z + (storedMouseLocation.TileZ - trackVectorSection.TileZ) * WorldLocation.TileSize);
 
             //Now rotate the vector such that a direction along the track is in a direction (x=0, z=1)
             vectorToMouse = Vector3.Transform(vectorToMouse, Matrix.CreateRotationY(-trackVectorSection.AY));
diff --git a/Source/Contrib/TrackViewer/Drawing/DrawArea.cs b/Source/Contrib/TrackViewer/Drawing/DrawArea.cs
@@ -188,10 +188,10 @@ public void Update()
         public void ZoomReset(DrawTrackDB drawTrackDB)
         {
             if (drawTrackDB == null) return;
-            float minX = drawTrackDB.MinTileX * 2048 - 1024f;
-            float minZ = drawTrackDB.MinTileZ * 2048 - 1024f;
-            float maxX = drawTrackDB.MaxTileX * 2048 + 1024f;
-            float maxZ = drawTrackDB.MaxTileZ * 2048 + 1024f;
+            double minX = drawTrackDB.MinTileX * WorldLocation.TileSize - 1024f;
+            double minZ = drawTrackDB.MinTileZ * WorldLocation.TileSize - 1024f;
+            double maxX = drawTrackDB.MaxTileX * WorldLocation.TileSize + 1024f;
+            double maxZ = drawTrackDB.MaxTileZ * WorldLocation.TileSize + 1024f;
             SetDrawArea(minX, maxX, minZ, maxZ);
         }
 
@@ -202,10 +202,10 @@ public void ZoomReset(DrawTrackDB drawTrackDB)
         /// <param name="maxX">maximal real world X location</param>
         /// <param name="minZ">minimal real world Z location</param>
         /// <param name="maxZ">maximal real world Z location</param>
-        void SetDrawArea(float minX, float maxX, float minZ, float maxZ)
+        void SetDrawArea(double minX, double maxX, double minZ, double maxZ)
         {
-            float scaleX = AreaW / (maxX - minX);
-            float scaleY = AreaH / (maxZ - minZ);
+            double scaleX = AreaW / (maxX - minX);
+            double scaleY = AreaH / (maxZ - minZ);
             //make square tiles
             Scale = Math.Min(scaleX, scaleY);
             metersPerPixel.ApproximateTo(1.0f / Scale);
@@ -297,7 +297,7 @@ private void ZoomAround(Vector2 fixedAreaLocation, int scaleSteps)
             //  fixedX = scale_old * (worldX - offsetX_old) = scale_new * (worldX - offsetX_new)
             //  fixedX/scale_old + offsetX_old = fixedX/scale_new + offsetX_new = worldX
             //  offsetX_new = offsetX_old + fixedX * (scale_new/scale_old - 1) / scale_new
-            float scaleFactor = 1.0f / (float)metersPerPixel.AddStep(scaleSteps); // 1.0/xxx because scale is inverse of metersPerPixel
+            double scaleFactor = 1.0 / metersPerPixel.AddStep(scaleSteps); // 1.0/xxx because scale is inverse of metersPerPixel
             Scale = metersPerPixel.InverseScaleValue;
             OffsetX += fixedAreaLocation.X * (scaleFactor - 1) / Scale;
             OffsetZ += (AreaH - fixedAreaLocation.Y) * (scaleFactor - 1) / Scale;
@@ -311,8 +311,8 @@ public void ZoomToTile()
         {
             //normal equation: areaX = scale * (worldX - offsetX)
             //zoom to tile: screenW = scale_new * 2048
-            double scaleX = AreaW / 2048.0;
-            double scaleY = AreaH / 2048.0;
+            double scaleX = AreaW / WorldLocation.TileSize;
+            double scaleY = AreaH / WorldLocation.TileSize;
             double newScale = Math.Min(scaleX, scaleY);
             int stepsNeeded = metersPerPixel.StepsNeededForRatio(Scale / newScale);
             ZoomAroundMouse(stepsNeeded);
@@ -323,8 +323,8 @@ public void ZoomToTile()
         /// </summary>
         public void ZoomToTileCentered()
         {
-            double scaleX = AreaW / 2048.0;
-            double scaleY = AreaH / 2048.0;
+            double scaleX = AreaW / WorldLocation.TileSize;
+            double scaleY = AreaH / WorldLocation.TileSize;
             double newScale = Math.Min(scaleX, scaleY);
             ZoomCentered(metersPerPixel.StepsNeededForRatio(Scale / newScale));
         }
@@ -420,8 +420,8 @@ public void ShiftToLocation(WorldLocation location)
             // Basic equation areaX = scale * (worldX - offsetX)
             // We want middle of screen to shift to new worldX, so areaW/2 = scale * (worldX - offsetX)
             // Similarly
-            double worldX = location.TileX * 2048 + location.Location.X;
-            double worldZ = location.TileZ * 2048 + location.Location.Z;
+            double worldX = location.TileX * WorldLocation.TileSize + location.Location.X;
+            double worldZ = location.TileZ * WorldLocation.TileSize + location.Location.Z;
             OffsetX = worldX - AreaW / (2 * Scale);
             OffsetZ = worldZ - AreaH / (2 * Scale);
         }
@@ -446,8 +446,8 @@ private float GetWindowSize(float worldSize)
         /// <returns>location on the drawing area in a 2d vector (in pixels)</returns>
         private Vector2 GetAreaVector(WorldLocation location)
         {
-            double x = location.TileX * 2048 + location.Location.X;
-            double y = location.TileZ * 2048 + location.Location.Z;
+            double x = location.TileX * WorldLocation.TileSize + location.Location.X;
+            double y = location.TileZ * WorldLocation.TileSize + location.Location.Z;
             return new Vector2((float)(Scale * (x - OffsetX)),
                                (float)(AreaH - Scale * (y - OffsetZ)));
         }
@@ -486,13 +486,7 @@ private WorldLocation GetWorldLocation(int areaX, int areaY)
         {
             double x = (OffsetX + (areaX) / Scale);
             double z = (OffsetZ + (AreaH - areaY) / Scale);
-            //WorldLocation location = new WorldLocation(0, 0, cornerIndexX, 0, cornerIndexZ);
-            //we now do pre-normalization. This normalization is more efficient than Coordinates.normalization
-            int tileX = (int)x / 2048;
-            x -= (tileX * 2048);
-            int tileZ = (int)z / 2048;
-            z -= tileZ * 2048;
-            WorldLocation location = new WorldLocation(tileX, tileZ, (float)x, 0, (float)z);
+            WorldLocation location = new WorldLocation(0, 0, (float)x, 0, (float)z);
             location.Normalize();
             return location;
         }
diff --git a/Source/Contrib/TrackViewer/Drawing/DrawTrackDB.cs b/Source/Contrib/TrackViewer/Drawing/DrawTrackDB.cs
@@ -225,7 +225,8 @@ public class DrawTrackDB
         #endregion
 
         #region private members
-        /// <summary>Track Section Data</summary>
+
+         /// <summary>Track Section Data</summary>
         private TrackSectionsFile tsectionDat;
         /// <summary>Track database</summary>
         private TrackDB trackDB;
@@ -632,18 +633,18 @@ List<WorldLocation> FindLocationList(uint trackNodeIndex, int trackVectorSection
                 WorldLocation midLocation = FindLocationInSection(tvs, trackSection, trackSectionLength/2);
 
                 // (deltaX, deltaZ) is a vector from begin to end.
-                float deltaX = (endLocation.Location.X - endLocation.Location.X);
-                float deltaZ = (endLocation.Location.Z - endLocation.Location.Z);
-                deltaX += 2048 * (endLocation.TileX - endLocation.TileX); 
-                deltaZ += 2048 * (endLocation.TileZ - endLocation.TileZ);
+                double deltaX = (endLocation.Location.X - endLocation.Location.X);
+                double deltaZ = (endLocation.Location.Z - endLocation.Location.Z);
+                deltaX += WorldLocation.TileSize * (endLocation.TileX - endLocation.TileX); 
+                deltaZ += WorldLocation.TileSize * (endLocation.TileZ - endLocation.TileZ);
 
                 WorldLocation begin2Location = new WorldLocation(midLocation);
-                begin2Location.Location.X -= deltaX / 2;
-                begin2Location.Location.Z -= deltaZ / 2;
+                begin2Location.Location.X = (float)(begin2Location.Location.X - deltaX / 2);
+                begin2Location.Location.Z = (float)(begin2Location.Location.Z - deltaZ / 2);
 
                 WorldLocation end2Location = new WorldLocation(midLocation);
-                end2Location.Location.X += deltaX / 2;
-                end2Location.Location.Z += deltaZ / 2;
+                end2Location.Location.X = (float)(end2Location.Location.X + deltaX / 2);
+                end2Location.Location.Z = (float)(end2Location.Location.Z + deltaZ / 2);
 
                 boxList.Add(begin2Location);
                 boxList.Add(end2Location);
diff --git a/Source/Contrib/TrackViewer/Drawing/Labels/DrawLabels.cs b/Source/Contrib/TrackViewer/Drawing/Labels/DrawLabels.cs
@@ -87,7 +87,7 @@ public void Draw(DrawArea drawArea)
                 {
                     DrawLabel(label);
                 }
-                float distanceSquared = CloseToMouse.GetGroundDistanceSquared(label.WorldLocation, drawArea.MouseLocation);
+                float distanceSquared = WorldLocation.GetDistanceSquared2D(label.WorldLocation, drawArea.MouseLocation);
                 if (distanceSquared < closestDistanceSquared )
                 {
                     closestDistanceSquared = distanceSquared;
diff --git a/Source/Contrib/TrackViewer/Editing/PathEditor.cs b/Source/Contrib/TrackViewer/Editing/PathEditor.cs
@@ -564,7 +564,7 @@ void FindActiveNode(DrawArea drawArea, DrawnPathData drawnPathData)
             TrainpathNode closestNode = null;
             foreach (TrainpathNode node in drawnPathData.DrawnNodes)
             {
-                float distanceSquared = CloseToMouse.GetGroundDistanceSquared(node.Location, drawArea.MouseLocation);
+                float distanceSquared = WorldLocation.GetDistanceSquared2D(node.Location, drawArea.MouseLocation);
                 // by using '<=' instead of '<' we should get the latest one, which overrides earlier ones
                 // To prevent numerical issues, we add a small number (smaller than two junctions would normally be together
                 if (distanceSquared <= closestMouseDistanceSquared + 0.1f)
diff --git a/Source/Contrib/TrackViewer/Editing/TrainpathNode.cs b/Source/Contrib/TrackViewer/Editing/TrainpathNode.cs
@@ -365,7 +365,7 @@ public override TrainpathNode ShallowCopyNoLinks()
         public int FindJunctionOrEndIndex(bool wantJunctionNode)
         {
             int bestIndex = -1;
-            float bestDistance2 = 1e10f;
+            double bestDistance2 = 1e10f;
             for (int j = 0; j < TrackDB.TrackNodes.Count(); j++)
             {
                 TrackNode tn = TrackDB.TrackNodes[j];
@@ -374,12 +374,12 @@ public int FindJunctionOrEndIndex(bool wantJunctionNode)
                 if (!wantJunctionNode && !tn.TrEndNode) continue;
                 if (tn.UiD.TileX != Location.TileX || tn.UiD.TileZ != Location.TileZ) continue;
 
-                float dx = tn.UiD.X - Location.Location.X;
+                double dx = tn.UiD.X - Location.Location.X;
                 dx += (tn.UiD.TileX - Location.TileX) * 2048;
-                float dz = tn.UiD.Z - Location.Location.Z;
+                double dz = tn.UiD.Z - Location.Location.Z;
                 dz += (tn.UiD.TileZ - Location.TileZ) * 2048;
-                float dy = tn.UiD.Y - Location.Location.Y;
-                float d = dx * dx + dy * dy + dz * dz;
+                double dy = tn.UiD.Y - Location.Location.Y;
+                double d = dx * dx + dy * dy + dz * dz;
                 if (bestDistance2 > d)
                 {
                     bestIndex = j;
diff --git a/Source/ORTS.Common/Coordinates.cs b/Source/ORTS.Common/Coordinates.cs

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void Draw(DrawArea drawArea)`
`87`	`87`	`{`
`88`	`88`	`DrawLabel(label);`
`89`	`89`	`}`
`90`		`- float distanceSquared = CloseToMouse.GetGroundDistanceSquared(label.WorldLocation, drawArea.MouseLocation);`
	`90`	`+ float distanceSquared = WorldLocation.GetDistanceSquared2D(label.WorldLocation, drawArea.MouseLocation);`
`91`	`91`	`if (distanceSquared < closestDistanceSquared )`
`92`	`92`	`{`
`93`	`93`	`closestDistanceSquared = distanceSquared;`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ void FindActiveNode(DrawArea drawArea, DrawnPathData drawnPathData)`
`564`	`564`	`TrainpathNode closestNode = null;`
`565`	`565`	`foreach (TrainpathNode node in drawnPathData.DrawnNodes)`
`566`	`566`	`{`
`567`		`- float distanceSquared = CloseToMouse.GetGroundDistanceSquared(node.Location, drawArea.MouseLocation);`
	`567`	`+ float distanceSquared = WorldLocation.GetDistanceSquared2D(node.Location, drawArea.MouseLocation);`
`568`	`568`	`// by using '<=' instead of '<' we should get the latest one, which overrides earlier ones`
`569`	`569`	`// To prevent numerical issues, we add a small number (smaller than two junctions would normally be together`
`570`	`570`	`if (distanceSquared <= closestMouseDistanceSquared + 0.1f)`