Kalakoi/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-15 02:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply same logic to Area with Area2D

Browse Source 
comes from 5b556ca and 73f53a7
This commit is contained in:
volzhs
2017-04-04 10:37:45 +09:00
parent 73f53a7918
commit 6222821535
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scene/3d/area.cpp
View File

@@ -227,6 +227,10 @@ void Area::_clear_monitoring() {
Object *obj = ObjectDB::get_instance(E->key());
Node *node = obj ? obj->cast_to<Node>() : NULL;
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)
continue;
@@ -236,9 +240,6 @@ void Area::_clear_monitoring() {
}
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);
}
}
@@ -253,6 +254,10 @@ void Area::_clear_monitoring() {
Object *obj = ObjectDB::get_instance(E->key());
Node *node = obj ? obj->cast_to<Node>() : NULL;
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)
continue;
@@ -262,16 +267,27 @@ void Area::_clear_monitoring() {
}
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);
}
}
}
void Area::_notification(int p_what) {
if (p_what == NOTIFICATION_EXIT_TREE) {
_clear_monitoring();
switch (p_what) {
case NOTIFICATION_READY: {
is_ready = true;
} break;
case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring;
set_enable_monitoring(false);
_clear_monitoring();
} break;
case NOTIFICATION_ENTER_TREE: {
if (is_ready)
set_enable_monitoring(monitoring_stored);
} break;
}
}
@@ -627,6 +643,8 @@ Area::Area()
monitoring = false;
collision_mask = 1;
layer_mask = 1;
monitoring_stored = false;
is_ready = false;
set_ray_pickable(false);
set_enable_monitoring(true);
set_monitorable(true);

2
scene/3d/area.h
View File

@@ -57,8 +57,10 @@ private:
uint32_t layer_mask;
int priority;
bool monitoring;
bool monitoring_stored;
bool monitorable;
bool locked;
bool is_ready;
void _body_inout(int p_status, const RID &p_body, int p_instance, int p_body_shape, int p_area_shape);