maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #16971 from Noshyaar/tilemap

Browse source 
TileMap: add fix_invalid_tiles
This commit is contained in:
Rémi Verschelde 2018-03-13 13:57:58 +01:00 committed by GitHub
parent 65dc4abca3 7effe46461
commit c81356153e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/classes/TileMap.xml
View file

@ -19,6 +19,13 @@
Clear all cells.
</description>
</method>
<method name="fix_invalid_tiles">
<return type="void">
</return>
<description>
Clear cells that does not exist in the tileset.
</description>
</method>
<method name="get_cell" qualifiers="const">
<return type="int">
</return>

11
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -147,6 +147,15 @@ void TileMapEditor::_menu_option(int p_option) {
canvas_item_editor->update();
} break;
case OPTION_FIX_INVALID: {
undo_redo->create_action(TTR("Fix Invalid Tiles"));
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
node->fix_invalid_tiles();
undo_redo->add_do_method(node, "set", "tile_data", node->get("tile_data"));
undo_redo->commit_action();
} break;
}
}
@ -1583,6 +1592,8 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
p->add_shortcut(ED_SHORTCUT("tile_map_editor/select", TTR("Select"), KEY_MASK_CMD + KEY_B), OPTION_SELECT);
p->add_shortcut(ED_SHORTCUT("tile_map_editor/duplicate_selection", TTR("Duplicate Selection"), KEY_MASK_CMD + KEY_D), OPTION_DUPLICATE);
p->add_shortcut(ED_GET_SHORTCUT("tile_map_editor/erase_selection"), OPTION_ERASE_SELECTION);
p->add_separator();
p->add_item(TTR("Fix Invalid Tiles"), OPTION_FIX_INVALID);
p->connect("id_pressed", this, "_menu_option");

1
editor/plugins/tile_map_editor_plugin.h
View file

@ -71,6 +71,7 @@ class TileMapEditor : public VBoxContainer {
OPTION_DUPLICATE,
OPTION_ERASE_SELECTION,
OPTION_PAINTING,
OPTION_FIX_INVALID,
};
TileMap *node;

11
scene/2d/tile_map.cpp
View file

@ -834,6 +834,16 @@ void TileMap::update_dirty_bitmask() {
}
}
void TileMap::fix_invalid_tiles() {
for (Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) {
if (!tile_set->has_tile(get_cell(E->key().x, E->key().y))) {
set_cell(E->key().x, E->key().y, INVALID_CELL);
}
}
}
int TileMap::get_cell(int p_x, int p_y) const {
PosKey pk(p_x, p_y);
@ -1519,6 +1529,7 @@ void TileMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_cell_y_flipped", "x", "y"), &TileMap::is_cell_y_flipped);
ClassDB::bind_method(D_METHOD("is_cell_transposed", "x", "y"), &TileMap::is_cell_transposed);
ClassDB::bind_method(D_METHOD("fix_invalid_tiles"), &TileMap::fix_invalid_tiles);
ClassDB::bind_method(D_METHOD("clear"), &TileMap::clear);
ClassDB::bind_method(D_METHOD("get_used_cells"), &TileMap::get_used_cells);

1
scene/2d/tile_map.h
View file

@ -310,6 +310,7 @@ public:
void set_clip_uv(bool p_enable);
bool get_clip_uv() const;
void fix_invalid_tiles();
void clear();
TileMap();