godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #27565 from SpechtMagnus/tileset_autotile_ignore_flags

Browse Source 
Added ignore flag / wildcard bit to tileset autotile
This commit is contained in:
Rémi Verschelde
2019-04-08 10:04:30 +02:00
committed by GitHub
parent d211aff777 a3af9d5714
commit de33c37196
5 changed files with 120 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -481,10 +481,10 @@ void TileMapEditor::_update_palette() {
if (sel_tile != TileMap::INVALID_CELL) {
if ((manual_autotile && tileset->tile_get_tile_mode(sel_tile) == TileSet::AUTO_TILE) || tileset->tile_get_tile_mode(sel_tile) == TileSet::ATLAS_TILE) {
const Map<Vector2, uint16_t> &tiles2 = tileset->autotile_get_bitmask_map(sel_tile);
const Map<Vector2, uint32_t> &tiles2 = tileset->autotile_get_bitmask_map(sel_tile);
Vector<Vector2> entries2;
for (const Map<Vector2, uint16_t>::Element *E = tiles2.front(); E; E = E->next()) {
for (const Map<Vector2, uint32_t>::Element *E = tiles2.front(); E; E = E->next()) {
entries2.push_back(E->key());
}
entries2.sort();