Rework connected tiles for better results and better performance

Author: Rampastring

src/TSMapEditor/Config/Translations/en/Translation_en.ini

@@ -1396,11 +1396,11 @@ DeleteTubeCursorAction.Text=Delete Tube
 DeletionModeCursorAction.Name=Delete Object
 DeletionModeCursorAction.Text=Delete
 
-DrawCliffCursorAction.Name=Draw Connected Tiles
-DrawCliffCursorAction.MainText=Click on a cell to place a new vertex.\r\n\r\nENTER to confirm\r\nBackspace to go back one step\r\n
-DrawCliffCursorAction.TabText=TAB to toggle between front and back sides\r\n
-DrawCliffCursorAction.PageUpDownText=PageUp to raise the tiles, PageDown to lower them\r\n
-DrawCliffCursorAction.ExitText=Right-click or ESC to exit
+DrawConnectedTilesCursorAction.Name=Draw Connected Tiles
+DrawConnectedTilesCursorAction.MainText.V2=Click on a cell to place a new vertex.\r\n\r\nENTER to confirm\r\nBackspace to go back one step\r\n\r\nR to re-generate the pattern
+DrawConnectedTilesCursorAction.TabText=TAB to toggle between front and back sides\r\n
+DrawConnectedTilesCursorAction.PageUpDownText=PageUp to raise the tiles, PageDown to lower them\r\n
+DrawConnectedTilesCursorAction.ExitText=Right-click or ESC to exit
 
 GenerateTerrainCursorAction.Name=Generate Terrain
 

src/TSMapEditor/Config/Translations/zh-Hans/Translation_zh-Hans.ini

@@ -1376,11 +1376,11 @@ DeleteTubeCursorAction.Text=删除隧道
 DeletionModeCursorAction.Name=删除对象
 DeletionModeCursorAction.Text=删除
 
-DrawCliffCursorAction.Name=绘制连续地形
-DrawCliffCursorAction.MainText=点击地图格放置一个顶点。@ENTER 确认@Backspace 回退一步@
-DrawCliffCursorAction.TabText=TAB 切换前后方向@
-DrawCliffCursorAction.PageUpDownText=PageUp 升高地块, PageDown 降低地块@
-DrawCliffCursorAction.ExitText=右键或 ESC 退出
+DrawConnectedTilesCursorAction.Name=绘制连续地形
+DrawConnectedTilesCursorAction.MainText=点击地图格放置一个顶点。@ENTER 确认@Backspace 回退一步@
+DrawConnectedTilesCursorAction.TabText=TAB 切换前后方向@
+DrawConnectedTilesCursorAction.PageUpDownText=PageUp 升高地块, PageDown 降低地块@
+DrawConnectedTilesCursorAction.ExitText=右键或 ESC 退出
 
 GenerateTerrainCursorAction.Name=生成地形
 

src/TSMapEditor/GameMath/Point2D.cs

@@ -128,6 +128,20 @@ public int DistanceTo(Point2D other)
             return Math.Max(Math.Abs(X - other.X), Math.Abs(Y - other.Y));
         }
 
+        public bool IsInStraightLineWith(Point2D other)
+        {
+            if (X == other.X)
+                return true;
+
+            if (Y == other.Y)
+                return true;
+
+            if (Math.Abs(other.X - X) == Math.Abs(other.Y - Y))
+                return true;
+
+            return false;
+        }
+
         public Point2D ScaleBy(double scale) => new Point2D((int)(X * scale), (int)(Y * scale));
 
         public Point2D ScaleBy(float scale) => new Point2D((int)(X * scale), (int)(Y * scale));

src/TSMapEditor/Models/CliffType.cs …/TSMapEditor/Models/ConnectedTileType.cssrc/TSMapEditor/Models/CliffType.cs renamed to src/TSMapEditor/Models/ConnectedTileType.cs src/TSMapEditor/Models/CliffType.cs renamed to src/TSMapEditor/Models/ConnectedTileType.cs

