Commit e615ccc3 authored by amandaghassaei's avatar amandaghassaei

squaremaze folding

parent 07ee3e52
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -598,7 +598,6 @@
<li><a href="#" class="demo" data-url="Tessellations/langHoneycomb.svg">Lang Honeycomb Tessellation</a></li>
<li><a href="#" class="demo" data-url="Tessellations/langOvalTessellation.svg">Lang Oval Tessellation</a></li>
<li><a href="#" class="demo" data-url="Tessellations/langHyperbolicLimit.svg">Lang Hyperbolic Limit</a></li>
<li><a href="#" class="demo" data-url="Tessellations/test.svg">test (REMOVE)</a></li>
</ul>
</li>
<li class="dropdown-submenu">
......@@ -607,6 +606,16 @@
<li><a href="#" class="demo" data-url="Curved/huffmanTower.svg">Huffman Tower</a></li>
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-1">Maze Foldings<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
<li><a href="#" class="demo" data-url="Squaremaze/helloworld.svg">Square Maze "hello world"</a></li>
<li><a href="#" class="demo" data-url="Squaremaze/origamisimulator.svg">Square Maze "origami simulator"</a></li>
<li><a href="#" class="demo" data-url="Squaremaze/cross.svg">Square Maze "+"</a></li>
<!--<li class="divider"></li>-->
</ul>
</li>
<li class="divider"></li>
<li class="dropdown-submenu">
<a tabindex="-1">Origami Bases<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
......
......@@ -19,5 +19,5 @@ $(function() {
globals.rigidSolver = initRigidSolver(globals);
globals.pattern = initPattern(globals);
globals.vive = initViveInterface(globals);
$(".demo[data-url='Tessellations/test.svg']").click();//load demo models
$(".demo[data-url='Tessellations/langHoneycomb.svg']").click();//load demo models
});
\ No newline at end of file
......@@ -445,7 +445,7 @@ function initPattern(globals){
foldData.vertices_vertices = FOLD.convert.sort_vertices_vertices(foldData);
foldData = FOLD.convert.vertices_vertices_to_faces_vertices(foldData);
foldData = reverseFaceOrder(foldData);//set faces to counter clockwise
console.log(JSON.stringify(foldData));
// console.log(JSON.stringify(foldData));
rawFold = JSON.parse(JSON.stringify(foldData));//save pre-triangulated for for save later
......
Markdown is supported
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