diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp')
-rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp index 88859182925..9d60d9957a5 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp @@ -70,7 +70,7 @@ void btContactConstraint::buildJacobian() -//response between two dynamic objects without friction, assuming 0 penetration depth +//response between two dynamic objects without friction and no restitution, assuming 0 penetration depth btScalar resolveSingleCollision( btRigidBody* body1, btCollisionObject* colObj2, @@ -93,7 +93,7 @@ btScalar resolveSingleCollision( btScalar rel_vel; rel_vel = normal.dot(vel); - btScalar combinedRestitution = body1->getRestitution() * colObj2->getRestitution(); + btScalar combinedRestitution = 0.f; btScalar restitution = combinedRestitution* -rel_vel; btScalar positionalError = solverInfo.m_erp *-distance /solverInfo.m_timeStep ; |