From dbf1ac881e9c6578244fc6c5c00729e5e5a49483 Mon Sep 17 00:00:00 2001 From: amandaghassaei <amandaghassaei@gmail.com> Date: Mon, 11 Dec 2017 17:34:43 -0500 Subject: [PATCH] small changes --- README.md | 2 ++ index.html | 4 +++- js/importer.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92cd8df..c543595 100755 --- a/README.md +++ b/README.md @@ -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>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><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 <a target="_blank" href="http://designmodo.github.io/Flat-UI/">Flat UI theme</a> used to build the GUI</li> </ul> diff --git a/index.html b/index.html index 0fe833f..0d830f4 100755 --- a/index.html +++ b/index.html @@ -742,7 +742,7 @@ <script type="text/javascript" src="dependencies/earcut.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/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/MaskPass.js"></script>--> @@ -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>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><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><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> diff --git a/js/importer.js b/js/importer.js index d5d625e..cc3f02a 100755 --- a/js/importer.js +++ b/js/importer.js @@ -82,7 +82,7 @@ function initImporter(globals){ $("#importFoldModal").modal("show"); $('#importFoldModal').on('hidden.bs.modal', function () { $('#importFoldModal').off('hidden.bs.modal'); - if (globals.foldUseAngles) { + if (globals.foldUseAngles) {//todo this should all go to pattern.js globals.setCreasePercent(1); var foldAngles = []; for (var i=0;i<fold.edges_assignment.length;i++){ -- GitLab