diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-01 00:59:56 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-01 00:59:56 +0300 |
| commit | bab1b90edc55251ceb5e3033d588347b48cceca4 (patch) | |
| tree | 11a6863f68de3db92bbbfab77ca45c8603e5f5cf /extern | |
| parent | 9119b6e8a547303ce9a7ccd3a00636153b53cb0e (diff) | |
more game engine bug-fixes, hooked up 'formfactor' as inertia tensor tweaker, friction/restitution, more scaling related fixes.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp | 4 | ||||
| -rw-r--r-- | extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp index be6793dc192..0c400a84dca 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp @@ -27,8 +27,8 @@ SimdScalar contactTau = .02f;//0.02f;//*0.02f; SimdScalar restitutionCurve(SimdScalar rel_vel, SimdScalar restitution) { - return 0.f; -// return restitution * GEN_min(1.0f, rel_vel / ContactThreshold); +// return 0.f; + return restitution * GEN_min(1.0f, rel_vel / ContactThreshold); } diff --git a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp index b60b4eefe34..0a988adcc75 100644 --- a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp +++ b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp @@ -165,7 +165,7 @@ void ContactJoint::GetInfo2(Info2 *info) c2[2] = ccc2[2]; - float friction = 10.1f;//FRICTION_CONSTANT*m_body0->getFriction() * m_body1->getFriction(); + float friction = FRICTION_CONSTANT*m_body0->getFriction() * m_body1->getFriction(); // first friction direction if (m_numRows >= 2) |