godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19776 from marcelofg55/tilemap_quadrant_opt 

Optimize _recreate_quadrants
This commit is contained in:
Rémi Verschelde 2018-06-26 15:37:55 +02:00 committed by GitHub
parent 80d6882ccd 67a78e020a
commit c8617565d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/2d/tile_map.cpp
View File

@ -708,7 +708,7 @@ void TileMap::_erase_quadrant(Map<PosKey, Quadrant>::Element *Q) {
rect_cache_dirty = true;
}
void TileMap::_make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q) {
void TileMap::_make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q, bool update) {
Quadrant &q = Q->get();
if (!q.dirty_list.in_list())
@ -719,7 +719,10 @@ void TileMap::_make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q) {
pending_update = true;
if (!is_inside_tree())
return;
_update_dirty_quadrants();
if (update) {
_update_dirty_quadrants();
}
}
void TileMap::set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x, bool p_flip_y, bool p_transpose) {
@ -1016,8 +1019,9 @@ void TileMap::_recreate_quadrants() {
}
Q->get().cells.insert(E->key());
_make_quadrant_dirty(Q);
_make_quadrant_dirty(Q, false);
}
_update_dirty_quadrants();
}
void TileMap::_clear_quadrants() {

2
scene/2d/tile_map.h
View File

@ -188,7 +188,7 @@ private:
Map<PosKey, Quadrant>::Element *_create_quadrant(const PosKey &p_qk);
void _erase_quadrant(Map<PosKey, Quadrant>::Element *Q);
void _make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q);
void _make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q, bool update = true);
void _recreate_quadrants();
void _clear_quadrants();
void _update_dirty_quadrants();