Commit dbf1ac88 authored by amandaghassaei's avatar amandaghassaei

small changes

parent a37882cd
...@@ -45,6 +45,8 @@ All simulation methods were written from scratch and are executed in parallel in ...@@ -45,6 +45,8 @@ All simulation methods were written from scratch and are executed in parallel in
<li>GIF and WebM video export uses <a target="_blank" href="https://github.com/spite/ccapture.js/">CCapture</a></li> <li>GIF and WebM video export uses <a target="_blank" href="https://github.com/spite/ccapture.js/">CCapture</a></li>
<li>Portability to multiple VR controllers by <a target="_blank" href="https://github.com/stewdio/THREE.VRController">THREE.VRController.js</a></li> <li>Portability to multiple VR controllers by <a target="_blank" href="https://github.com/stewdio/THREE.VRController">THREE.VRController.js</a></li>
<li>VR GUI by <a href="https://github.com/dataarts/dat.guiVR" target="_blank">dat.guiVR</a></li> <li>VR GUI by <a href="https://github.com/dataarts/dat.guiVR" target="_blank">dat.guiVR</a></li>
<li><a href="http://www.numericjs.com/" target="_blank">numeric.js</a> for linear algebra operations</li>
<li><a href="https://github.com/eligrey/FileSaver.js/" target="_blank">FileSaver</a> for client-side file saving</li>
<li><a target="_blank" href="https://jquery.com/">jQuery</a>, <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>, and the <li><a target="_blank" href="https://jquery.com/">jQuery</a>, <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>, and the
<a target="_blank" href="http://designmodo.github.io/Flat-UI/">Flat UI theme</a> used to build the GUI</li> <a target="_blank" href="http://designmodo.github.io/Flat-UI/">Flat UI theme</a> used to build the GUI</li>
</ul> </ul>
......
...@@ -742,7 +742,7 @@ ...@@ -742,7 +742,7 @@
<script type="text/javascript" src="dependencies/earcut.js"></script> <script type="text/javascript" src="dependencies/earcut.js"></script>
<script type="text/javascript" src="dependencies/fold.js"></script> <script type="text/javascript" src="dependencies/fold.js"></script>
<script type="text/javascript" src="dependencies/CCapture.all.min.js"></script> <script type="text/javascript" src="dependencies/CCapture.all.min.js"></script>
<!--<script type="text/javascript" src="dependencies/numeric-1.2.6.js"></script>--> <script type="text/javascript" src="dependencies/numeric-1.2.6.js"></script>
<!--<script type="text/javascript" src="dependencies/EffectComposer.js"></script>--> <!--<script type="text/javascript" src="dependencies/EffectComposer.js"></script>-->
<!--<script type="text/javascript" src="dependencies/MaskPass.js"></script>--> <!--<script type="text/javascript" src="dependencies/MaskPass.js"></script>-->
...@@ -837,6 +837,8 @@ ...@@ -837,6 +837,8 @@
<li>Arbitrary polygonal faces of imported geometry are triangulated using the <a target="_blank" href="https://github.com/mapbox/earcut">Earcut Library</a></li> <li>Arbitrary polygonal faces of imported geometry are triangulated using the <a target="_blank" href="https://github.com/mapbox/earcut">Earcut Library</a></li>
<li>Portability to multiple VR controllers by <a target="_blank" href="https://github.com/stewdio/THREE.VRController">THREE.VRController.js</a></li> <li>Portability to multiple VR controllers by <a target="_blank" href="https://github.com/stewdio/THREE.VRController">THREE.VRController.js</a></li>
<li>VR GUI by <a href="https://github.com/dataarts/dat.guiVR" target="_blank">dat.guiVR</a></li> <li>VR GUI by <a href="https://github.com/dataarts/dat.guiVR" target="_blank">dat.guiVR</a></li>
<li><a href="http://www.numericjs.com/" target="_blank">numeric.js</a> for linear algebra operations</li>
<li><a href="https://github.com/eligrey/FileSaver.js/" target="_blank">FileSaver</a> for client-side file saving</li>
<li>GIF and WebM video export uses <a target="_blank" href="https://github.com/spite/ccapture.js/">CCapture</a></li> <li>GIF and WebM video export uses <a target="_blank" href="https://github.com/spite/ccapture.js/">CCapture</a></li>
<li><a target="_blank" href="https://jquery.com/">jQuery</a>, <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>, and the <li><a target="_blank" href="https://jquery.com/">jQuery</a>, <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>, and the
<a target="_blank" href="http://designmodo.github.io/Flat-UI/">Flat UI theme</a> used to build the regular GUI</li> <a target="_blank" href="http://designmodo.github.io/Flat-UI/">Flat UI theme</a> used to build the regular GUI</li>
......
...@@ -82,7 +82,7 @@ function initImporter(globals){ ...@@ -82,7 +82,7 @@ function initImporter(globals){
$("#importFoldModal").modal("show"); $("#importFoldModal").modal("show");
$('#importFoldModal').on('hidden.bs.modal', function () { $('#importFoldModal').on('hidden.bs.modal', function () {
$('#importFoldModal').off('hidden.bs.modal'); $('#importFoldModal').off('hidden.bs.modal');
if (globals.foldUseAngles) { if (globals.foldUseAngles) {//todo this should all go to pattern.js
globals.setCreasePercent(1); globals.setCreasePercent(1);
var foldAngles = []; var foldAngles = [];
for (var i=0;i<fold.edges_assignment.length;i++){ for (var i=0;i<fold.edges_assignment.length;i++){
......
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