Fix draw offset and improve input handling of objects on bridges

Rampastring · Rampastring · commit 3dd9c9e22ffc · 2025-06-06T20:27:51.000+03:00
diff --git a/src/TSMapEditor/Constants.cs b/src/TSMapEditor/Constants.cs
@@ -10,6 +10,7 @@ public static class Constants
         public static int CellSizeY = 24;
         public const int CellSizeInLeptons = 256;
         public static int CellHeight => CellSizeY / 2;
+        public static int HighBridgeHeight = 4;
         public static int TileColorBufferSize = 576;
 
         public static int RenderPixelPadding = 50;
diff --git a/src/TSMapEditor/Models/CellTag.cs b/src/TSMapEditor/Models/CellTag.cs
@@ -17,6 +17,8 @@ public CellTag(Point2D position, Tag tag)
             Tag = tag;
         }
 
+        public bool IsOnBridge() => false;
+
         public Point2D Position { get; set; }
         public Tag Tag { get; set; }
 
diff --git a/src/TSMapEditor/Models/Foot.cs b/src/TSMapEditor/Models/Foot.cs
@@ -26,5 +26,7 @@ public Foot(T objectType) : base(objectType) { }
         /// Is this unit available for recruitment for TeamTypes that have Autocreate=yes?
         /// </summary>
         public bool AutocreateYesRecruitable { get; set; }
+
+        public override bool IsOnBridge() => High;
     }
 }
diff --git a/src/TSMapEditor/Models/GameObject.cs b/src/TSMapEditor/Models/GameObject.cs
@@ -53,6 +53,8 @@ public override int GetHashCode()
 
         public virtual bool HasShadow() => false;
 
+        public virtual bool IsOnBridge() => false;
+
         public virtual Color GetRemapColor() => Color.White;
     }
 }
diff --git a/src/TSMapEditor/Models/House.cs b/src/TSMapEditor/Models/House.cs
@@ -21,6 +21,8 @@ public BaseNode(string structureTypeName, Point2D location)
         public string StructureTypeName { get; set; }
         public Point2D Position { get; set; }
 
+        public bool IsOnBridge() => false;
+
         public static BaseNode FromIniString(string iniString)
         {
             if (string.IsNullOrWhiteSpace(iniString))
diff --git a/src/TSMapEditor/Models/IPositioned.cs b/src/TSMapEditor/Models/IPositioned.cs
@@ -5,5 +5,7 @@ namespace TSMapEditor.Models
     public interface IPositioned
     {
         Point2D Position { get; set; }
+
+        bool IsOnBridge();
     }
 }
diff --git a/src/TSMapEditor/Models/Waypoint.cs b/src/TSMapEditor/Models/Waypoint.cs
@@ -59,6 +59,8 @@ public string EditorColor
 
         public Color XNAColor;
 
+        public bool IsOnBridge() => false;
+
         public static Waypoint ParseWaypoint(string id, string coordsString)
         {
             int waypointIndex = Conversions.IntFromString(id, -1);
diff --git a/src/TSMapEditor/Rendering/MapView.cs b/src/TSMapEditor/Rendering/MapView.cs
@@ -1193,49 +1193,51 @@ public void DrawTechnoRangeIndicators(TechnoBase techno)
             double range = techno.GetWeaponRange();
             if (range > 0.0)
             {
-                DrawRangeIndicator(techno.Position, range, techno.Owner.XNAColor);
+                DrawRangeIndicator(techno, range, techno.Owner.XNAColor);
             }
 
             range = techno.GetGuardRange();
             if (range > 0.0)
             {
-                DrawRangeIndicator(techno.Position, range, techno.Owner.XNAColor * 0.25f);
+                DrawRangeIndicator(techno, range, techno.Owner.XNAColor * 0.25f);
             }
 
             range = techno.GetGapGeneratorRange();
             if (range > 0.0)
             {
-                DrawRangeIndicator(techno.Position, range, Color.Black * 0.75f);
+                DrawRangeIndicator(techno, range, Color.Black * 0.75f);
             }
 
             range = techno.GetCloakGeneratorRange();
             if (range > 0.0)
             {
-                DrawRangeIndicator(techno.Position, range, techno.GetRadialColor());
+                DrawRangeIndicator(techno, range, techno.GetRadialColor());
             }
 
             range = techno.GetSensorArrayRange();
             if (range > 0.0)
             {
-                DrawRangeIndicator(techno.Position, range, techno.GetRadialColor());
+                DrawRangeIndicator(techno, range, techno.GetRadialColor());
             }
         }
 
