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

Merge pull request #12334 from Zylann/tilemap_bresenham_paint

Browse source 
Use bresenham line in freehand tilemap painting to fill discontinuities
This commit is contained in:
Rémi Verschelde 2017-10-23 23:14:45 +02:00 committed by GitHub
commit 19f83e57de
1 changed files with 32 additions and 15 deletions
Show stats 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()) {
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) {
@ -963,17 +964,43 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
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();
if (id != TileMap::INVALID_CELL) {
for (int i = 0; i < points.size(); ++i) {
Point2i pos = points[i];
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);
return true;
_set_cell(pos, id, flip_h, flip_v, transpose);
}
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) {
@ -1044,16 +1071,6 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
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)) {
_pick_tile(over_tile);