diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 03:53:40 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 03:53:40 +0300 |
| commit | 46234f90cee9b3967cb6361661ce47b455cbaa57 (patch) | |
| tree | 8f32252f55c29694c1fa619d00a67ea4b4941099 /source/gameengine/Ketsji/KX_BulletPhysicsController.cpp | |
| parent | 4bbbabd04957d6564d43b076e1e144f0bb4da439 (diff) | |
Removed old Blender/extern/bullet, and upgraded game engine to use Bullet 2.x
All platforms/build systems: either upgrade to use extern/bullet2, or disable the game engine until the build is fixed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_BulletPhysicsController.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BulletPhysicsController.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp index 54f8060c582..d28a8f40d6f 100644 --- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp +++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp @@ -5,8 +5,7 @@ #include "KX_BulletPhysicsController.h" -#include "Dynamics/RigidBody.h" - +#include "btBulletDynamicsCommon.h" #include "SG_Spatial.h" #include "KX_GameObject.h" @@ -59,7 +58,7 @@ void KX_BulletPhysicsController::SetObject (SG_IObject* object) } -void KX_BulletPhysicsController::SetMargin (float collisionMargin) +void KX_BulletPhysicsController::setMargin (float collisionMargin) { CcdPhysicsController::SetMargin(collisionMargin); } @@ -144,12 +143,12 @@ void KX_BulletPhysicsController::setRigidBody(bool rigid) void KX_BulletPhysicsController::SuspendDynamics() { - GetRigidBody()->SetActivationState(DISABLE_SIMULATION); + GetRigidBody()->setActivationState(DISABLE_SIMULATION); } void KX_BulletPhysicsController::RestoreDynamics() { - GetRigidBody()->ForceActivationState(ACTIVE_TAG); + GetRigidBody()->forceActivationState(ACTIVE_TAG); } SG_Controller* KX_BulletPhysicsController::GetReplica(class SG_Node* destnode) |