small changes

amandaghassaei · May 28, 2017 · 9652827 · 9652827
1 parent 1cc36b5
commit 9652827
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/js/controls.js b/js/controls.js
@@ -124,7 +124,7 @@ function initControls(globals){
 
     setRadio("simType", globals.simType, function(val){
         globals.simType = val;
-        globals.needsSync = true;
+        globals.simNeedsSync = true;
     });
 
     setSliderInput("#axialStiffness", globals.axialStiffness, 10, 40, 1, function(val){

diff --git a/js/globals.js b/js/globals.js
@@ -34,6 +34,7 @@ function initGlobals(){
         shouldZeroDynamicVelocity: false,
         shouldCenterGeo: false,
         needsSync: false,
+        simNeedsSync: false,
 
         //3d vis
         simType: "dynamic",

diff --git a/js/model.js b/js/model.js
@@ -184,6 +184,7 @@ function initModel(globals){
         nextFaces = _faces;
 
         globals.needsSync = true;
+        globals.simNeedsSync = true;
 
         if (!inited) {
             startSolver();//start animation loop
@@ -292,11 +293,17 @@ function initModel(globals){
         updateEdgeVisibility();
         updateMeshVisibility();
 
-        getSolver().syncNodesAndEdges();
+        syncSolver();
 
+        globals.needsSync = false;
         if (!globals.simulationRunning) reset();
     }
 
+    function syncSolver(){
+        getSolver().syncNodesAndEdges();
+        globals.simNeedsSync = false;
+    }
+
     function getNodes(){
         return nodes;
     }
@@ -336,6 +343,7 @@ function initModel(globals){
 
         buildModel: buildModel,//load new model
         sync: sync,//update geometry to new model
+        syncSolver: syncSolver,//update solver params
 
         //rendering
         setMeshMaterial: setMeshMaterial,

diff --git a/js/rigidSolver.js b/js/rigidSolver.js
@@ -163,8 +163,8 @@ function initRigidSolver(){
         }
 
 
-        for (var j=0;j<numFreeCreases;j++){
-            var crease = creases[freeCreasesMapping[j]];
+        for (var j=0;j<creases.length;j++){
+            var crease = creases[j];
             var normal1 = normals[crease.face1Index];
             var normal2 = normals[crease.face2Index];
             var dotNormals = normal1.dot(normal2);

diff --git a/js/threeView.js b/js/threeView.js
@@ -106,7 +106,9 @@ function initThreeView(globals) {
     function _loop(callback){
         if (globals.needsSync){
             globals.model.sync();
-            globals.needsSync = false;
+        }
+        if (globals.simNeedsSync){
+            globals.model.syncSolver();
         }
         if (globals.simulationRunning) callback();
         if (globals.vrEnabled){