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

Merge pull request #8317 from RandomShaper/fix-area-monitoring-2.1

Browse Source 
Fix side effects of the bookkepping of Area/Area2D's monitoring (2.1)
This commit is contained in:
Rémi Verschelde 2017-04-08 22:47:44 +02:00 committed by GitHub
commit c9eb0f5f45
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scene/2d/area_2d.cpp
View File

@ -381,10 +381,6 @@ void Area2D::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_READY: {
is_ready = true;
} break;
case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring;
@ -392,16 +388,25 @@ void Area2D::_notification(int p_what) {
_clear_monitoring();
} break;
case NOTIFICATION_ENTER_TREE: {
if (is_ready)
set_enable_monitoring(monitoring_stored);
if (monitoring_stored) {
set_enable_monitoring(true);
monitoring_stored = false;
}
} break;
}
}
void Area2D::set_enable_monitoring(bool p_enable) {
if (!is_inside_tree()) {
monitoring_stored = p_enable;
return;
}
if (p_enable == monitoring)
return;
if (locked) {
ERR_EXPLAIN("Function blocked during in/out signal. Use call_deferred(\"set_enable_monitoring\",true/false)");
}
@ -423,7 +428,7 @@ void Area2D::set_enable_monitoring(bool p_enable) {
bool Area2D::is_monitoring_enabled() const {
return monitoring;
return monitoring || monitoring_stored;
}
void Area2D::set_monitorable(bool p_enable) {
@ -652,7 +657,6 @@ Area2D::Area2D()
collision_mask = 1;
layer_mask = 1;
monitoring_stored = false;
is_ready = false;
set_enable_monitoring(true);
set_monitorable(true);
}

1
scene/2d/area_2d.h
View File

@ -61,7 +61,6 @@ private:
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);

19
scene/3d/area.cpp
View File

@ -275,10 +275,6 @@ void Area::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_READY: {
is_ready = true;
} break;
case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring;
@ -286,8 +282,11 @@ void Area::_notification(int p_what) {
_clear_monitoring();
} break;
case NOTIFICATION_ENTER_TREE: {
if (is_ready)
set_enable_monitoring(monitoring_stored);
if (monitoring_stored) {
set_enable_monitoring(true);
monitoring_stored = false;
}
} break;
}
}
@ -299,6 +298,11 @@ void Area::set_enable_monitoring(bool p_enable) {
}
ERR_FAIL_COND(locked);
if (!is_inside_tree()) {
monitoring_stored = p_enable;
return;
}
if (p_enable == monitoring)
return;
@ -419,7 +423,7 @@ void Area::_area_inout(int p_status, const RID &p_area, int p_instance, int p_ar
bool Area::is_monitoring_enabled() const {
return monitoring;
return monitoring || monitoring_stored;
}
Array Area::get_overlapping_bodies() const {
@ -645,7 +649,6 @@ Area::Area()
collision_mask = 1;
layer_mask = 1;
monitoring_stored = false;
is_ready = false;
set_ray_pickable(false);
set_enable_monitoring(true);
set_monitorable(true);

1
scene/3d/area.h
View File

@ -61,7 +61,6 @@ private:
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);