Commit 3076a1bb authored by amandaghassaei's avatar amandaghassaei

cleaning up

parent 90f2c702
......@@ -2,7 +2,7 @@
Live demo at <a href="http://apps.amandaghassaei.com/OrigamiSimulator">apps.amandaghassaei.com/OrigamiSimulator</a><br/>
<img src="crane.gif" />
<img src="assets/doc/crane.gif" />
This app allows you to simulate how any origami crease pattern will fold. It may look a little different
from what you typically think of as "origami" - rather than folding paper in a set of sequential steps,
......@@ -14,7 +14,7 @@ exerted by creases. This solver extends work from the following sources: <br/><
All simulation methods were written from scratch and are executed in parallel in several GPU fragment shaders for fast performance.
</p><br/>
<b>Instructions:</b><br/><br/>
<img style="width: 100%; max-width:600px" src="demoui.gif" /><br/>
<img style="width: 100%; max-width:600px" src="assets/doc/demoui.gif" /><br/>
<ul>
<li>Slide the <b>Fold Percent</b> slider to control the degree of folding of the pattern (100% is fully folded, 0% is unfolded,
and -100% is fully folded with the opposite mountain/valley assignments).</li>
......@@ -23,11 +23,11 @@ All simulation methods were written from scratch and are executed in parallel in
<li>Upload your own crease patterns in SVG or <a href="https://github.com/edemaine/fold" target="_blank">FOLD</a> formats, following the instructions under <b>File > File Import Tips</b>.</li>
<li>Export FOLD files or 3D models ( STL or OBJ ) of the folded state of your design ( <b>File > Save Simulation as...</b> ).</li>
</ul>
<img style="width: 100%;" src="strain.jpg" />
<img style="width: 100%;" src="assets/doc/strain.jpg" />
<ul>
<li>Visualize the internal strain of the origami as it folds using the <b>Strain Visualization</b> in the left menu.</li>
</ul>
<img src="huffmanvr.jpg" /><br/>
<img src="assets/doc/huffmanvr.jpg" /><br/>
<ul>
<li>If you are working from a computer connected to a Vive, follow the instructions near the <b>VR</b> menu
to use this app in an interactive virtual reality mode.</li>
......
......@@ -790,7 +790,7 @@
<p>
<b>ORIGAMI SIMULATOR</b><br/>
<img style="width: 100%; max-width:500px" src="crane.gif" />
<img style="width: 100%; max-width:500px" src="assets/doc/crane.gif" />
This app allows you to simulate how any origami crease pattern will fold. It may look a little different
from what you typically think of as "origami" - rather than folding paper in a set of sequential steps,
......@@ -806,7 +806,7 @@
make good demo files, please send them to me (Amanda) so I can add them to the <b>Examples</b> menu. My email address is on my website. Thanks!<br/>
</p><br/>
<b>Instructions:</b><br/><br/>
<img style="width: 100%; max-width:600px" src="demoui.gif" /><br/>
<img style="width: 100%; max-width:600px" src="assets/doc/demoui.gif" /><br/>
<ul>
<li>Slide the <b>Fold Percent</b> slider to control the degree of folding of the pattern (100% is fully folded, 0% is unfolded,
......@@ -816,11 +816,11 @@
<li>Upload your own crease patterns in SVG or <a href="https://github.com/edemaine/fold" target="_blank">FOLD</a> formats, following <a href="#" class="goToImportInstructions">these instructions</a>.</li>
<li>Export FOLD files or 3D models ( STL or OBJ ) of the folded state of your design ( <b>File > Save Simulation as...</b> ).</li>
</ul>
<img style="width: 100%;" src="strain.jpg" />
<img style="width: 100%;" src="assets/doc/strain.jpg" />
<ul>
<li>Visualize the internal strain of the origami as it folds using the <b>Strain Visualization</b> in the left menu.</li>
</ul>
<img style="width: 100%; max-width:600px" src="huffmanvr.jpg" /><br/>
<img style="width: 100%; max-width:600px" src="assets/doc/huffmanvr.jpg" /><br/>
<ul>
<li>If you are working from a computer connected to a VR headset and hand controllers, follow <a href="#" id="goToViveInstructions">these instructions</a>
to use this app in an interactive virtual reality mode.</li>
......@@ -854,8 +854,8 @@
<nav id="globalNav" class="navbar navbar-inverse navbar-embossed" role="navigation">
<div class="navbar-header">
<a id="logo" class="navbar-brand" target="_blank" href="http://cba.mit.edu/">
<img id="inactiveLogo" src="logo.png"/>
<img id="activeLogo" src="logo-active.png"/>
<img id="inactiveLogo" src="assets/logo.png"/>
<img id="activeLogo" src="assets/logo-active.png"/>
</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-01">
......
......@@ -124,8 +124,5 @@ function initGlobals(){
}
_globals.noCreasePatternAvailable = noCreasePatternAvailable;
_globals.threeView = initThreeView(_globals);
_globals.controls = initControls(_globals);
return _globals;
}
\ No newline at end of file
......@@ -18,14 +18,17 @@ $(function() {
// }
globals = initGlobals();
globals.threeView = initThreeView(globals);
globals.controls = initControls(globals);
globals.UI3D = init3DUI(globals);
globals.importer = initImporter(globals);
globals.model = initModel(globals);
globals.staticSolver = initStaticSolver(globals);
// globals.staticSolver = initStaticSolver(globals);//still in development
globals.dynamicSolver = initDynamicSolver(globals);
globals.rigidSolver = initRigidSolver(globals);
// globals.rigidSolver = initRigidSolver(globals);//still in development
globals.pattern = initPattern(globals);
globals.vive = initViveInterface(globals);
globals.videoAnimator = initVideoAnimator(globals);
$(".demo[data-url='Tessellations/huffmanWaterbomb.svg']").click();//load demo models
$(".demo[data-url='Tessellations/huffmanWaterbomb.svg']").click();//load demo model
});
\ No newline at end of file
......@@ -185,7 +185,7 @@ function initPattern(globals){
var pathVertices = [];
if (path === undefined || path.getPathData === undefined){//mobile problem
var elm = '<div id="coverImg" ' +
'style="background: url(crane.gif) no-repeat center center fixed;' +
'style="background: url(assets/doc/crane.gif) no-repeat center center fixed;' +
'-webkit-background-size: cover;' +
'-moz-background-size: cover;' +
'-o-background-size: cover;' +
......
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