godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-03 16:55:53 +00:00
Code Releases Wiki Activity

Merge pull request #112790 from kleonc/tile_map_layer_fix_scene_tile_transformations

Browse Source 
Fix `TileMapLayer` transformations for `Node2D` scene tiles
This commit is contained in:
Thaddeus Crews
2025-11-17 19:36:09 -06:00
parent 9e6fefd96e 944bd82d45
commit e3350cf4f2
2 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
scene/2d/tile_map_layer.cpp
View File

@@ -1635,10 +1635,7 @@ void TileMapLayer::_scenes_update_cell(CellData &r_cell_data) {
if (scene_as_control) { if (scene_as_control) {
scene_as_control->set_position(tile_set->map_to_local(r_cell_data.coords) + scene_as_control->get_position()); scene_as_control->set_position(tile_set->map_to_local(r_cell_data.coords) + scene_as_control->get_position());
} else if (scene_as_node2d) { } else if (scene_as_node2d) {
Transform2D xform; _set_scene_transform_with_alternative(scene_as_node2d, tile_set->map_to_local(r_cell_data.coords), c.alternative_tile);
xform.set_origin(tile_set->map_to_local(r_cell_data.coords));
scene_as_node2d->set_transform(xform * scene_as_node2d->get_transform());
_set_scene_transformed_alternative(c.alternative_tile, scene_as_node2d);
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
RenderingServer *rs = RenderingServer::get_singleton(); RenderingServer *rs = RenderingServer::get_singleton();
@@ -1706,47 +1703,23 @@ void TileMapLayer::_scenes_draw_cell_debug(const RID &p_canvas_item, const Vecto
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
void TileMapLayer::_set_scene_transformed_alternative(const int p_alternative_id, Node2D *p_scene) { void TileMapLayer::_set_scene_transform_with_alternative(Node2D *p_scene, const Vector2 &p_cell_position, const int p_alternative_id) {
// Determine the transformations based on the alternative ID. // Determine the transformations based on the alternative ID.
bool transform_flip_h = p_alternative_id & TileSetAtlasSource::TRANSFORM_FLIP_H; bool transform_flip_h = p_alternative_id & TileSetAtlasSource::TRANSFORM_FLIP_H;
bool transform_flip_v = p_alternative_id & TileSetAtlasSource::TRANSFORM_FLIP_V; bool transform_flip_v = p_alternative_id & TileSetAtlasSource::TRANSFORM_FLIP_V;
bool transform_transpose = p_alternative_id & TileSetAtlasSource::TRANSFORM_TRANSPOSE; bool transform_transpose = p_alternative_id & TileSetAtlasSource::TRANSFORM_TRANSPOSE;
double scene_rotation = 0.0; int axis_h = transform_transpose ? 1 : 0;
Vector2 scene_scale = p_scene->get_scale(); int axis_v = 1 - axis_h;
// Determine the scene rotation and scale based on the transformation flags. Transform2D xform;
if (!transform_flip_h && !transform_flip_v && !transform_transpose) { xform[axis_h].x = transform_flip_h ? -1.0f : 1.0f;
scene_rotation = 0.0; xform[axis_h].y = 0.0f;
scene_scale.x = 1; xform[axis_v].x = 0.0f;
} else if (transform_flip_h && !transform_flip_v && transform_transpose) { xform[axis_v].y = transform_flip_v ? -1.0f : 1.0f;
scene_rotation = 90.0; xform.set_origin(p_cell_position);
scene_scale.x = 1;
} else if (transform_flip_h && transform_flip_v && !transform_transpose) {
scene_rotation = 180.0;
scene_scale.x = 1;
} else if (!transform_flip_h && transform_flip_v && transform_transpose) {
scene_rotation = 270.0;
scene_scale.x = 1;
} else if (transform_flip_h && !transform_flip_v && !transform_transpose) {
scene_rotation = 0.0;
scene_scale.x = -1;
} else if (transform_flip_h && transform_flip_v && transform_transpose) {
scene_rotation = 90.0;
scene_scale.x = -1;
} else if (!transform_flip_h && transform_flip_v && !transform_transpose) {
scene_rotation = 180.0;
scene_scale.x = -1;
} else if (!transform_flip_h && !transform_flip_v && transform_transpose) {
scene_rotation = 270.0;
scene_scale.x = -1;
}
// Apply the transformations to the scene. p_scene->set_transform(xform * p_scene->get_transform());
double current_rotation = p_scene->get_rotation_degrees() + scene_rotation;
Vector2 current_scale = p_scene->get_scale() + scene_scale;
p_scene->set_rotation_degrees(current_rotation);
p_scene->set_scale(current_scale);
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////

2
scene/2d/tile_map_layer.h
View File

@@ -492,7 +492,7 @@ private:
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
void _scenes_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data); void _scenes_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data);
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
void _set_scene_transformed_alternative(const int p_alternative_id, Node2D *p_scene); void _set_scene_transform_with_alternative(Node2D *p_scene, const Vector2 &p_cell_position, const int p_alternative_id);
// Terrains. // Terrains.
TileSet::TerrainsPattern _get_best_terrain_pattern_for_constraints(int p_terrain_set, const Vector2i &p_position, const RBSet<TerrainConstraint> &p_constraints, TileSet::TerrainsPattern p_current_pattern) const; TileSet::TerrainsPattern _get_best_terrain_pattern_for_constraints(int p_terrain_set, const Vector2i &p_position, const RBSet<TerrainConstraint> &p_constraints, TileSet::TerrainsPattern p_current_pattern) const;