Commit 6e5bede4 authored by amandaghassaei's avatar amandaghassaei
Browse files

huffman tower

parent 96528274
This diff is collapsed.
...@@ -449,8 +449,6 @@ ...@@ -449,8 +449,6 @@
<a tabindex="-1">Curved Creases<span class="pull-right fui-arrow-right"></span></a> <a tabindex="-1">Curved Creases<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu"> <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/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> </ul>
</li> </li>
<li class="divider"></li> <li class="divider"></li>
...@@ -505,14 +503,14 @@ ...@@ -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> <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> Compliant Dynamic Simulation <a class="about floatRight" href="#" id="aboutDynamicSim"><span class="fui-question-circle"></span></a>
</label> </label>
<label class="radio"> <!--<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> <!--<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> <!--Compliant Static Simulation <a class="about floatRight" href="#" id="aboutStaticSim"><span class="fui-question-circle"></span></a>-->
</label> <!--</label>-->
<label class="radio"> <!--<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> <!--<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> <!--Rigid Static Simulation <a class="about floatRight" href="#" id="aboutRigidSim"><span class="fui-question-circle"></span></a>-->
</label> <!--</label>-->
</div><br/> </div><br/>
<label class="checkbox" for="userInteractionEnabled"> <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> <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>
......
...@@ -181,7 +181,7 @@ function initRigidSolver(){ ...@@ -181,7 +181,7 @@ function initRigidSolver(){
var partial1, partial2; var partial1, partial2;
if (!crease.node1.fixed){ if (!crease.node1.fixed){
var i = indicesMapping.indexOf(crease.node1.getIndex()); var i = crease.node1.getIndex();
var dist = crease.getLengthToNode1(); var dist = crease.getLengthToNode1();
var partial1 = normal1.clone().divideScalar(dist); var partial1 = normal1.clone().divideScalar(dist);
// C[j+numFreeEdges][3*i] = partial1.x; // C[j+numFreeEdges][3*i] = partial1.x;
...@@ -192,7 +192,7 @@ function initRigidSolver(){ ...@@ -192,7 +192,7 @@ function initRigidSolver(){
F[3*i+2] -= partial1.z*rxnForceScale; F[3*i+2] -= partial1.z*rxnForceScale;
} }
if (!crease.node2.fixed){ if (!crease.node2.fixed){
var i = indicesMapping.indexOf(crease.node2.getIndex()); var i = crease.node2.getIndex();
var dist = crease.getLengthToNode2(); var dist = crease.getLengthToNode2();
var partial2 = normal2.clone().divideScalar(dist); var partial2 = normal2.clone().divideScalar(dist);
// C[j+numFreeEdges][3*i] = partial2.x; // C[j+numFreeEdges][3*i] = partial2.x;
...@@ -206,7 +206,7 @@ function initRigidSolver(){ ...@@ -206,7 +206,7 @@ function initRigidSolver(){
for (var k=0;k<creaseNodes.length;k++){ for (var k=0;k<creaseNodes.length;k++){
var node = creaseNodes[k]; var node = creaseNodes[k];
if (node.fixed) continue; 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] = -(partial1.x+partial2.x)/2;
// C[j+numFreeEdges][3*i+1] = -(partial1.y+partial2.y)/2; // C[j+numFreeEdges][3*i+1] = -(partial1.y+partial2.y)/2;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment