huffman tower

index.html

@@ -449,8 +449,6 @@
                         <a tabindex="-1">Curved Creases<span class="pull-right fui-arrow-right"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="#" class="demo" data-url="Curved/huffmanTower.svg">Huffman Tower</a></li>
-                            <li><a href="#" class="demo" data-url="Curved/creaseMesh.txt">Curved Crease 1</a></li>
-                            <li><a href="#" class="demo" data-url="Curved/curvedcrease2.svg">Curved Crease 2</a></li>
                         </ul>
                     </li>
                     <li class="divider"></li>
@@ -505,14 +503,14 @@
             <input name="simType" value="dynamic" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
             Compliant Dynamic Simulation <a class="about floatRight" href="#" id="aboutDynamicSim"><span class="fui-question-circle"></span></a>
         </label>
-        <label class="radio">
-            <input name="simType" value="static" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
-            Compliant Static Simulation <a class="about floatRight" href="#" id="aboutStaticSim"><span class="fui-question-circle"></span></a>
-        </label>
-        <label class="radio">
-            <input name="simType" value="rigid" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
-            Rigid Static Simulation <a class="about floatRight" href="#" id="aboutRigidSim"><span class="fui-question-circle"></span></a>
-        </label>
+        <!--<label class="radio">-->
+            <!--<input name="simType" value="static" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>-->
+            <!--Compliant Static Simulation <a class="about floatRight" href="#" id="aboutStaticSim"><span class="fui-question-circle"></span></a>-->
+        <!--</label>-->
+        <!--<label class="radio">-->
+            <!--<input name="simType" value="rigid" data-toggle="radio" class="custom-radio" type="radio"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>-->
+            <!--Rigid Static Simulation <a class="about floatRight" href="#" id="aboutRigidSim"><span class="fui-question-circle"></span></a>-->
+        <!--</label>-->
     </div><br/>
     <label class="checkbox" for="userInteractionEnabled">
         <input id="userInteractionEnabled" data-toggle="checkbox" class="custom-checkbox layersSelector" type="checkbox"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>

js/rigidSolver.js

@@ -181,7 +181,7 @@ function initRigidSolver(){
             var partial1, partial2;
 
             if (!crease.node1.fixed){
-                var i = indicesMapping.indexOf(crease.node1.getIndex());
+                var i = crease.node1.getIndex();
                 var dist = crease.getLengthToNode1();
                 var partial1 = normal1.clone().divideScalar(dist);
                 // C[j+numFreeEdges][3*i] = partial1.x;
@@ -192,7 +192,7 @@ function initRigidSolver(){
                 F[3*i+2] -= partial1.z*rxnForceScale;
             }
             if (!crease.node2.fixed){
-                var i = indicesMapping.indexOf(crease.node2.getIndex());
+                var i = crease.node2.getIndex();
                 var dist = crease.getLengthToNode2();
                 var partial2 = normal2.clone().divideScalar(dist);
                 // C[j+numFreeEdges][3*i] = partial2.x;
@@ -206,7 +206,7 @@ function initRigidSolver(){
             for (var k=0;k<creaseNodes.length;k++){
                 var node = creaseNodes[k];
                 if (node.fixed) continue;
-                var i = indicesMapping.indexOf(node.getIndex());
+                var i = node.getIndex();
 
                 // C[j+numFreeEdges][3*i] = -(partial1.x+partial2.x)/2;
                 // C[j+numFreeEdges][3*i+1] = -(partial1.y+partial2.y)/2;