godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90207 from groud/fix_no_cached_rect 

Fix "no cached rect" errors in TileMapLayer editor
This commit is contained in:
Rémi Verschelde 2024-04-04 17:09:26 +02:00
parent 4d7c87b7be c928273c6c
commit f6a78f83aa
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1846,7 +1846,8 @@ void TileMapLayerEditorTilesPlugin::_tile_atlas_control_draw() {
Color grid_color = EDITOR_GET("editors/tiles_editor/grid_color"); Color grid_color = EDITOR_GET("editors/tiles_editor/grid_color");
Color selection_color = Color().from_hsv(Math::fposmod(grid_color.get_h() + 0.5, 1.0), grid_color.get_s(), grid_color.get_v(), 1.0); Color selection_color = Color().from_hsv(Math::fposmod(grid_color.get_h() + 0.5, 1.0), grid_color.get_s(), grid_color.get_v(), 1.0);
for (const TileMapCell &E : tile_set_selection) { for (const TileMapCell &E : tile_set_selection) {
if (E.source_id == source_id && E.alternative_tile == 0) { int16_t untransformed_alternative_id = E.alternative_tile & TileSetAtlasSource::UNTRANSFORM_MASK;
if (E.source_id == source_id && untransformed_alternative_id == 0) {
for (int frame = 0; frame < atlas->get_tile_animation_frames_count(E.get_atlas_coords()); frame++) { for (int frame = 0; frame < atlas->get_tile_animation_frames_count(E.get_atlas_coords()); frame++) {
Color color = selection_color; Color color = selection_color;
if (frame > 0) { if (frame > 0) {
@ -2029,8 +2030,9 @@ void TileMapLayerEditorTilesPlugin::_tile_alternatives_control_draw() {
// Draw the selection. // Draw the selection.
for (const TileMapCell &E : tile_set_selection) { for (const TileMapCell &E : tile_set_selection) {
if (E.source_id == source_id && E.get_atlas_coords() != TileSetSource::INVALID_ATLAS_COORDS && E.alternative_tile > 0) { int16_t untransformed_alternative_id = E.alternative_tile & TileSetAtlasSource::UNTRANSFORM_MASK;
Rect2i rect = tile_atlas_view->get_alternative_tile_rect(E.get_atlas_coords(), E.alternative_tile); if (E.source_id == source_id && E.get_atlas_coords() != TileSetSource::INVALID_ATLAS_COORDS && untransformed_alternative_id > 0) {
Rect2i rect = tile_atlas_view->get_alternative_tile_rect(E.get_atlas_coords(), untransformed_alternative_id);
if (rect != Rect2i()) { if (rect != Rect2i()) {
TilesEditorUtils::draw_selection_rect(alternative_tiles_control, rect); TilesEditorUtils::draw_selection_rect(alternative_tiles_control, rect);
} }

2
scene/resources/2d/tile_set.h
View File

@ -619,6 +619,8 @@ public:
TRANSFORM_TRANSPOSE = 1 << 14, TRANSFORM_TRANSPOSE = 1 << 14,
}; };
static const int16_t UNTRANSFORM_MASK = ~(TileSetAtlasSource::TRANSFORM_FLIP_H + TileSetAtlasSource::TRANSFORM_FLIP_V + TileSetAtlasSource::TRANSFORM_TRANSPOSE);
private: private:
struct TileAlternativesData { struct TileAlternativesData {
Vector2i size_in_atlas = Vector2i(1, 1); Vector2i size_in_atlas = Vector2i(1, 1);