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

Remove area or body from map before emitting signals.

Browse source
This commit is contained in:
Marcel Admiraal 2020-10-02 16:07:53 +01:00
parent 7ef6aa7342
commit be41b818c4
2 changed files with 15 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scene/2d/area_2d.cpp
View file

@ -193,25 +193,19 @@ void Area2D::_body_inout(int p_status, const RID &p_body, int p_instance, int p_
if (node) if (node)
E->get().shapes.erase(ShapePair(p_body_shape, p_area_shape)); E->get().shapes.erase(ShapePair(p_body_shape, p_area_shape));
bool eraseit = false; bool in_tree = E->get().in_tree;
if (E->get().rc == 0) { if (E->get().rc == 0) {
body_map.erase(E);
if (node) { if (node) {
node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_body_enter_tree); node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_body_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree); node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);
if (E->get().in_tree) if (in_tree)
emit_signal(SceneStringNames::get_singleton()->body_exited, obj); emit_signal(SceneStringNames::get_singleton()->body_exited, obj);
} }
eraseit = true;
} }
if (!node || E->get().in_tree) { if (!node || in_tree) {
emit_signal(SceneStringNames::get_singleton()->body_shape_exited, objid, obj, p_body_shape, p_area_shape); emit_signal(SceneStringNames::get_singleton()->body_shape_exited, objid, obj, p_body_shape, p_area_shape);
} }
if (eraseit)
body_map.erase(E);
} }
locked = false; locked = false;
@ -295,25 +289,19 @@ void Area2D::_area_inout(int p_status, const RID &p_area, int p_instance, int p_
if (node) if (node)
E->get().shapes.erase(AreaShapePair(p_area_shape, p_self_shape)); E->get().shapes.erase(AreaShapePair(p_area_shape, p_self_shape));
bool eraseit = false; bool in_tree = E->get().in_tree;
if (E->get().rc == 0) { if (E->get().rc == 0) {
area_map.erase(E);
if (node) { if (node) {
node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_area_enter_tree); node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_area_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_area_exit_tree); node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_area_exit_tree);
if (E->get().in_tree) if (in_tree)
emit_signal(SceneStringNames::get_singleton()->area_exited, obj); emit_signal(SceneStringNames::get_singleton()->area_exited, obj);
} }
eraseit = true;
} }
if (!node || E->get().in_tree) { if (!node || in_tree) {
emit_signal(SceneStringNames::get_singleton()->area_shape_exited, objid, obj, p_area_shape, p_self_shape); emit_signal(SceneStringNames::get_singleton()->area_shape_exited, objid, obj, p_area_shape, p_self_shape);
} }
if (eraseit)
area_map.erase(E);
} }
locked = false; locked = false;

26
scene/3d/area.cpp
View file

@ -192,25 +192,19 @@ void Area::_body_inout(int p_status, const RID &p_body, int p_instance, int p_bo
if (node) if (node)
E->get().shapes.erase(ShapePair(p_body_shape, p_area_shape)); E->get().shapes.erase(ShapePair(p_body_shape, p_area_shape));
bool eraseit = false; bool in_tree = E->get().in_tree;
if (E->get().rc == 0) { if (E->get().rc == 0) {
body_map.erase(E);
if (node) { if (node) {
node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_body_enter_tree); node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_body_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree); node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree);
if (E->get().in_tree) if (in_tree)
emit_signal(SceneStringNames::get_singleton()->body_exited, obj); emit_signal(SceneStringNames::get_singleton()->body_exited, obj);
} }
eraseit = true;
} }
if (node && E->get().in_tree) { if (node && in_tree) {
emit_signal(SceneStringNames::get_singleton()->body_shape_exited, objid, obj, p_body_shape, p_area_shape); emit_signal(SceneStringNames::get_singleton()->body_shape_exited, objid, obj, p_body_shape, p_area_shape);
} }
if (eraseit)
body_map.erase(E);
} }
locked = false; locked = false;
@ -385,10 +379,9 @@ void Area::_area_inout(int p_status, const RID &p_area, int p_instance, int p_ar
if (node) if (node)
E->get().shapes.erase(AreaShapePair(p_area_shape, p_self_shape)); E->get().shapes.erase(AreaShapePair(p_area_shape, p_self_shape));
bool eraseit = false; bool in_tree = E->get().in_tree;
if (E->get().rc == 0) { if (E->get().rc == 0) {
area_map.erase(E);
if (node) { if (node) {
node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_area_enter_tree); node->disconnect(SceneStringNames::get_singleton()->tree_entered, this, SceneStringNames::get_singleton()->_area_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_area_exit_tree); node->disconnect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_area_exit_tree);
@ -396,15 +389,10 @@ void Area::_area_inout(int p_status, const RID &p_area, int p_instance, int p_ar
emit_signal(SceneStringNames::get_singleton()->area_exited, obj); emit_signal(SceneStringNames::get_singleton()->area_exited, obj);
} }
} }
eraseit = true;
} }
if (!node || E->get().in_tree) { if (!node || in_tree) {
emit_signal(SceneStringNames::get_singleton()->area_shape_exited, objid, obj, p_area_shape, p_self_shape); emit_signal(SceneStringNames::get_singleton()->area_shape_exited, objid, obj, p_area_shape, p_self_shape);
} }
if (eraseit)
area_map.erase(E);
} }
locked = false; locked = false;