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

Merge pull request #29474 from YeldhamDev/pick_subtile_fix 

Fix subtile picking in TileMap editor
This commit is contained in:
Rémi Verschelde 2019-06-12 12:50:31 +02:00 committed by GitHub
parent 0e6cac8ab8 6be7fea798
commit 94fbaf71a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -572,23 +572,25 @@ void TileMapEditor::_pick_tile(const Point2 &p_pos) {
if (id == TileMap::INVALID_CELL) if (id == TileMap::INVALID_CELL)
return; return;
if (search_box->get_text().strip_edges() != "") { if (search_box->get_text() != "") {
search_box->set_text(""); search_box->set_text("");
_update_palette(); _update_palette();
} }
Vector<int> selected;
selected.push_back(id);
set_selected_tiles(selected);
flip_h = node->is_cell_x_flipped(p_pos.x, p_pos.y); flip_h = node->is_cell_x_flipped(p_pos.x, p_pos.y);
flip_v = node->is_cell_y_flipped(p_pos.x, p_pos.y); flip_v = node->is_cell_y_flipped(p_pos.x, p_pos.y);
transpose = node->is_cell_transposed(p_pos.x, p_pos.y); transpose = node->is_cell_transposed(p_pos.x, p_pos.y);
autotile_coord = node->get_cell_autotile_coord(p_pos.x, p_pos.y); autotile_coord = node->get_cell_autotile_coord(p_pos.x, p_pos.y);
Vector<int> selected;
selected.push_back(id);
set_selected_tiles(selected);
_update_palette(); _update_palette();
if ((manual_autotile && node->get_tileset()->tile_get_tile_mode(id) == TileSet::AUTO_TILE) || (!priority_atlastile && node->get_tileset()->tile_get_tile_mode(id) == TileSet::ATLAS_TILE)) {
manual_palette->select(manual_palette->find_metadata((Point2)autotile_coord));
}
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
} }
@ -982,7 +984,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
return true; return true;
} else { } else {
// Mousebutton was released // Mousebutton was released.
if (tool != TOOL_NONE) { if (tool != TOOL_NONE) {
if (tool == TOOL_PAINTING) { if (tool == TOOL_PAINTING) {
@ -1046,7 +1048,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
return true; // We want to keep the Pasting tool return true; // We want to keep the Pasting tool.
} else if (tool == TOOL_SELECTING) { } else if (tool == TOOL_SELECTING) {
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
@ -1070,7 +1072,10 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
_finish_undo(); _finish_undo();
// We want to keep the bucket-tool active // So the fill preview is cleared right after the click.
CanvasItemEditor::get_singleton()->update_viewport();
// We want to keep the bucket-tool active.
return true; return true;
} }
@ -1197,7 +1202,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (tool == TOOL_PAINTING) { if (tool == TOOL_PAINTING) {
// Paint using bresenham line to prevent holes in painting if the user moves fast // Paint using bresenham line to prevent holes in painting if the user moves fast.
Vector<Point2i> points = line(old_over_tile.x, over_tile.x, old_over_tile.y, over_tile.y); Vector<Point2i> points = line(old_over_tile.x, over_tile.x, old_over_tile.y, over_tile.y);
Vector<int> ids = get_selected_tiles(); Vector<int> ids = get_selected_tiles();
@ -1218,7 +1223,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (tool == TOOL_ERASING) { if (tool == TOOL_ERASING) {
// erase using bresenham line to prevent holes in painting if the user moves fast // Erase using bresenham line to prevent holes in painting if the user moves fast.
Vector<Point2i> points = line(old_over_tile.x, over_tile.x, old_over_tile.y, over_tile.y); Vector<Point2i> points = line(old_over_tile.x, over_tile.x, old_over_tile.y, over_tile.y);
@ -1343,13 +1348,13 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
} }
if (!mouse_over) { if (!mouse_over) {
// Editor shortcuts should not fire if mouse not in viewport // Editor shortcuts should not fire if mouse not in viewport.
return false; return false;
} }
if (ED_IS_SHORTCUT("tile_map_editor/paint_tile", p_event)) { if (ED_IS_SHORTCUT("tile_map_editor/paint_tile", p_event)) {
// NOTE: We do not set tool = TOOL_PAINTING as this begins painting // NOTE: We do not set tool = TOOL_PAINTING as this begins painting
// immediately without pressing the left mouse button first // immediately without pressing the left mouse button first.
tool = TOOL_NONE; tool = TOOL_NONE;
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
@ -1431,7 +1436,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
return true; return true;
} }
} else if (k.is_valid()) { // release event } else if (k.is_valid()) { // Release event.
if (tool == TOOL_NONE) { if (tool == TOOL_NONE) {
@ -1447,7 +1452,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
#else #else
if (k->get_scancode() == KEY_CONTROL) { if (k->get_scancode() == KEY_CONTROL) {
#endif #endif
// go back to that last tool if KEY_CONTROL was released // Go back to that last tool if KEY_CONTROL was released.
tool = last_tool; tool = last_tool;
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();