Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #71615 from groud/bring_back_get_cells_by_id

Browse source 
Bring back TileMap::get_cells_by_id
This commit is contained in:
Rémi Verschelde 2023-01-18 17:33:14 +01:00
commit da1b78222c
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scene/2d/tile_map.cpp
View file

@ -3736,6 +3736,22 @@ TypedArray<Vector2i> TileMap::get_used_cells(int p_layer) const {
return a;
}
TypedArray<Vector2i> TileMap::get_used_cells_by_id(int p_layer, int p_source_id, const Vector2i p_atlas_coords, int p_alternative_tile) const {
ERR_FAIL_INDEX_V(p_layer, (int)layers.size(), TypedArray<Vector2i>());
// Returns the cells used in the tilemap.
TypedArray<Vector2i> a;
for (const KeyValue<Vector2i, TileMapCell> &E : layers[p_layer].tile_map) {
if ((p_source_id == TileSet::INVALID_SOURCE || p_source_id == E.value.source_id) &&
(p_atlas_coords == TileSetSource::INVALID_ATLAS_COORDS || p_atlas_coords == E.value.get_atlas_coords()) &&
(p_alternative_tile == TileSetSource::INVALID_TILE_ALTERNATIVE || p_alternative_tile == E.value.alternative_tile)) {
a.push_back(E.key);
}
}
return a;
}
Rect2i TileMap::get_used_rect() { // Not const because of cache
// Return the rect of the currently used area
if (used_rect_cache_dirty) {
@ -4028,6 +4044,7 @@ void TileMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_surrounding_cells", "coords"), &TileMap::get_surrounding_cells);
ClassDB::bind_method(D_METHOD("get_used_cells", "layer"), &TileMap::get_used_cells);
ClassDB::bind_method(D_METHOD("get_used_cells_by_id", "layer", "source_id", "atlas_coords", "alternative_tile"), &TileMap::get_used_cells_by_id, DEFVAL(TileSet::INVALID_SOURCE), DEFVAL(TileSetSource::INVALID_ATLAS_COORDS), DEFVAL(TileSetSource::INVALID_TILE_ALTERNATIVE));
ClassDB::bind_method(D_METHOD("get_used_rect"), &TileMap::get_used_rect);
ClassDB::bind_method(D_METHOD("map_to_local", "map_position"), &TileMap::map_to_local);