godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

sleeping property now should work properly, fixes #1892

Browse Source
This commit is contained in:
Juan Linietsky
2015-05-16 17:54:36 -03:00
parent 8482611f81
commit bbe9a37f1d
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/physics/body_sw.cpp
View File

@@ -257,6 +257,8 @@ void BodySW::set_state(PhysicsServer::BodyState p_state, const Variant& p_varian
Transform t = p_variant; Transform t = p_variant;
t.orthonormalize(); t.orthonormalize();
new_transform=get_transform(); //used as old to compute motion new_transform=get_transform(); //used as old to compute motion
if (new_transform==t)
break;
_set_transform(t); _set_transform(t);
_set_inv_transform(get_transform().inverse()); _set_inv_transform(get_transform().inverse());

2
servers/physics/body_sw.h
View File

@@ -201,7 +201,7 @@ public:
_FORCE_INLINE_ bool is_active() const { return active; } _FORCE_INLINE_ bool is_active() const { return active; }
_FORCE_INLINE_ void wakeup() { _FORCE_INLINE_ void wakeup() {
if ((get_space() && active) || mode==PhysicsServer::BODY_MODE_STATIC || mode==PhysicsServer::BODY_MODE_KINEMATIC) if ((!get_space()) || mode==PhysicsServer::BODY_MODE_STATIC || mode==PhysicsServer::BODY_MODE_KINEMATIC)
return; return;
set_active(true); set_active(true);
} }

2
servers/physics_2d/body_2d_sw.cpp
View File

@@ -275,6 +275,8 @@ void Body2DSW::set_state(Physics2DServer::BodyState p_state, const Variant& p_va
Matrix32 t = p_variant; Matrix32 t = p_variant;
t.orthonormalize(); t.orthonormalize();
new_transform=get_transform(); //used as old to compute motion new_transform=get_transform(); //used as old to compute motion
if (t==new_transform)
break;
_set_transform(t); _set_transform(t);
_set_inv_transform(get_transform().inverse()); _set_inv_transform(get_transform().inverse());

2
servers/physics_2d/body_2d_sw.h
View File

@@ -203,7 +203,7 @@ public:
_FORCE_INLINE_ bool is_active() const { return active; } _FORCE_INLINE_ bool is_active() const { return active; }
_FORCE_INLINE_ void wakeup() { _FORCE_INLINE_ void wakeup() {
if ((get_space() && active) || mode==Physics2DServer::BODY_MODE_STATIC || mode==Physics2DServer::BODY_MODE_KINEMATIC) if ((!get_space()) || mode==Physics2DServer::BODY_MODE_STATIC || mode==Physics2DServer::BODY_MODE_KINEMATIC)
return; return;
set_active(true); set_active(true);
} }