kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix some loose ends in Bullet 2.x upgrade

Browse Source
This commit is contained in:
Erwin Coumans 2006-11-29 07:23:01 +00:00
parent e91d6895bd
commit a1481bc7e5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -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);