-        private void DrawRangeIndicator(Point2D cellCoords, double range, Color color)
+        private void DrawRangeIndicator(TechnoBase techno, double range, Color color)
         {
             Point2D center = EditorState.Is2DMode ? 
-                CellMath.CellCenterPointFromCellCoords(cellCoords, Map) : 
-                CellMath.CellCenterPointFromCellCoords_3D(cellCoords, Map);
+                CellMath.CellCenterPointFromCellCoords(techno.Position, Map) : 
+                CellMath.CellCenterPointFromCellCoords_3D(techno.Position, Map);
+
+            int bridgeHeightOffset = techno.IsOnBridge() ? (Constants.CellHeight * Constants.HighBridgeHeight) : 0;
 
             // Range is specified in "tile edge lengths",
             // so we need a bit of trigonometry
             double horizontalPixelRange = Constants.CellSizeX / Math.Sqrt(2.0);
             double verticalPixelRange = Constants.CellSizeY / Math.Sqrt(2.0);
 
             int startX = center.X - (int)(range * horizontalPixelRange);
-            int startY = center.Y - (int)(range * verticalPixelRange);
+            int startY = center.Y - bridgeHeightOffset - (int)(range * verticalPixelRange);
             int endX = center.X + (int)(range * horizontalPixelRange);
-            int endY = center.Y + (int)(range * verticalPixelRange);
+            int endY = center.Y - bridgeHeightOffset + (int)(range * verticalPixelRange);
 
             // startX = Camera.ScaleIntWithZoom(startX - Camera.TopLeftPoint.X);
             // startY = Camera.ScaleIntWithZoom(startY - Camera.TopLeftPoint.Y);
@@ -1283,15 +1285,23 @@ public void DrawOnTileUnderCursor(MapTile tileUnderCursor, CursorAction cursorAc
                 
                 if (startCell != null)
                 {
-                    startDrawPoint -= new Point2D(0, startCell.Level * Constants.CellHeight);
+                    if (!EditorState.Is2DMode)
+                        startDrawPoint -= new Point2D(0, startCell.Level * Constants.CellHeight);
+
+                    if (draggedOrRotatedObject.IsOnBridge())
+                        startDrawPoint -= new Point2D(0, Constants.HighBridgeHeight * Constants.CellHeight);
 
                     if (draggedOrRotatedObject.WhatAmI() == RTTIType.Infantry)
                         startDrawPoint += CellMath.GetSubCellOffset(((Infantry)draggedOrRotatedObject).SubCell) - new Point2D(0, Constants.CellHeight / 2);
                 }
 
                 Point2D endDrawPoint = CellMath.CellTopLeftPointFromCellCoords(tileUnderCursor.CoordsToPoint(), Map) + cameraAndCellCenterOffset;
 
-                endDrawPoint -= new Point2D(0, tileUnderCursor.Level * Constants.CellHeight);
+                if (!EditorState.Is2DMode)
+                    endDrawPoint -= new Point2D(0, tileUnderCursor.Level * Constants.CellHeight);
+
+                if (draggedOrRotatedObject.IsOnBridge())
+                    endDrawPoint -= new Point2D(0, Constants.HighBridgeHeight * Constants.CellHeight);
 
                 startDrawPoint = startDrawPoint.ScaleBy(Camera.ZoomLevel);
                 endDrawPoint = endDrawPoint.ScaleBy(Camera.ZoomLevel);
@@ -1313,15 +1323,23 @@ public void DrawOnTileUnderCursor(MapTile tileUnderCursor, CursorAction cursorAc
                 
                 if (startCell != null)
                 {
-                    startDrawPoint -= new Point2D(0, Map.GetTile(draggedOrRotatedObject.Position).Level * Constants.CellHeight);
+                    if (!EditorState.Is2DMode)
+                        startDrawPoint -= new Point2D(0, Map.GetTile(draggedOrRotatedObject.Position).Level * Constants.CellHeight);
+
+                    if (draggedOrRotatedObject.IsOnBridge())
+                        startDrawPoint -= new Point2D(0, Constants.HighBridgeHeight * Constants.CellHeight);
 
                     if (draggedOrRotatedObject.WhatAmI() == RTTIType.Infantry)
                         startDrawPoint += CellMath.GetSubCellOffset(((Infantry)draggedOrRotatedObject).SubCell) - new Point2D(0, Constants.CellHeight / 2);
                 }
 
                 Point2D endDrawPoint = CellMath.CellTopLeftPointFromCellCoords(tileUnderCursor.CoordsToPoint(), Map) + cameraAndCellCenterOffset;
 
-                endDrawPoint -= new Point2D(0, tileUnderCursor.Level * Constants.CellHeight);
+                if (!EditorState.Is2DMode)
+                    endDrawPoint -= new Point2D(0, tileUnderCursor.Level * Constants.CellHeight);
+
+                if (draggedOrRotatedObject.IsOnBridge())
+                    endDrawPoint -= new Point2D(0, Constants.HighBridgeHeight * Constants.CellHeight);
 
                 startDrawPoint = startDrawPoint.ScaleBy(Camera.ZoomLevel);
                 endDrawPoint = endDrawPoint.ScaleBy(Camera.ZoomLevel);
@@ -1361,7 +1379,16 @@ private void DrawTileCursor(MapTile tileUnderCursor)
             Color lineColor = new Color(96, 168, 96, 128);
             Point2D cellTopLeftPoint = CellMath.CellTopLeftPointFromCellCoords(new Point2D(tileUnderCursor.X, tileUnderCursor.Y), Map) - Camera.TopLeftPoint;
 
-            int height = EditorState.Is2DMode ? 0 : tileUnderCursor.Level * Constants.CellHeight;
+            int height = 0;
+
+            if (!EditorState.Is2DMode)
+            {
+                height = tileUnderCursor.Level * Constants.CellHeight;
+
+                var techno = tileUnderCursor.GetTechno();
+                if (techno != null && techno.IsOnBridge())
+                    height += Constants.HighBridgeHeight * Constants.CellHeight;
+            }
 
             cellTopLeftPoint = new Point2D((int)(cellTopLeftPoint.X * Camera.ZoomLevel), (int)((cellTopLeftPoint.Y - height) * Camera.ZoomLevel));
 
diff --git a/src/TSMapEditor/Rendering/ObjectRenderers/InfantryRenderer.cs b/src/TSMapEditor/Rendering/ObjectRenderers/InfantryRenderer.cs
@@ -41,7 +41,6 @@ public override Point2D GetDrawPoint(Infantry gameObject)
         {
             Point2D drawPoint = base.GetDrawPoint(gameObject);
             Point2D subCellOffset = CellMath.GetSubCellOffset(gameObject.SubCell);
-
             return drawPoint + subCellOffset;
         }
 
diff --git a/src/TSMapEditor/Rendering/ObjectRenderers/ObjectRenderer.cs b/src/TSMapEditor/Rendering/ObjectRenderers/ObjectRenderer.cs
@@ -90,7 +90,16 @@ public virtual Point2D GetDrawPoint(T gameObject)
             Point2D drawPointWithoutCellHeight = CellMath.CellTopLeftPointFromCellCoords(gameObject.Position, Map);
 
             var mapCell = Map.GetTile(gameObject.Position);
-            int heightOffset = RenderDependencies.EditorState.Is2DMode ? 0 : mapCell.Level * Constants.CellHeight;
+            int heightOffset = 0;
+
+            if (!RenderDependencies.EditorState.Is2DMode)
+            {
+                heightOffset = mapCell.Level * Constants.CellHeight;
+
+                if (gameObject.IsOnBridge())
+                    heightOffset += Constants.CellHeight * Constants.HighBridgeHeight;
+            }
+
             Point2D drawPoint = new Point2D(drawPointWithoutCellHeight.X, drawPointWithoutCellHeight.Y - heightOffset);
 
             return drawPoint;
diff --git a/src/TSMapEditor/Rendering/ObjectRenderers/OverlayRenderer.cs b/src/TSMapEditor/Rendering/ObjectRenderers/OverlayRenderer.cs
@@ -44,8 +44,7 @@ protected override double GetExtraLight(Overlay gameObject)
                         throw new InvalidOperationException($"{nameof(OverlayRenderer)}.{nameof(GetExtraLight)}: Unknown lighting preview state");
                 }
 
-                const int highBridgeHeight = 4;
-                return level * highBridgeHeight;
+                return level * Constants.HighBridgeHeight;
             }
 
             return 0.0;
@@ -88,10 +87,8 @@ protected override float GetDepthAddition(Overlay gameObject)
                 return Constants.DepthEpsilon * ObjectDepthAdjustments.Overlay;
             }
 
