Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to fix "Regression in friction and damping behaviour" , see issue 752

Browse Source 
Thanks to Sergej Reich for the report and narrowing down the breaking revision!
This commit is contained in:
erwin.coumans@gmail.com
2013-10-22 09:26:08 +00:00
parent 5e372d6ac5
commit a21480c8ca
5 changed files with 84 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -973,6 +973,8 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
if (body->isActive() && (!body->isStaticOrKinematicObject()))
{
body->applyDamping(timeStep);
body->predictIntegratedTransform(timeStep, predictedTrans);
btScalar squareMotion = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2();
@@ -1119,8 +1121,6 @@ void btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
{
//don't integrate/update velocities here, it happens in the constraint solver
//damping
body->applyDamping(timeStep);
body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform());
}