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

Remove elements from monitored_bodies and monitored_areas as they are 

processed before calling the callback, instead of after they have all
been processed, because the callbacks may readd them.
This commit is contained in:
Marcel Admiraal 2020-07-04 08:56:32 +01:00
parent 037571d08e
commit ccdfaf2491
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
servers/physics/area_sw.cpp
View File

@ -189,10 +189,12 @@ void AreaSW::call_queries() {
return; return;
} }
for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E; E = E->next()) { for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) {
if (E->get().state == 0) if (E->get().state == 0) { // Nothing happened
continue; //nothing happened E = E->next();
continue;
}
res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED; res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
res[1] = E->key().rid; res[1] = E->key().rid;
@ -200,13 +202,15 @@ void AreaSW::call_queries() {
res[3] = E->key().body_shape; res[3] = E->key().body_shape;
res[4] = E->key().area_shape; res[4] = E->key().area_shape;
Map<BodyKey, BodyState>::Element *next = E->next();
monitored_bodies.erase(E);
E = next;
Variant::CallError ce; Variant::CallError ce;
obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce); obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce);
} }
} }
monitored_bodies.clear();
if (area_monitor_callback_id && !monitored_areas.empty()) { if (area_monitor_callback_id && !monitored_areas.empty()) {
Variant res[5]; Variant res[5];
@ -221,10 +225,12 @@ void AreaSW::call_queries() {
return; return;
} }
for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E; E = E->next()) { for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) {
if (E->get().state == 0) if (E->get().state == 0) { // Nothing happened
continue; //nothing happened E = E->next();
continue;
}
res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED; res[0] = E->get().state > 0 ? PhysicsServer::AREA_BODY_ADDED : PhysicsServer::AREA_BODY_REMOVED;
res[1] = E->key().rid; res[1] = E->key().rid;
@ -232,13 +238,14 @@ void AreaSW::call_queries() {
res[3] = E->key().body_shape; res[3] = E->key().body_shape;
res[4] = E->key().area_shape; res[4] = E->key().area_shape;
Map<BodyKey, BodyState>::Element *next = E->next();
monitored_areas.erase(E);
E = next;
Variant::CallError ce; Variant::CallError ce;
obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce); obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce);
} }
} }
monitored_areas.clear();
//get_space()->area_remove_from_monitor_query_list(&monitor_query_list);
} }
AreaSW::AreaSW() : AreaSW::AreaSW() :

30
servers/physics_2d/area_2d_sw.cpp
View File

@ -189,10 +189,12 @@ void Area2DSW::call_queries() {
return; return;
} }
for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E; E = E->next()) { for (Map<BodyKey, BodyState>::Element *E = monitored_bodies.front(); E;) {
if (E->get().state == 0) if (E->get().state == 0) { // Nothing happened
continue; //nothing happened E = E->next();
continue;
}
res[0] = E->get().state > 0 ? Physics2DServer::AREA_BODY_ADDED : Physics2DServer::AREA_BODY_REMOVED; res[0] = E->get().state > 0 ? Physics2DServer::AREA_BODY_ADDED : Physics2DServer::AREA_BODY_REMOVED;
res[1] = E->key().rid; res[1] = E->key().rid;
@ -200,13 +202,15 @@ void Area2DSW::call_queries() {
res[3] = E->key().body_shape; res[3] = E->key().body_shape;
res[4] = E->key().area_shape; res[4] = E->key().area_shape;
Map<BodyKey, BodyState>::Element *next = E->next();
monitored_bodies.erase(E);
E = next;
Variant::CallError ce; Variant::CallError ce;
obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce); obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce);
} }
} }
monitored_bodies.clear();
if (area_monitor_callback_id && !monitored_areas.empty()) { if (area_monitor_callback_id && !monitored_areas.empty()) {
Variant res[5]; Variant res[5];
@ -221,10 +225,12 @@ void Area2DSW::call_queries() {
return; return;
} }
for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E; E = E->next()) { for (Map<BodyKey, BodyState>::Element *E = monitored_areas.front(); E;) {
if (E->get().state == 0) if (E->get().state == 0) { // Nothing happened
continue; //nothing happened E = E->next();
continue;
}
res[0] = E->get().state > 0 ? Physics2DServer::AREA_BODY_ADDED : Physics2DServer::AREA_BODY_REMOVED; res[0] = E->get().state > 0 ? Physics2DServer::AREA_BODY_ADDED : Physics2DServer::AREA_BODY_REMOVED;
res[1] = E->key().rid; res[1] = E->key().rid;
@ -232,14 +238,14 @@ void Area2DSW::call_queries() {
res[3] = E->key().body_shape; res[3] = E->key().body_shape;
res[4] = E->key().area_shape; res[4] = E->key().area_shape;
Map<BodyKey, BodyState>::Element *next = E->next();
monitored_areas.erase(E);
E = next;
Variant::CallError ce; Variant::CallError ce;
obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce); obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce);
} }
} }
monitored_areas.clear();
//get_space()->area_remove_from_monitor_query_list(&monitor_query_list);
} }
Area2DSW::Area2DSW() : Area2DSW::Area2DSW() :