-            const int bridgeHeight = 4;
-
             var tile = Map.GetTile(gameObject.Position);
-            return (Constants.DepthEpsilon * ObjectDepthAdjustments.Overlay) + ((tile.Level + bridgeHeight) * Constants.CellHeight / (float)Map.HeightInPixelsWithCellHeight);
+            return (Constants.DepthEpsilon * ObjectDepthAdjustments.Overlay) + ((tile.Level + Constants.HighBridgeHeight) * Constants.CellHeight / (float)Map.HeightInPixelsWithCellHeight);
         }
 
         protected override float GetShadowDepthFromPosition(Overlay gameObject, Rectangle drawingBounds)
diff --git a/src/TSMapEditor/UI/CursorAction.cs b/src/TSMapEditor/UI/CursorAction.cs
@@ -64,6 +64,8 @@ public void OnExit()
 
         public virtual bool OnlyUniqueCellEvents => true;
 
+        public virtual bool UseOnBridge => false;
+
         public abstract string GetName();
 
         protected Map Map => CursorActionTarget.Map;
diff --git a/src/TSMapEditor/UI/CursorActions/DeletionModeCursorAction.cs b/src/TSMapEditor/UI/CursorActions/DeletionModeCursorAction.cs
@@ -20,6 +20,8 @@ public DeletionModeCursorAction(ICursorActionTarget cursorActionTarget) : base(c
 
         public override bool DrawCellCursor => false;
 
+        public override bool UseOnBridge => true;
+
         public override void OnActionEnter()
         {
             CursorActionTarget.BrushSize = Map.EditorConfig.BrushSizes.Find(bs => bs.Width == 1 && bs.Height == 1);
diff --git a/src/TSMapEditor/UI/MapUI.cs b/src/TSMapEditor/UI/MapUI.cs
@@ -552,6 +552,36 @@ public override void OnRightClick()
             base.OnRightClick();
         }
 
+        private MapTile CalculateBestTileUnderCursor()
+        {
+            Point2D cursorMapPoint = GetCursorMapPoint();
+            Point2D tileCoords = EditorState.Is2DMode ?
+                CellMath.CellCoordsFromPixelCoords_2D(cursorMapPoint, Map) :
+                CellMath.CellCoordsFromPixelCoords(cursorMapPoint, Map, CursorAction == null || CursorAction.SeeThrough);
+
+            var tile = Map.GetTile(tileCoords.X, tileCoords.Y);
+
+            if (tile != null && (CursorAction == null || CursorAction.UseOnBridge) && !Constants.IsFlatWorld && !EditorState.Is2DMode)
+            {
+                if (tile.GetTechno() == null)
+                {
+                    // If the tile has no Technos, check whether there'd be high infantry or vehicles two cells below.
+                    // If yes, the user might be pointing at a bridge that contains draw-offset units.
+
+                    var otherTile = Map.GetTile(tileCoords.X + 2, tileCoords.Y + 2);
+
+                    if (otherTile != null)
+                    {
+                        var techno = otherTile.GetTechno();
+                        if (techno != null && techno.IsOnBridge())
+                            return otherTile;
+                    }
+                }
+            }
+
+            return tile;
+        }
+
         public override void Update(GameTime gameTime)
         {
             // Make scroll rate independent of FPS
@@ -583,12 +613,7 @@ public override void Update(GameTime gameTime)
 
             windowController.MinimapWindow.CameraRectangle = new Rectangle(Camera.TopLeftPoint.ToXNAPoint(), new Point2D(Width, Height).ScaleBy(1.0 / Camera.ZoomLevel).ToXNAPoint());
 
-            Point2D cursorMapPoint = GetCursorMapPoint();
-            Point2D tileCoords = EditorState.Is2DMode ?
-                CellMath.CellCoordsFromPixelCoords_2D(cursorMapPoint, Map) :
-                CellMath.CellCoordsFromPixelCoords(cursorMapPoint, Map, CursorAction == null || CursorAction.SeeThrough);
-
-            var tile = Map.GetTile(tileCoords.X, tileCoords.Y);
+            var tile = CalculateBestTileUnderCursor();
 
             tileUnderCursor = tile;
             TileInfoDisplay.MapTile = tile;

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public CellTag(Point2D position, Tag tag)`
`17`	`17`	`Tag = tag;`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ public bool IsOnBridge() => false;`
	`21`	`+`
`20`	`22`	`public Point2D Position { get; set; }`
`21`	`23`	`public Tag Tag { get; set; }`
`22`	`24`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@ public Foot(T objectType) : base(objectType) { }`
`26`	`26`	`/// Is this unit available for recruitment for TeamTypes that have Autocreate=yes?`
`27`	`27`	`/// </summary>`
`28`	`28`	`public bool AutocreateYesRecruitable { get; set; }`
	`29`	`+`
	`30`	`+ public override bool IsOnBridge() => High;`
`29`	`31`	`}`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ public override int GetHashCode()`
`53`	`53`
`54`	`54`	`public virtual bool HasShadow() => false;`
`55`	`55`
	`56`	`+ public virtual bool IsOnBridge() => false;`
	`57`	`+`
`56`	`58`	`public virtual Color GetRemapColor() => Color.White;`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public BaseNode(string structureTypeName, Point2D location)`
`21`	`21`	`public string StructureTypeName { get; set; }`
`22`	`22`	`public Point2D Position { get; set; }`
`23`	`23`
	`24`	`+ public bool IsOnBridge() => false;`
	`25`	`+`
`24`	`26`	`public static BaseNode FromIniString(string iniString)`
`25`	`27`	`{`
`26`	`28`	`if (string.IsNullOrWhiteSpace(iniString))`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ namespace TSMapEditor.Models`
`5`	`5`	`public interface IPositioned`
`6`	`6`	`{`
`7`	`7`	`Point2D Position { get; set; }`
	`8`	`+`
	`9`	`+ bool IsOnBridge();`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ public string EditorColor`
`59`	`59`
`60`	`60`	`public Color XNAColor;`
`61`	`61`
	`62`	`+ public bool IsOnBridge() => false;`
	`63`	`+`
`62`	`64`	`public static Waypoint ParseWaypoint(string id, string coordsString)`
`63`	`65`	`{`
`64`	`66`	`int waypointIndex = Conversions.IntFromString(id, -1);`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public override Point2D GetDrawPoint(Infantry gameObject)`
`41`	`41`	`{`
`42`	`42`	`Point2D drawPoint = base.GetDrawPoint(gameObject);`
`43`	`43`	`Point2D subCellOffset = CellMath.GetSubCellOffset(gameObject.SubCell);`
`44`		`-`
`45`	`44`	`return drawPoint + subCellOffset;`
`46`	`45`	`}`
`47`	`46`