change constraint solve order

liabru · May 3, 2017 · a5bd6b2 · a5bd6b2
1 parent a8d1950
commit a5bd6b2
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/constraint/Constraint.js b/src/constraint/Constraint.js
@@ -103,9 +103,27 @@ var Common = require('../core/Common');
      * @param {number} timeScale
      */
     Constraint.solveAll = function(constraints, timeScale) {
-        for (var i = 0; i < constraints.length; i++) {
+        // Solve fixed constraints first.
+        for (var i = 0; i < constraints.length; i += 1) {
+            var constraint = constraints[i],
+                fixedA = !constraint.bodyA || (constraint.bodyA && constraint.bodyA.isStatic),
+                fixedB = !constraint.bodyB || (constraint.bodyB && constraint.bodyB.isStatic);
+
+            if (fixedA || fixedB) {
+                Constraint.solve(constraints[i], timeScale);
+            }
+        }
+
+        // Solve free constraints last.
+        for (i = 0; i < constraints.length; i += 1) {
+            constraint = constraints[i];
+            fixedA = !constraint.bodyA || (constraint.bodyA && constraint.bodyA.isStatic);
+            fixedB = !constraint.bodyB || (constraint.bodyB && constraint.bodyB.isStatic);
+
+            if (!fixedA && !fixedB) {
             Constraint.solve(constraints[i], timeScale);
         }
+        }
     };
 
     /**