Merge pull request #28896 from Ranoller/master

Fix tilemap displaced textures and shapes

1 files changed, 8 insertions, 45 deletions

diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp
index 29a54f815d..772e47ac3a 100644
--- a/editor/plugins/tile_map_editor_plugin.cpp
+++ b/editor/plugins/tile_map_editor_plugin.cpp
@@ -760,7 +760,7 @@ void TileMapEditor::_draw_cell(Control *p_viewport, int p_cell, const Point2i &p
 		r.position += (r.size + Vector2(spacing, spacing)) * offset;
 	}
 	Size2 sc = p_xform.get_scale();
-
+	Size2 cell_size = node->get_cell_size();
 	Rect2 rect = Rect2();
 	rect.position = node->map_to_world(p_point) + node->get_cell_draw_offset();
 
@@ -770,62 +770,25 @@ void TileMapEditor::_draw_cell(Control *p_viewport, int p_cell, const Point2i &p
 		rect.size = r.size;
 	}
 
-	if (rect.size.y > rect.size.x) {
-		if ((p_flip_h && (p_flip_v || p_transpose)) || (p_flip_v && !p_transpose))
-			tile_ofs.y += rect.size.y - rect.size.x;
-	} else if (rect.size.y < rect.size.x) {
-		if ((p_flip_v && (p_flip_h || p_transpose)) || (p_flip_h && !p_transpose))
-			tile_ofs.x += rect.size.x - rect.size.y;
-	}
-
 	if (p_transpose) {
 		SWAP(tile_ofs.x, tile_ofs.y);
+		rect.position.x += cell_size.x / 2 - rect.size.y / 2;
+		rect.position.y += cell_size.y / 2 - rect.size.x / 2;
+	} else {
+		rect.position += cell_size / 2 - rect.size / 2;
 	}
+
 	if (p_flip_h) {
 		sc.x *= -1.0;
 		tile_ofs.x *= -1.0;
 	}
+
 	if (p_flip_v) {
 		sc.y *= -1.0;
 		tile_ofs.y *= -1.0;
 	}
 
-	if (node->get_tile_origin() == TileMap::TILE_ORIGIN_TOP_LEFT) {
-
-		rect.position += tile_ofs;
-	} else if (node->get_tile_origin() == TileMap::TILE_ORIGIN_BOTTOM_LEFT) {
-		Size2 cell_size = node->get_cell_size();
-
-		rect.position += tile_ofs;
-
-		if (p_transpose) {
-			if (p_flip_h)
-				rect.position.x -= cell_size.x;
-			else
-				rect.position.x += cell_size.x;
-		} else {
-			if (p_flip_v)
-				rect.position.y -= cell_size.y;
-			else
-				rect.position.y += cell_size.y;
-		}
-
-	} else if (node->get_tile_origin() == TileMap::TILE_ORIGIN_CENTER) {
-		Size2 cell_size = node->get_cell_size();
-
-		rect.position += tile_ofs;
-
-		if (p_flip_h)
-			rect.position.x -= cell_size.x / 2;
-		else
-			rect.position.x += cell_size.x / 2;
-
-		if (p_flip_v)
-			rect.position.y -= cell_size.y / 2;
-		else
-			rect.position.y += cell_size.y / 2;
-	}
-
+	rect.position += tile_ofs;
 	rect.position = p_xform.xform(rect.position);
 	rect.size *= sc;