diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 10:23:01 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 10:23:01 +0300 |
| commit | a1481bc7e5f8b65a2d59123bf375787ef440b50c (patch) | |
| tree | 56d21d726ea8003970458ff32db9558e80bad8a7 /source/gameengine/Physics | |
| parent | e91d6895bd201d6539df9cac36473fd463eced6e (diff) | |
fix some loose ends in Bullet 2.x upgrade
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index f99a24d026e..b951602fe1e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -472,6 +472,8 @@ bool CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep) veh->SyncWheels(); } + CallbackTriggers(); + return true; } @@ -999,9 +1001,6 @@ int CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl if (rb0static && rb1static) return 0; - - btAssert(0); - btVector3 pivotInA(pivotX,pivotY,pivotZ); btVector3 pivotInB = rb1 ? rb1->getCenterOfMassTransform().inverse()(rb0->getCenterOfMassTransform()(pivotInA)) : pivotInA; btVector3 axisInA(axisX,axisY,axisZ); |