diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-02-21 08:36:56 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-02-21 08:36:56 +0300 |
| commit | 90e5a9aa14273dfdca96d3217f0d02b722c0f913 (patch) | |
| tree | cfa3fb8bd716f96cfa2d1a80858462299be287ff /source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | |
| parent | a6e7ff5ee99bab7449aff3919550df3b3f52bfca (diff) | |
Reorganized Bullet physics files, added preliminary vehicle simulation files (disabled).
Requires some changes to projectfiles/makefiles/scons, for the added and removed files!
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index fb268a6f95a..73b49150414 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -662,6 +662,7 @@ void KX_ConvertODEEngineObject(KX_GameObject* gameobj, #include "CcdPhysicsEnvironment.h" #include "CcdPhysicsController.h" +#include "BroadphaseCollision/BroadphaseInterface.h" #include "KX_BulletPhysicsController.h" #include "CollisionShapes/BoxShape.h" @@ -1010,8 +1011,9 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, bm->SetMargin(0.06); ci.m_collisionShape = bm; - ci.m_broadphaseHandle = 0; - ci.m_friction = 5.f* smmaterial->m_friction;//tweak the friction a bit, so the default 0.5 works nice + + + ci.m_friction = smmaterial->m_friction;//tweak the friction a bit, so the default 0.5 works nice ci.m_restitution = smmaterial->m_restitution; ci.m_physicsEnv = env; // drag / damping is inverted @@ -1028,6 +1030,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, } + gameobj->SetPhysicsController(physicscontroller,isbulletdyna); physicscontroller->setNewClientInfo(gameobj->getClientInfo()); bool isActor = objprop->m_isactor; |