asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #60021 from timothyqiu/tilemap-nav-region

Browse source 
[3.x] Free region RID when cleaning NavPoly in `TileMap`
This commit is contained in:
Rémi Verschelde 2022-04-13 08:56:40 +02:00 committed by GitHub
commit 229a8218da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene/2d/tile_map.cpp
View file

@ -38,6 +38,15 @@
#include "servers/navigation_2d_server.h" #include "servers/navigation_2d_server.h"
#include "servers/physics_2d_server.h" #include "servers/physics_2d_server.h"
void TileMap::Quadrant::clear_navpoly() {
for (Map<PosKey, Quadrant::NavPoly>::Element *E = navpoly_ids.front(); E; E = E->next()) {
RID region = E->get().region;
Navigation2DServer::get_singleton()->region_set_map(region, RID());
Navigation2DServer::get_singleton()->free(region);
}
navpoly_ids.clear();
}
int TileMap::_get_quadrant_size() const { int TileMap::_get_quadrant_size() const {
if (y_sort_mode) { if (y_sort_mode) {
return 1; return 1;
@ -79,10 +88,7 @@ void TileMap::_notification(int p_what) {
for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) {
Quadrant &q = E->get(); Quadrant &q = E->get();
if (navigation) { if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *F = q.navpoly_ids.front(); F; F = F->next()) { q.clear_navpoly();
Navigation2DServer::get_singleton()->region_set_map(F->get().region, RID());
}
q.navpoly_ids.clear();
} }
if (collision_parent) { if (collision_parent) {
@ -376,10 +382,7 @@ void TileMap::update_dirty_quadrants() {
int shape_idx = 0; int shape_idx = 0;
if (navigation) { if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { q.clear_navpoly();
Navigation2DServer::get_singleton()->region_set_map(E->get().region, RID());
}
q.navpoly_ids.clear();
} }
for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) {
@ -816,10 +819,7 @@ void TileMap::_erase_quadrant(Map<PosKey, Quadrant>::Element *Q) {
} }
if (navigation) { if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { q.clear_navpoly();
Navigation2DServer::get_singleton()->region_set_map(E->get().region, RID());
}
q.navpoly_ids.clear();
} }
for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) {

2
scene/2d/tile_map.h
View file

@ -150,6 +150,8 @@ private:
VSet<PosKey> cells; VSet<PosKey> cells;
void clear_navpoly();
void operator=(const Quadrant &q) { void operator=(const Quadrant &q) {
pos = q.pos; pos = q.pos;
canvas_items = q.canvas_items; canvas_items = q.canvas_items;