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

Merge pull request #7934 from lonesurvivor/area2d-fix_2.1

Browse Source 
2.1: Fixes two problems with Area2D and remove_child()
This commit is contained in:
Rémi Verschelde 2017-03-04 16:57:23 +01:00 committed by GitHub
commit c58c490d45
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scene/2d/area_2d.cpp
View File

@ -357,6 +357,10 @@ void Area2D::_clear_monitoring() {
Object *obj = ObjectDB::get_instance(E->key()); Object *obj = ObjectDB::get_instance(E->key());
Node *node = obj ? obj->cast_to<Node>() : NULL; Node *node = obj ? obj->cast_to<Node>() : NULL;
ERR_CONTINUE(!node); ERR_CONTINUE(!node);
node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree);
if (!E->get().in_tree) if (!E->get().in_tree)
continue; continue;
@ -367,8 +371,6 @@ void Area2D::_clear_monitoring() {
emit_signal(SceneStringNames::get_singleton()->body_exit,obj); emit_signal(SceneStringNames::get_singleton()->body_exit,obj);
node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree);
} }
} }
@ -388,6 +390,9 @@ void Area2D::_clear_monitoring() {
continue; continue;
//ERR_CONTINUE(!node); //ERR_CONTINUE(!node);
node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_area_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_area_exit_tree);
if (!E->get().in_tree) if (!E->get().in_tree)
continue; continue;
@ -397,9 +402,6 @@ void Area2D::_clear_monitoring() {
} }
emit_signal(SceneStringNames::get_singleton()->area_exit,obj); emit_signal(SceneStringNames::get_singleton()->area_exit,obj);
node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_area_enter_tree);
node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_area_exit_tree);
} }
} }
@ -411,8 +413,14 @@ void Area2D::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring;
set_enable_monitoring(false);
_clear_monitoring(); _clear_monitoring();
} break; } break;
case NOTIFICATION_ENTER_TREE: {
set_enable_monitoring(monitoring_stored);
} break;
} }
} }
@ -686,6 +694,7 @@ Area2D::Area2D() : CollisionObject2D(Physics2DServer::get_singleton()->area_crea
monitorable=false; monitorable=false;
collision_mask=1; collision_mask=1;
layer_mask=1; layer_mask=1;
monitoring_stored = true;
set_enable_monitoring(true); set_enable_monitoring(true);
set_monitorable(true); set_monitorable(true);
} }

1
scene/2d/area_2d.h
View File

@ -58,6 +58,7 @@ private:
uint32_t layer_mask; uint32_t layer_mask;
int priority; int priority;
bool monitoring; bool monitoring;
bool monitoring_stored;
bool monitorable; bool monitorable;
bool locked; bool locked;