godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Fix rotated/flipped tiles rendering origin

Browse Source
This commit is contained in:
Gilles Roudière
2025-04-28 13:34:39 +02:00
parent 1b4ed4c038
commit 52aee9c325
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/plugins/tiles/tile_map_layer_editor.cpp
View File

@@ -988,19 +988,24 @@ void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p
bool transpose = tile_data->get_transpose() ^ bool(E.value.alternative_tile & TileSetAtlasSource::TRANSFORM_TRANSPOSE);
if (transpose) {
dest_rect.position = (tile_set->map_to_local(E.key) - Vector2(dest_rect.size.y, dest_rect.size.x) / 2 - tile_offset);
dest_rect.position = (tile_set->map_to_local(E.key) - Vector2(dest_rect.size.y, dest_rect.size.x) / 2);
SWAP(tile_offset.x, tile_offset.y);
} else {
dest_rect.position = (tile_set->map_to_local(E.key) - dest_rect.size / 2 - tile_offset);
dest_rect.position = (tile_set->map_to_local(E.key) - dest_rect.size / 2);
}
if (tile_data->get_flip_h() ^ bool(E.value.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_H)) {
dest_rect.size.x = -dest_rect.size.x;
tile_offset.x = -tile_offset.x;
}
if (tile_data->get_flip_v() ^ bool(E.value.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_V)) {
dest_rect.size.y = -dest_rect.size.y;
tile_offset.y = -tile_offset.y;
}
dest_rect.position -= tile_offset;
// Get the tile modulation.
Color modulate = tile_data->get_modulate() * edited_layer->get_modulate_in_tree() * edited_layer->get_self_modulate();

9
scene/2d/tile_map_layer.cpp
View File

@@ -2609,19 +2609,24 @@ void TileMapLayer::draw_tile(RID p_canvas_item, const Vector2 &p_position, const
bool transpose = tile_data->get_transpose() ^ bool(p_alternative_tile & TileSetAtlasSource::TRANSFORM_TRANSPOSE);
if (transpose) {
dest_rect.position = (p_position - Vector2(dest_rect.size.y, dest_rect.size.x) / 2 - tile_offset);
dest_rect.position = (p_position - Vector2(dest_rect.size.y, dest_rect.size.x) / 2);
SWAP(tile_offset.x, tile_offset.y);
} else {
dest_rect.position = (p_position - dest_rect.size / 2 - tile_offset);
dest_rect.position = (p_position - dest_rect.size / 2);
}
if (tile_data->get_flip_h() ^ bool(p_alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_H)) {
dest_rect.size.x = -dest_rect.size.x;
tile_offset.x = -tile_offset.x;
}
if (tile_data->get_flip_v() ^ bool(p_alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_V)) {
dest_rect.size.y = -dest_rect.size.y;
tile_offset.y = -tile_offset.y;
}
dest_rect.position -= tile_offset;
// Draw the tile.
if (p_frame >= 0) {
Rect2i source_rect = atlas_source->get_runtime_tile_texture_region(p_atlas_coords, p_frame);