diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-29 16:33:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 16:33:24 +0200 |
| commit | cfa6a1d7ab29192b225e4f719662a2fc76266bad (patch) | |
| tree | fccba80f1dff35af94448ef85fd337f9b1870f07 | |
| parent | 907b7a389736f10b22bb4f63688f489ed1d7f30a (diff) | |
| parent | 20bea1e231223bf6e1de9899807b810f6e9f057d (diff) | |
Merge pull request #21563 from marcelofg55/_set_celld
Unexpose TileMap set_celld
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | scene/2d/tile_map.cpp | 4 | ||||
| -rw-r--r-- | scene/2d/tile_map.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 598f7034d8..58c3fd015e 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -238,8 +238,8 @@ void TileMapEditor::_create_set_cell_undo(const Vector2 &p_vec, const CellOp &p_ cell_new["transpose"] = p_cell_new.tr; cell_new["auto_coord"] = p_cell_new.ac; - undo_redo->add_undo_method(node, "set_celld", p_vec, cell_old); - undo_redo->add_do_method(node, "set_celld", p_vec, cell_new); + undo_redo->add_undo_method(node, "_set_celld", p_vec, cell_old); + undo_redo->add_do_method(node, "_set_celld", p_vec, cell_new); } void TileMapEditor::_start_undo(const String &p_action) { diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 80565fa455..8a2fdbacfa 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -726,7 +726,7 @@ void TileMap::set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x, bool p_ set_cell(p_pos.x, p_pos.y, p_tile, p_flip_x, p_flip_y, p_transpose); } -void TileMap::set_celld(const Vector2 &p_pos, const Dictionary &p_data) { +void TileMap::_set_celld(const Vector2 &p_pos, const Dictionary &p_data) { set_cell(p_pos.x, p_pos.y, p_data["id"], p_data["flip_h"], p_data["flip_y"], p_data["transpose"], p_data["auto_coord"]); } @@ -1612,7 +1612,7 @@ void TileMap::_bind_methods() { ClassDB::bind_method(D_METHOD("set_cell", "x", "y", "tile", "flip_x", "flip_y", "transpose", "autotile_coord"), &TileMap::set_cell, DEFVAL(false), DEFVAL(false), DEFVAL(false), DEFVAL(Vector2())); ClassDB::bind_method(D_METHOD("set_cellv", "position", "tile", "flip_x", "flip_y", "transpose"), &TileMap::set_cellv, DEFVAL(false), DEFVAL(false), DEFVAL(false)); - ClassDB::bind_method(D_METHOD("set_celld", "position", "data"), &TileMap::set_celld); + ClassDB::bind_method(D_METHOD("_set_celld", "position", "data"), &TileMap::_set_celld); ClassDB::bind_method(D_METHOD("get_cell", "x", "y"), &TileMap::get_cell); ClassDB::bind_method(D_METHOD("get_cellv", "position"), &TileMap::get_cellv); ClassDB::bind_method(D_METHOD("is_cell_x_flipped", "x", "y"), &TileMap::is_cell_x_flipped); diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 52aa6e8e2a..55db33837f 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -242,7 +242,7 @@ public: void set_cell_autotile_coord(int p_x, int p_y, const Vector2 &p_coord); Vector2 get_cell_autotile_coord(int p_x, int p_y) const; - void set_celld(const Vector2 &p_pos, const Dictionary &p_data); + void _set_celld(const Vector2 &p_pos, const Dictionary &p_data); void set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x = false, bool p_flip_y = false, bool p_transpose = false); int get_cellv(const Vector2 &p_pos) const; |