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

Merge pull request #6368 from Garmelon/issue-6320

Browse source 
Tilemap editor: Bucket tool - allow deleting and replacing of tiles
This commit is contained in:
Rémi Verschelde 2016-09-08 07:58:06 +02:00 committed by GitHub
commit 633f940c96
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tools/editor/plugins/tile_map_editor_plugin.cpp
View file

@ -289,15 +289,16 @@ void TileMapEditor::_pick_tile(const Point2& p_pos) {
canvas_item_editor->update(); canvas_item_editor->update();
} }
DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start) { DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start, bool erase) {
if (node->get_cell(p_start.x, p_start.y) != TileMap::INVALID_CELL) int prev_id = node->get_cell(p_start.x, p_start.y);
return DVector<Vector2>(); int id = TileMap::INVALID_CELL;
if (!erase) {
id = get_selected_tile();
int id = get_selected_tile(); if (id == TileMap::INVALID_CELL)
return DVector<Vector2>();
if (id == TileMap::INVALID_CELL) }
return DVector<Vector2>();
Rect2 r = node->get_item_rect(); Rect2 r = node->get_item_rect();
r.pos = r.pos/node->get_cell_size(); r.pos = r.pos/node->get_cell_size();
@ -316,7 +317,7 @@ DVector<Vector2> TileMapEditor::_bucket_fill(const Point2i& p_start) {
if (!r.has_point(n)) if (!r.has_point(n))
continue; continue;
if (node->get_cell(n.x, n.y) == TileMap::INVALID_CELL) { if (node->get_cell(n.x, n.y) == prev_id) {
node->set_cellv(n, id, flip_h, flip_v, transpose); node->set_cellv(n, id, flip_h, flip_v, transpose);
@ -685,6 +686,12 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
} else if (tool==TOOL_BUCKET) { } else if (tool==TOOL_BUCKET) {
Dictionary pop;
pop["id"] = node->get_cell(over_tile.x, over_tile.y);
pop["flip_h"] = node->is_cell_x_flipped(over_tile.x, over_tile.y);
pop["flip_v"] = node->is_cell_y_flipped(over_tile.x, over_tile.y);
pop["transpose"] = node->is_cell_transposed(over_tile.x, over_tile.y);
DVector<Vector2> points = _bucket_fill(over_tile); DVector<Vector2> points = _bucket_fill(over_tile);
if (points.size() == 0) if (points.size() == 0)
@ -699,7 +706,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
undo_redo->create_action("Bucket Fill"); undo_redo->create_action("Bucket Fill");
undo_redo->add_do_method(this, "_fill_points", points, op); undo_redo->add_do_method(this, "_fill_points", points, op);
undo_redo->add_undo_method(this, "_erase_points", points); undo_redo->add_undo_method(this, "_fill_points", points, pop);
undo_redo->commit_action(); undo_redo->commit_action();
} }
@ -782,6 +789,26 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
tool=TOOL_NONE; tool=TOOL_NONE;
return true; return true;
} else if (tool==TOOL_BUCKET) {
Dictionary pop;
pop["id"] = node->get_cell(over_tile.x, over_tile.y);
pop["flip_h"] = node->is_cell_x_flipped(over_tile.x, over_tile.y);
pop["flip_v"] = node->is_cell_y_flipped(over_tile.x, over_tile.y);
pop["transpose"] = node->is_cell_transposed(over_tile.x, over_tile.y);
DVector<Vector2> points = _bucket_fill(over_tile, true);
if (points.size() == 0)
return false;
undo_redo->create_action("Bucket Fill");
undo_redo->add_do_method(this, "_erase_points", points);
undo_redo->add_undo_method(this, "_fill_points", points, pop);
undo_redo->commit_action();
} }
} }
} }
@ -798,7 +825,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
canvas_item_editor->update(); canvas_item_editor->update();
} }
int tile_under = node->get_cell(over_tile.x, over_tile.y); int tile_under = node->get_cell(over_tile.x, over_tile.y);
String tile_name = "none"; String tile_name = "none";
if (node->get_tileset()->has_tile(tile_under)) if (node->get_tileset()->has_tile(tile_under))

2
tools/editor/plugins/tile_map_editor_plugin.h
View file

@ -129,7 +129,7 @@ class TileMapEditor : public VBoxContainer {
void _pick_tile(const Point2& p_pos); void _pick_tile(const Point2& p_pos);
DVector<Vector2> _bucket_fill(const Point2i& p_start); DVector<Vector2> _bucket_fill(const Point2i& p_start, bool erase=false);
void _fill_points(const DVector<Vector2> p_points, const Dictionary& p_op); void _fill_points(const DVector<Vector2> p_points, const Dictionary& p_op);
void _erase_points(const DVector<Vector2> p_points); void _erase_points(const DVector<Vector2> p_points);