Skip to content

Commit

Permalink
TileMap Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarianoGnu
MarianoGnu committed Dec 2, 2017
1 parent 4170e8f commit af719a9
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 91 deletions.
8 changes: 2 additions & 6 deletions editor/plugins/spatial_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4753,9 +4753,9 @@ VSplitContainer *SpatialEditor::get_shader_split() {
return shader_split;
}

HBoxContainer *SpatialEditor::get_palette_split() {
HSplitContainer *SpatialEditor::get_palette_split() {

return palette_split_container;
return palette_split;
}

void SpatialEditor::_request_gizmo(Object *p_obj) {
Expand Down Expand Up @@ -5046,10 +5046,6 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
palette_split->set_v_size_flags(SIZE_EXPAND_FILL);
vbc->add_child(palette_split);

palette_split_container = memnew(HBoxContainer);
palette_split_container->set_v_size_flags(SIZE_EXPAND_FILL);
palette_split->add_child(palette_split_container);

shader_split = memnew(VSplitContainer);
shader_split->set_h_size_flags(SIZE_EXPAND_FILL);
palette_split->add_child(shader_split);
Expand Down
3 changes: 1 addition & 2 deletions editor/plugins/spatial_editor_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ class SpatialEditor : public VBoxContainer {
SpatialEditorViewport *viewports[VIEWPORTS_COUNT];
VSplitContainer *shader_split;
HSplitContainer *palette_split;
HBoxContainer *palette_split_container;

/////

Expand Down Expand Up @@ -608,7 +607,7 @@ class SpatialEditor : public VBoxContainer {
void add_control_to_menu_panel(Control *p_control);

VSplitContainer *get_shader_split();
HBoxContainer *get_palette_split();
HSplitContainer *get_palette_split();

Spatial *get_selected() { return selected; }

Expand Down
92 changes: 35 additions & 57 deletions editor/plugins/tile_map_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,14 @@ void TileMapEditor::_menu_option(int p_option) {
return;

undo_redo->create_action(TTR("Erase Selection"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
for (int i = rectangle.position.y; i <= rectangle.position.y + rectangle.size.y; i++) {
for (int j = rectangle.position.x; j <= rectangle.position.x + rectangle.size.x; j++) {

_set_cell(Point2i(j, i), TileMap::INVALID_CELL, false, false, false, true);
_set_cell(Point2i(j, i), TileMap::INVALID_CELL, false, false, false);
}
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

selection_active = false;
Expand Down Expand Up @@ -171,7 +173,7 @@ void TileMapEditor::set_selected_tile(int p_tile) {
}
}

void TileMapEditor::_set_cell(const Point2i &p_pos, int p_value, bool p_flip_h, bool p_flip_v, bool p_transpose, bool p_with_undo) {
void TileMapEditor::_set_cell(const Point2i &p_pos, int p_value, bool p_flip_h, bool p_flip_v, bool p_transpose) {

ERR_FAIL_COND(!node);

Expand All @@ -184,17 +186,8 @@ void TileMapEditor::_set_cell(const Point2i &p_pos, int p_value, bool p_flip_h,
if (p_value == prev_val && p_flip_h == prev_flip_h && p_flip_v == prev_flip_v && p_transpose == prev_transpose)
return; //check that it's actually different

if (p_with_undo) {

undo_redo->add_do_method(node, "set_cellv", Point2(p_pos), p_value, p_flip_h, p_flip_v, p_transpose);
undo_redo->add_do_method(node, "make_bitmask_area_dirty", Point2(p_pos));
undo_redo->add_undo_method(node, "set_cellv", Point2(p_pos), prev_val, prev_flip_h, prev_flip_v, prev_transpose);
undo_redo->add_undo_method(node, "make_bitmask_area_dirty", Point2(p_pos));
} else {

node->set_cell(p_pos.x, p_pos.y, p_value, p_flip_h, p_flip_v, p_transpose);
node->update_bitmask_area(Point2(p_pos));
}
node->set_cell(p_pos.x, p_pos.y, p_value, p_flip_h, p_flip_v, p_transpose);
node->update_bitmask_area(Point2(p_pos));
}

void TileMapEditor::_text_entered(const String &p_text) {
Expand Down Expand Up @@ -404,6 +397,7 @@ PoolVector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool era
}

PoolVector<Vector2> points;
Vector<Vector2> non_preview_cache;
int count = 0;
int limit = 0;

Expand Down Expand Up @@ -432,8 +426,10 @@ PoolVector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool era
bucket_cache_visited[loc] = true;
bucket_cache.push_back(n);
} else {
node->set_cellv(n, id, flip_h, flip_v, transpose);
if (non_preview_cache.find(n) >= 0)
continue;
points.push_back(n);
non_preview_cache.push_back(n);
}

bucket_queue.push_back(Point2i(n.x, n.y + 1));
Expand Down Expand Up @@ -462,9 +458,10 @@ void TileMapEditor::_fill_points(const PoolVector<Vector2> p_points, const Dicti
bool tr = p_op["transpose"];

for (int i = 0; i < len; i++) {

_set_cell(pr[i], id, xf, yf, tr);
node->make_bitmask_area_dirty(pr[i]);
}
node->update_dirty_bitmask();
}

void TileMapEditor::_erase_points(const PoolVector<Vector2> p_points) {
Expand Down Expand Up @@ -730,10 +727,8 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

tool = TOOL_PAINTING;

paint_undo.clear();
paint_undo[over_tile] = _get_op_from_cell(over_tile);

_set_cell(over_tile, id, flip_h, flip_v, transpose);
undo_redo->create_action(TTR("Paint TileMap"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
}
} else if (tool == TOOL_PICKING) {

Expand All @@ -754,15 +749,9 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

int id = get_selected_tile();

if (id != TileMap::INVALID_CELL && paint_undo.size()) {

undo_redo->create_action(TTR("Paint TileMap"));
for (Map<Point2i, CellOp>::Element *E = paint_undo.front(); E; E = E->next()) {
if (id != TileMap::INVALID_CELL) {

Point2 p = E->key();
undo_redo->add_do_method(node, "set_cellv", p, id, flip_h, flip_v, transpose);
undo_redo->add_undo_method(node, "set_cellv", p, E->get().idx, E->get().xf, E->get().yf, E->get().tr);
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

paint_undo.clear();
Expand All @@ -774,10 +763,12 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (id != TileMap::INVALID_CELL) {

undo_redo->create_action(TTR("Line Draw"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
for (Map<Point2i, CellOp>::Element *E = paint_undo.front(); E; E = E->next()) {

_set_cell(E->key(), id, flip_h, flip_v, transpose, true);
_set_cell(E->key(), id, flip_h, flip_v, transpose);
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

paint_undo.clear();
Expand All @@ -791,12 +782,14 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (id != TileMap::INVALID_CELL) {

undo_redo->create_action(TTR("Rectangle Paint"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
for (int i = rectangle.position.y; i <= rectangle.position.y + rectangle.size.y; i++) {
for (int j = rectangle.position.x; j <= rectangle.position.x + rectangle.size.x; j++) {

_set_cell(Point2i(j, i), id, flip_h, flip_v, transpose, true);
_set_cell(Point2i(j, i), id, flip_h, flip_v, transpose);
}
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

canvas_item_editor->update();
Expand All @@ -806,10 +799,12 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
Point2 ofs = over_tile - rectangle.position;

undo_redo->create_action(TTR("Duplicate"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
for (List<TileData>::Element *E = copydata.front(); E; E = E->next()) {

_set_cell(E->get().pos + ofs, E->get().cell, E->get().flip_h, E->get().flip_v, E->get().transpose, true);
_set_cell(E->get().pos + ofs, E->get().cell, E->get().flip_h, E->get().flip_v, E->get().transpose);
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

copydata.clear();
Expand All @@ -822,28 +817,23 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

} 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);

PoolVector<Vector2> points = _bucket_fill(over_tile);

if (points.size() == 0)
return false;

undo_redo->create_action(TTR("Bucket Fill"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));

Dictionary op;
op["id"] = get_selected_tile();
op["flip_h"] = flip_h;
op["flip_v"] = flip_v;
op["transpose"] = transpose;

undo_redo->create_action(TTR("Bucket Fill"));

undo_redo->add_do_method(this, "_fill_points", points, op);
undo_redo->add_undo_method(this, "_fill_points", points, pop);
_fill_points(points, op);

undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

// We want to keep the bucket-tool active
Expand Down Expand Up @@ -885,6 +875,9 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

Point2 local = node->world_to_map(xform_inv.xform(mb->get_position()));

undo_redo->create_action(TTR("Erase TileMap"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));

if (mb->get_shift()) {

if (mb->get_control())
Expand All @@ -898,7 +891,6 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

tool = TOOL_ERASING;

paint_undo[local] = _get_op_from_cell(local);
_set_cell(local, TileMap::INVALID_CELL);
}

Expand All @@ -908,18 +900,8 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
} else {
if (tool == TOOL_ERASING || tool == TOOL_RECTANGLE_ERASE || tool == TOOL_LINE_ERASE) {

if (paint_undo.size()) {
undo_redo->create_action(TTR("Erase TileMap"));
for (Map<Point2i, CellOp>::Element *E = paint_undo.front(); E; E = E->next()) {

Point2 p = E->key();
undo_redo->add_do_method(node, "set_cellv", p, TileMap::INVALID_CELL, false, false, false);
undo_redo->add_undo_method(node, "set_cellv", p, E->get().idx, E->get().xf, E->get().yf, E->get().tr);
}

undo_redo->commit_action();
paint_undo.clear();
}
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();

if (tool == TOOL_RECTANGLE_ERASE || tool == TOOL_LINE_ERASE) {
canvas_item_editor->update();
Expand Down Expand Up @@ -1006,10 +988,6 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {

Point2i pos = points[i];

if (!paint_undo.has(pos)) {
paint_undo[pos] = _get_op_from_cell(pos);
}

_set_cell(pos, TileMap::INVALID_CELL);
}

Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/tile_map_editor_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class TileMapEditor : public VBoxContainer {
void _update_palette();
void _menu_option(int p_option);

void _set_cell(const Point2i &p_pos, int p_value, bool p_flip_h = false, bool p_flip_v = false, bool p_transpose = false, bool p_with_undo = false);
void _set_cell(const Point2i &p_pos, int p_value, bool p_flip_h = false, bool p_flip_v = false, bool p_transpose = false);

void _canvas_mouse_enter();
void _canvas_mouse_exit();
Expand Down
56 changes: 41 additions & 15 deletions editor/plugins/tile_set_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1015,21 +1015,47 @@ void AutotileEditor::_on_tool_clicked(int p_tool) {
tile_set->autotile_clear_bitmask_map(get_current_tile());
workspace->update();
} else if (p_tool == SHAPE_DELETE) {
if (!edited_collision_shape.is_null()) {
Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(get_current_tile());
int index;
for (int i = 0; i < sd.size(); i++) {
if (sd[i].shape == edited_collision_shape) {
index = i;
break;
}
}
if (index >= 0) {
sd.remove(index);
tile_set->tile_set_shapes(get_current_tile(), sd);
edited_collision_shape.unref();
current_shape.resize(0);
workspace->update();
if (creating_shape) {
creating_shape = false;
current_shape.resize(0);
workspace->update();
} else {
switch (edit_mode) {
case EDITMODE_COLLISION: {
if (!edited_collision_shape.is_null()) {
Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(get_current_tile());
int index;
for (int i = 0; i < sd.size(); i++) {
if (sd[i].shape == edited_collision_shape) {
index = i;
break;
}
}
if (index >= 0) {
sd.remove(index);
tile_set->tile_set_shapes(get_current_tile(), sd);
edited_collision_shape = Ref<ConcavePolygonShape2D>();
current_shape.resize(0);
workspace->update();
}
}
} break;
case EDITMODE_NAVIGATION: {
if (!edited_navigation_shape.is_null()) {
tile_set->autotile_set_navigation_polygon(get_current_tile(), Ref<NavigationPolygon>(), edited_shape_coord);
edited_navigation_shape = Ref<NavigationPolygon>();
current_shape.resize(0);
workspace->update();
}
} break;
case EDITMODE_OCCLUSION: {
if (!edited_occlusion_shape.is_null()) {
tile_set->autotile_set_light_occluder(get_current_tile(), Ref<OccluderPolygon2D>(), edited_shape_coord);
edited_occlusion_shape = Ref<OccluderPolygon2D>();
current_shape.resize(0);
workspace->update();
}
} break;
}
}
} else if (p_tool == ZOOM_OUT) {
Expand Down
Loading

0 comments on commit af719a9

Please sign in to comment.