diff options
| author | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
|---|---|---|
| committer | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
| commit | c78a06536ebc7c2c2718eaf800c8227bdb07a931 (patch) | |
| tree | 6e8d888dfe91c9717b85c18bca6e73d6a43789aa /scene/3d | |
| parent | ec448845e295c4b8e897793b0971ebd9912e3101 (diff) | |
| parent | 449bc14fb49d3266f5bd82dbe3c53a4b9f4062da (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/physics_body.cpp | 8 | ||||
| -rw-r--r-- | scene/3d/physics_body.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index e42a96cc4e..0733a9196e 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -434,9 +434,9 @@ void RigidBody::set_mode(Mode p_mode) { PhysicsServer::get_singleton()->body_set_mode(get_rid(),PhysicsServer::BODY_MODE_CHARACTER); } break; - case MODE_STATIC_ACTIVE: { + case MODE_KINEMATIC: { - PhysicsServer::get_singleton()->body_set_mode(get_rid(),PhysicsServer::BODY_MODE_STATIC_ACTIVE); + PhysicsServer::get_singleton()->body_set_mode(get_rid(),PhysicsServer::BODY_MODE_KINEMATIC); } break; } @@ -684,7 +684,7 @@ void RigidBody::_bind_methods() { BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:PhysicsDirectBodyState"))); - ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Rigid,Static,Character,Static Active"),_SCS("set_mode"),_SCS("get_mode")); + ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Rigid,Static,Character,Kinematic"),_SCS("set_mode"),_SCS("get_mode")); ADD_PROPERTY( PropertyInfo(Variant::REAL,"mass",PROPERTY_HINT_EXP_RANGE,"0.01,65535,0.01"),_SCS("set_mass"),_SCS("get_mass")); ADD_PROPERTY( PropertyInfo(Variant::REAL,"weight",PROPERTY_HINT_EXP_RANGE,"0.01,65535,0.01",PROPERTY_USAGE_EDITOR),_SCS("set_weight"),_SCS("get_weight")); ADD_PROPERTY( PropertyInfo(Variant::REAL,"friction",PROPERTY_HINT_RANGE,"0,1,0.01"),_SCS("set_friction"),_SCS("get_friction")); @@ -704,7 +704,7 @@ void RigidBody::_bind_methods() { ADD_SIGNAL( MethodInfo("body_exit",PropertyInfo(Variant::OBJECT,"body"))); BIND_CONSTANT( MODE_STATIC ); - BIND_CONSTANT( MODE_STATIC_ACTIVE ); + BIND_CONSTANT( MODE_KINEMATIC ); BIND_CONSTANT( MODE_RIGID ); BIND_CONSTANT( MODE_CHARACTER ); } diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 0cb24075bd..a5faa9857b 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -92,7 +92,7 @@ public: MODE_RIGID, MODE_STATIC, MODE_CHARACTER, - MODE_STATIC_ACTIVE, + MODE_KINEMATIC, }; private: |