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

Send body inout notifications after state is applied, fixes #4683 

(cherry picked from commit 95dc15b750)
This commit is contained in:
Juan Linietsky 2016-06-17 16:45:10 -03:00 committed by Rémi Verschelde
parent f5d3d9cc5f
commit 7b36595641
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/2d/physics_body_2d.cpp
View File

@ -450,6 +450,19 @@ void RigidBody2D::_direct_state_changed(Object *p_state) {
state=(Physics2DDirectBodyState*)p_state; //trust it state=(Physics2DDirectBodyState*)p_state; //trust it
#endif #endif
set_block_transform_notify(true); // don't want notify (would feedback loop)
if (mode!=MODE_KINEMATIC)
set_global_transform(state->get_transform());
linear_velocity=state->get_linear_velocity();
angular_velocity=state->get_angular_velocity();
if(sleeping!=state->is_sleeping()) {
sleeping=state->is_sleeping();
emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
}
if (get_script_instance())
get_script_instance()->call("_integrate_forces",state);
set_block_transform_notify(false); // want it back
if (contact_monitor) { if (contact_monitor) {
contact_monitor->locked=true; contact_monitor->locked=true;
@ -539,18 +552,7 @@ void RigidBody2D::_direct_state_changed(Object *p_state) {
} }
set_block_transform_notify(true); // don't want notify (would feedback loop)
if (mode!=MODE_KINEMATIC)
set_global_transform(state->get_transform());
linear_velocity=state->get_linear_velocity();
angular_velocity=state->get_angular_velocity();
if(sleeping!=state->is_sleeping()) {
sleeping=state->is_sleeping();
emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
}
if (get_script_instance())
get_script_instance()->call("_integrate_forces",state);
set_block_transform_notify(false); // want it back
state=NULL; state=NULL;
} }

24
scene/3d/physics_body.cpp
View File

@ -328,6 +328,18 @@ void RigidBody::_direct_state_changed(Object *p_state) {
state=(PhysicsDirectBodyState*)p_state; //trust it state=(PhysicsDirectBodyState*)p_state; //trust it
#endif #endif
set_ignore_transform_notification(true);
set_global_transform(state->get_transform());
linear_velocity=state->get_linear_velocity();
angular_velocity=state->get_angular_velocity();
if(sleeping!=state->is_sleeping()) {
sleeping=state->is_sleeping();
emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
}
if (get_script_instance())
get_script_instance()->call("_integrate_forces",state);
set_ignore_transform_notification(false);
if (contact_monitor) { if (contact_monitor) {
contact_monitor->locked=true; contact_monitor->locked=true;
@ -415,17 +427,7 @@ void RigidBody::_direct_state_changed(Object *p_state) {
} }
set_ignore_transform_notification(true);
set_global_transform(state->get_transform());
linear_velocity=state->get_linear_velocity();
angular_velocity=state->get_angular_velocity();
if(sleeping!=state->is_sleeping()) {
sleeping=state->is_sleeping();
emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
}
if (get_script_instance())
get_script_instance()->call("_integrate_forces",state);
set_ignore_transform_notification(false);
state=NULL; state=NULL;
} }