optimised Pair.update

liabru · Apr 29, 2021 · 1073dde · 1073dde
1 parent 48673db
commit 1073dde
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/collision/Pair.js b/src/collision/Pair.js
@@ -65,10 +65,10 @@ var Contact = require('./Contact');
 
         pair.collision = collision;
         pair.inverseMass = parentA.inverseMass + parentB.inverseMass;
-        pair.friction = Math.min(parentA.friction, parentB.friction);
-        pair.frictionStatic = Math.max(parentA.frictionStatic, parentB.frictionStatic);
-        pair.restitution = Math.max(parentA.restitution, parentB.restitution);
-        pair.slop = Math.max(parentA.slop, parentB.slop);
+        pair.friction = parentA.friction < parentB.friction ? parentA.friction : parentB.friction;
+        pair.frictionStatic = parentA.frictionStatic > parentB.frictionStatic ? parentA.frictionStatic : parentB.frictionStatic;
+        pair.restitution = parentA.restitution > parentB.restitution ? parentA.restitution : parentB.restitution;
+        pair.slop = parentA.slop > parentB.slop ? parentA.slop : parentB.slop;
         activeContacts.length = 0;
 
         if (collision.collided) {