changed friction impulse limiting approach

liabru · May 7, 2015 · de4784c · de4784c
1 parent d55c700
commit de4784c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/collision/Resolver.js b/src/collision/Resolver.js
@@ -279,10 +279,10 @@ var Resolver = {};
                 // modify impulses accounting for mass, inertia and offset
                 var oAcN = Vector.cross(offsetA, normal),
                     oBcN = Vector.cross(offsetB, normal),
-                    share = contactShare / (bodyA.inverseMass + bodyB.inverseMass + bodyA.inverseInertia * oAcN * oAcN  + bodyB.inverseInertia * oBcN * oBcN);
+                    denom = bodyA.inverseMass + bodyB.inverseMass + bodyA.inverseInertia * oAcN * oAcN  + bodyB.inverseInertia * oBcN * oBcN;
 
-                normalImpulse *= share;
-                tangentImpulse *= Math.min(share, 1);
+                normalImpulse *= contactShare / denom;
+                tangentImpulse *= contactShare / (1 + denom);
 
                 // handle high velocity and resting collisions separately
                 if (normalVelocity < 0 && normalVelocity * normalVelocity > Resolver._restingThresh * timeScaleSquared) {