diff --git a/index.html b/index.html index 277f987aca2dcf7a67e6ddf07f14f5e7a1b5dada..b99f719e14e7c78d2aff3143ee299322d1986e0a 100644 --- a/index.html +++ b/index.html @@ -406,6 +406,7 @@ <li><a id="navPattern" href="#">Pattern</a></li> <li><a id="navSimulation" href="#">Simulation</a></li> <li><a id="about" class="menuHoverControls" target="_blank" href="#">About</a></li> + <li><a id="tips" class="menuHoverControls" target="_blank" href="#">File Import Tips</a></li> </ul> </div><!-- /.navbar-collapse --> @@ -532,6 +533,17 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> +<div class="modal fade" id="tipsModal" tabindex="-1" role="dialog"> + <div class="modal-dialog modal-lg"> + <div class="modal-content"> + <div class="modal-body"> + <p><b>File Import Tips</b><br/><br/> + .... + </p> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> <div class="modal fade" id="exportSTLModal" tabindex="-1" role="dialog"> <div class="modal-dialog modal-med"> <div class="modal-content"> diff --git a/js/controls.js b/js/controls.js index 59fcb8bc48af796c3c34ca8e9f89478765b574e4..85cb9ef35880c1ab94b0bace4bff9bf8062f114e 100644 --- a/js/controls.js +++ b/js/controls.js @@ -17,6 +17,9 @@ function initControls(globals){ setLink("#about", function(){ $('#aboutModal').modal('show'); }); + setLink("#tips", function(){ + $('#tipsModal').modal('show'); + }); setLink("#exportSTL", function(){ $('#exportSTLModal').modal('show'); @@ -112,7 +115,11 @@ function initControls(globals){ parseTXTjson(json); }); - } else globals.pattern.loadSVG("assets/" + url); + } else { + globals.filename = name; + globals.extension = extension; + globals.pattern.loadSVG("assets/" + url); + } } }); diff --git a/js/globals.js b/js/globals.js index 862d35840372ca6a29e3979c03deffdc5f50f8db..6cb45435646cdd9d10a66692129a282bfc28fbc8 100644 --- a/js/globals.js +++ b/js/globals.js @@ -47,8 +47,10 @@ function initGlobals(){ //import pattern settings vertTol: 3,//vertex merge tolerance + //save stl settings filename: null, - extension: null + extension: null, + doublesidedSTL: false }; diff --git a/js/saveSTL.js b/js/saveSTL.js index b29c62f2f8873949bf7ef2cb95fd596e9db4758d..9e8d8c290f960774288c2a7c05fcc427b3945b06 100644 --- a/js/saveSTL.js +++ b/js/saveSTL.js @@ -4,11 +4,16 @@ function saveSTL(){ - var geo = globals.model.getGeometry(); + var geo = globals.model.getGeometry().clone(); if (geo.vertices.length == 0) { globals.warn("No geometry to save."); return; } + if (!globals.doublesidedSTL){ + for (var i=0;i<geo.faces.length/2;i++){ + geo.faces.pop(); + } + } var data = []; data.push({geo: geo, offset:new THREE.Vector3(0,0,0), orientation:new THREE.Quaternion(0,0,0,1)});