asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #42313 from kurinoku/fix-tileset-editor-3.2

Browse source 
Fixed tile_set_editor_plugin.cpp selection issue where it wouldn't cycle through all subtiles of an autotile.
This commit is contained in:
Rémi Verschelde 2020-12-03 14:45:37 +01:00 committed by GitHub
commit 9962fa6975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/tile_set_editor_plugin.cpp
View file

@ -2136,7 +2136,6 @@ void TileSetEditor::_select_previous_tile() {
int spacing = tileset->autotile_get_spacing(get_current_tile());
Vector2 size = tileset->tile_get_region(get_current_tile()).size;
Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
cell_count -= Vector2(1, 1);
edited_shape_coord = cell_count;
_select_edited_shape_coord();
} break;
@ -2193,11 +2192,11 @@ void TileSetEditor::_select_next_subtile() {
int spacing = tileset->autotile_get_spacing(get_current_tile());
Vector2 size = tileset->tile_get_region(get_current_tile()).size;
Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
if (edited_shape_coord.x >= cell_count.x - 1 && edited_shape_coord.y >= cell_count.y - 1) {
if (edited_shape_coord.x > cell_count.x - 1 && edited_shape_coord.y > cell_count.y - 1) {
_select_next_tile();
} else {
edited_shape_coord.x++;
if (edited_shape_coord.x >= cell_count.x) {
if (edited_shape_coord.x > cell_count.x) {
edited_shape_coord.x = 0;
edited_shape_coord.y++;
}
@ -2224,7 +2223,7 @@ void TileSetEditor::_select_previous_subtile() {
} else {
edited_shape_coord.x--;
if (edited_shape_coord.x == -1) {
edited_shape_coord.x = cell_count.x - 1;
edited_shape_coord.x = cell_count.x;
edited_shape_coord.y--;
}
_select_edited_shape_coord();