From f6c3decd8da2853d59abaeb03345d5c70518adc5 Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Thu, 4 May 2017 11:06:48 -0400
Subject: [PATCH] small changes
---
index.html | 12 ++++++++++++
js/controls.js | 9 ++++++++-
js/globals.js | 4 +++-
js/saveSTL.js | 7 ++++++-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 277f987..b99f719 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 59fcb8b..85cb9ef 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 862d358..6cb4543 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 b29c62f..9e8d8c2 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)});
--
GitLab