@@ -9,13 +9,13 @@
 
 namespace TSMapEditor.Models
 {
-    public enum CliffSide
+    public enum ConnectedTileSide
     {
         Front,
         Back
     }
 
-    public readonly struct CliffConnectionPoint
+    public readonly struct TileConnectionPoint
     {
         /// <summary>
         /// Index of the connection point, 0 or 1
@@ -51,24 +51,28 @@ public readonly struct CliffConnectionPoint
         /// <summary>
         /// Whether the connection point faces "backwards" or "forwards"
         /// </summary>
-        public CliffSide Side { get; init; }
+        public ConnectedTileSide Side { get; init; }
     }
 
-    public class CliffAStarNode
+    public class ConnectedTileAStarNode
     {
-        private CliffAStarNode() {}
+        private ConnectedTileAStarNode() {}
 
-        public CliffAStarNode(CliffAStarNode parent, CliffConnectionPoint exit, Point2D location, CliffTile tile)
+        public ConnectedTileAStarNode(ConnectedTileAStarNode parent, TileConnectionPoint exit, Point2D location, ConnectedTile tile)
         {
             Location = location;
             Tile = tile;
 
             Parent = parent;
             Exit = exit;
             Destination = Parent.Destination;
+            GScore = Parent.GScore + Vector2.Distance(Parent.ExitCoords.ToXNAVector(), ExitCoords.ToXNAVector());
 
             OccupiedCells = new HashSet<Point2D>(parent.OccupiedCells);
-            OccupiedCells.UnionWith(tile.Foundation.Select(coordinate => coordinate + Location));
+            foreach (var foundationCell in tile.Foundation)
+            {
+                OccupiedCells.Add(foundationCell + Location);
+            }
         }
 
         /// <summary>
@@ -84,7 +88,7 @@ public CliffAStarNode(CliffAStarNode parent, CliffConnectionPoint exit, Point2D
         /// <summary>
         /// Tile data
         /// </summary>
-        public CliffTile Tile;
+        public ConnectedTile Tile;
 
         ///// A* Stuff
 
@@ -96,12 +100,12 @@ public CliffAStarNode(CliffAStarNode parent, CliffConnectionPoint exit, Point2D
         /// <summary>
         /// Where this node connects to the next node
         /// </summary>
-        public CliffConnectionPoint Exit;
+        public TileConnectionPoint Exit;
 
         /// <summary>
         /// Distance from starting node
         /// </summary>
-        public float GScore => Parent == null ? 0 : Parent.GScore + Vector2.Distance(Parent.ExitCoords.ToXNAVector(), ExitCoords.ToXNAVector());
+        public float GScore { get; private set; }
 
         /// <summary>
         /// Distance to end node
@@ -112,16 +116,16 @@ public CliffAStarNode(CliffAStarNode parent, CliffConnectionPoint exit, Point2D
         /// <summary>
         /// Previous node
         /// </summary>
-        public CliffAStarNode Parent;
+        public ConnectedTileAStarNode Parent;
 
         /// <summary>
         /// Accumulated set of all cell coordinates occupied up to this node
         /// </summary>
         public HashSet<Point2D> OccupiedCells = new HashSet<Point2D>();
 
-        public static CliffAStarNode MakeStartNode(Point2D location, Point2D destination, CliffSide startingSide)
+        public static ConnectedTileAStarNode MakeStartNode(Point2D location, Point2D destination, ConnectedTileSide startingSide)
         {
-            CliffConnectionPoint connectionPoint = new CliffConnectionPoint
+            TileConnectionPoint connectionPoint = new TileConnectionPoint
             {
                 Index = 0,
                 ConnectionMask = 0b11111111,
@@ -131,24 +135,25 @@ public static CliffAStarNode MakeStartNode(Point2D location, Point2D destination
                 ForbiddenTiles = Array.Empty<int>()
             };
 
-            var startNode = new CliffAStarNode()
+            var startNode = new ConnectedTileAStarNode()
             {
                 Location = location,
                 Tile = null,
 
                 Parent = null,
                 Exit = connectionPoint,
-                Destination = destination
+                Destination = destination,
+                GScore = 0
             };
 
             return startNode;
         }
 
-        public List<CliffAStarNode> GetNextNodes(CliffTile tile)
+        public List<ConnectedTileAStarNode> GetNextNodes(ConnectedTile tile)
         {
-            List<(CliffConnectionPoint, List<Direction>)> possibleNeighbors = new();
+            var neighbors = new List<ConnectedTileAStarNode>();
 
-            foreach (CliffConnectionPoint cp in tile.ConnectionPoints)
+            foreach (TileConnectionPoint cp in tile.ConnectionPoints)
             {
                 if (Tile != null)
                 {
@@ -161,36 +166,38 @@ public List<CliffAStarNode> GetNextNodes(CliffTile tile)
                 if (possibleDirections.Count == 0)
                     continue;
 
-                possibleNeighbors.Add((cp, possibleDirections));
-            }
-
-            var neighbors = new List<CliffAStarNode>();
-            
-            foreach (var (connectionPoint, directions) in possibleNeighbors)
-            {
-                if (connectionPoint.Side != Exit.Side)
+                if (cp.Side != Exit.Side)
                     continue;
 
-                foreach (Direction dir in directions)
+                foreach (Direction dir in possibleDirections)
                 {
-                    Point2D placementOffset = Helpers.VisualDirectionToPoint(dir) - connectionPoint.CoordinateOffset;
+                    Point2D placementOffset = Helpers.VisualDirectionToPoint(dir) - cp.CoordinateOffset;
                     Point2D placementCoords = ExitCoords + placementOffset;
 
-                    var exit = tile.GetExit(connectionPoint.Index);
-                    var newNode = new CliffAStarNode(this, exit, placementCoords, tile);
+                    bool overlaps = false;
+                    foreach (var foundationCell in tile.Foundation)
+                    {
+                        if (OccupiedCells.Contains(foundationCell + placementCoords))
+                        {
+                            overlaps = true;
+                            break;
+                        }
+                    }
+
+                    if (overlaps)
+                        continue;
 
-                    // Make sure that the new node doesn't overlap anything
-                    if (newNode.OccupiedCells.Count - OccupiedCells.Count == newNode.Tile.Foundation.Count)
-                        neighbors.Add(newNode);
+                    var exit = tile.GetExit(cp.Index);
+                    neighbors.Add(new ConnectedTileAStarNode(this, exit, placementCoords, tile));
                 }
             }
 
             return neighbors;
         }
 
-        public List<CliffAStarNode> GetNextNodes(List<CliffTile> tiles, bool allowTurn)
+        public List<ConnectedTileAStarNode> GetNextNodes(List<ConnectedTile> tiles, bool allowTurn)
         {
-            List <CliffAStarNode > nextNodes = new List<CliffAStarNode>();
+            List <ConnectedTileAStarNode > nextNodes = new List<ConnectedTileAStarNode>();
             foreach (var tile in tiles)
             {
                 if (!allowTurn && tile.ConnectionPoints[0].Side != tile.ConnectionPoints[1].Side)
@@ -203,9 +210,9 @@ public List<CliffAStarNode> GetNextNodes(List<CliffTile> tiles, bool allowTurn)
         }
     }
 
-    public class CliffTile
+    public class ConnectedTile
     {
-        public CliffTile(IniSection iniSection, int index)
+        public ConnectedTile(IniSection iniSection, int index)
         {
             Index = index;
 
@@ -222,7 +229,7 @@ public CliffTile(IniSection iniSection, int index)
 
             IndicesInTileSet = indicesString.Split(',').Select(s => int.Parse(s, CultureInfo.InvariantCulture)).ToList();
 
-            ConnectionPoints = new CliffConnectionPoint[2];
+            ConnectionPoints = new TileConnectionPoint[2];
 
             for (int i = 0; i < ConnectionPoints.Length; i++)
             {
@@ -257,11 +264,11 @@ public CliffTile(IniSection iniSection, int index)
                 }
 
                 string sideString = iniSection.GetStringValue($"ConnectionPoint{i}.Side", string.Empty);
-                CliffSide side = sideString.ToLower() switch
+                ConnectedTileSide side = sideString.ToLower() switch
                 {
-                    "front" => CliffSide.Front,
-                    "back" => CliffSide.Back,
-                    "" => CliffSide.Front,
+                    "front" => ConnectedTileSide.Front,
+                    "back" => ConnectedTileSide.Back,
+                    "" => ConnectedTileSide.Front,
                     _ => throw new INIConfigException($"Connected Tile {iniSection.SectionName} has an invalid ConnectionPoint{i}.Side value: {sideString}!")
                 };
 
@@ -284,7 +291,7 @@ public CliffTile(IniSection iniSection, int index)
                     requiredTiles = Array.Empty<int>();
                 }
 
-                ConnectionPoints[i] = new CliffConnectionPoint
+                ConnectionPoints[i] = new TileConnectionPoint
                 {
                     Index = i,
                     ConnectionMask = directions,
@@ -326,7 +333,7 @@ public CliffTile(IniSection iniSection, int index)
         /// <summary>
         /// Places this tile connects to other tiles
         /// </summary>
-        public CliffConnectionPoint[] ConnectionPoints { get; set; }
+        public TileConnectionPoint[] ConnectionPoints { get; set; }
 
         /// <summary>
         /// Set of all relative cell coordinates this tile occupies
@@ -343,18 +350,18 @@ public CliffTile(IniSection iniSection, int index)
         /// </summary>
         public int DistanceModifier { get; set; }
 
-        public CliffConnectionPoint GetExit(int entryIndex)
+        public TileConnectionPoint GetExit(int entryIndex)
         {
             return ConnectionPoints[0].Index == entryIndex ? ConnectionPoints[1] : ConnectionPoints[0];
         }
 
-        private bool IsStraight(CliffConnectionPoint[] connectionPoints)
+        private bool IsStraight(TileConnectionPoint[] connectionPoints)
         {
             int mask = connectionPoints[0].ConnectionMask & connectionPoints[1].ReversedConnectionMask;
             return mask > 0;
         }
 
-        private bool IsDiagonal(CliffConnectionPoint[] connectionPoints)
+        private bool IsDiagonal(TileConnectionPoint[] connectionPoints)
         {
             var directions = Helpers.GetDirectionsInMask((byte)(connectionPoints[0].ConnectionMask &
                                                                 connectionPoints[1].ReversedConnectionMask));
@@ -406,9 +413,9 @@ private static byte DirectionFromString(string str)
         }
     }
 
-    public class CliffType
+    public class ConnectedTileType
     {
-        public static CliffType FromIniSection(IniFile iniFile, string sectionName)
+        public static ConnectedTileType FromIniSection(IniFile iniFile, string sectionName)
         {
             IniSection cliffSection = iniFile.GetSection(sectionName);
             if (cliffSection == null)
@@ -427,18 +434,18 @@ public static CliffType FromIniSection(IniFile iniFile, string sectionName)
             if (cliffSection.KeyExists("Color"))
                 color = cliffSection.GetColorValue("Color", Microsoft.Xna.Framework.Color.White);
 
-            return new CliffType(iniFile, sectionName, cliffName, frontOnly, allowedTheaters, color);
+            return new ConnectedTileType(iniFile, sectionName, cliffName, frontOnly, allowedTheaters, color);
         }
 
-        private CliffType(IniFile iniFile, string iniName, string name, bool frontOnly, List<string> allowedTheaters, Color? color)
+        private ConnectedTileType(IniFile iniFile, string iniName, string name, bool frontOnly, List<string> allowedTheaters, Color? color)
         {
             IniName = iniName;
             Name = Translate(this, iniName, name);
             AllowedTheaters = allowedTheaters;
             FrontOnly = frontOnly;
             Color = color;
 
-            Tiles = new List<CliffTile>();
+            Tiles = new List<ConnectedTile>();
 
             foreach (var sectionName in iniFile.GetSections())
             {
@@ -452,7 +459,7 @@ private CliffType(IniFile iniFile, string iniName, string name, bool frontOnly,
                         $"Connected Tile {iniName} has multiple tiles with the same index {index}!");
                 }
 
-                Tiles.Add(new CliffTile(iniFile.GetSection(sectionName), index));
+                Tiles.Add(new ConnectedTile(iniFile.GetSection(sectionName), index));
             }
         }
 
@@ -462,6 +469,6 @@ private CliffType(IniFile iniFile, string iniName, string name, bool frontOnly,
         public bool IsLegal { get; set; } = true;
         public Color? Color { get; set; }
         public List<string> AllowedTheaters { get; set; }
-        public List<CliffTile> Tiles { get; }
+        public List<ConnectedTile> Tiles { get; }
     }
 }

src/TSMapEditor/Models/EditorConfig.cs

@@ -30,7 +30,7 @@ public EditorConfig()
         public List<Theater> Theaters { get; } = new List<Theater>();
         public List<BridgeType> Bridges { get; } = new List<BridgeType>();
         public List<ConnectedOverlayType> ConnectedOverlays { get; } = new List<ConnectedOverlayType>();
-        public List<CliffType> Cliffs { get; } = new List<CliffType>();
+        public List<ConnectedTileType> Cliffs { get; } = new List<ConnectedTileType>();
         public List<TeamTypeFlag> TeamTypeFlags { get; } = new List<TeamTypeFlag>();
         public EvaSpeeches Speeches { get; private set; }
 
@@ -449,7 +449,7 @@ private void ReadCliffs()
             {
                 string cliffIniName = kvp.Value;
 
-                CliffType cliffType = CliffType.FromIniSection(iniFile, cliffIniName);
+                ConnectedTileType cliffType = ConnectedTileType.FromIniSection(iniFile, cliffIniName);
                 if (cliffType != null)
                     Cliffs.Add(cliffType);
             }