diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-03-29 00:55:44 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-03-29 00:55:44 +0400 |
| commit | 6f974329caed7c331da79e9b1b72047331449b98 (patch) | |
| tree | a20c0922b3580a0706744a84037e0dda60a5930a /extern/bullet | |
| parent | 7c68db9bb74e36fecb1b41d4fb6d842b9938413e (diff) | |
disabled restitution in the new iterative contact constraint.
Diffstat (limited to 'extern/bullet')
| -rw-r--r-- | extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp index 1aaa9732d16..8d42d0d5a95 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp @@ -33,7 +33,8 @@ SimdScalar contactTau = .02f;//0.02f;//*0.02f; SimdScalar restitutionCurve(SimdScalar rel_vel, SimdScalar restitution) { - return restitution * GEN_min(1.0f, rel_vel / ContactThreshold); + return 0.f; + //return restitution * GEN_min(1.0f, rel_vel / ContactThreshold); } |