Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-24 18:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported: Free region RID when cleaning NavPoly in TileMap - timothyqiu

Browse Source 
5c039ccc72
This commit is contained in:
Relintai 2022-07-25 22:34:05 +02:00
parent ef7f5a8c43
commit 7747a3e85a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/rtile_map/tile_map.cpp
View File

@ -40,6 +40,15 @@
#include "servers/navigation_2d_server.h"
void RTileMap::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 RTileMap::_get_quadrant_size() const {
if (y_sort_mode) {
return 1;
@ -81,10 +90,7 @@ void RTileMap::_notification(int p_what) {
for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) {
Quadrant &q = E->get();
if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *F = q.navpoly_ids.front(); F; F = F->next()) {
Navigation2DServer::get_singleton()->region_set_map(F->get().region, RID());
}
q.navpoly_ids.clear();
q.clear_navpoly();
}
if (collision_parent) {
@ -392,10 +398,7 @@ void RTileMap::update_dirty_quadrants() {
int shape_idx = 0;
if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) {
Navigation2DServer::get_singleton()->region_set_map(E->get().region, RID());
}
q.navpoly_ids.clear();
q.clear_navpoly();
}
for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) {
@ -838,10 +841,7 @@ void RTileMap::_erase_quadrant(Map<PosKey, Quadrant>::Element *Q) {
}
if (navigation) {
for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) {
Navigation2DServer::get_singleton()->region_set_map(E->get().region, RID());
}
q.navpoly_ids.clear();
q.clear_navpoly();
}
for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) {

2
modules/rtile_map/tile_map.h
View File

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