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

Use bresenham line in freehand tilemap painting to fill discontinuities

Browse Source
This commit is contained in:
Marc Gilleron
2017-10-23 00:48:03 +02:00
parent b4f0f59d9f
commit e9f6ff5bd1
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -945,6 +945,7 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (mm.is_valid()) { if (mm.is_valid()) {
Point2i new_over_tile = node->world_to_map(xform_inv.xform(mm->get_position())); Point2i new_over_tile = node->world_to_map(xform_inv.xform(mm->get_position()));
Point2i old_over_tile = over_tile;
if (new_over_tile != over_tile) { if (new_over_tile != over_tile) {
@@ -963,17 +964,43 @@ 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
Vector<Point2i> points = line(old_over_tile.x, over_tile.x, old_over_tile.y, over_tile.y);
int id = get_selected_tile(); int id = get_selected_tile();
if (id != TileMap::INVALID_CELL) {
for (int i = 0; i < points.size(); ++i) {
Point2i pos = points[i];
if (!paint_undo.has(over_tile)) { if (!paint_undo.has(over_tile)) {
paint_undo[over_tile] = _get_op_from_cell(over_tile); paint_undo[pos] = _get_op_from_cell(pos);
} }
_set_cell(over_tile, id, flip_h, flip_v, transpose); _set_cell(pos, id, flip_h, flip_v, transpose);
return true;
} }
return true;
}
if (tool == TOOL_ERASING) {
// 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);
for (int i = 0; i < points.size(); ++i) {
Point2i pos = points[i];
if (!paint_undo.has(over_tile)) {
paint_undo[pos] = _get_op_from_cell(pos);
}
_set_cell(pos, TileMap::INVALID_CELL);
}
return true;
} }
if (tool == TOOL_SELECTING) { if (tool == TOOL_SELECTING) {
@@ -1044,16 +1071,6 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
return true; return true;
} }
if (tool == TOOL_ERASING) {
if (!paint_undo.has(over_tile)) {
paint_undo[over_tile] = _get_op_from_cell(over_tile);
}
_set_cell(over_tile, TileMap::INVALID_CELL);
return true;
}
if (tool == TOOL_PICKING && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) { if (tool == TOOL_PICKING && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) {
_pick_tile(over_tile); _pick_tile(over_tile);