From 077fe28b8312821480d327921a83d3cf9f3bac4e Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 13 Jan 2015 12:30:29 -0500
Subject: [PATCH] comments
---
js/importMenu.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/js/importMenu.js b/js/importMenu.js
index c1dbc957..aad65a7f 100644
--- a/js/importMenu.js
+++ b/js/importMenu.js
@@ -17,9 +17,9 @@ $(function(){
loader.addEventListener( 'load', function (e) {
var geometry = e.content;
resetUI();
- _.each(workers.allWorkers, function(worker){
- worker.postMessage({model: JSON.stringify(e.content)});
- });
+// _.each(workers.allWorkers, function(worker){
+// worker.postMessage({model: JSON.stringify(e.content)});
+// });
var material = new THREE.MeshLambertMaterial( { color:0xffa500, shading: THREE.FlatShading, transparent:true, opacity:0.5, side:THREE.DoubleSide} );
modelMesh = new THREE.Mesh(geometry, material);
three.scene.add(modelMesh);
@@ -36,6 +36,7 @@ $(function(){
modelScaleSlider.slider('setValue', 1);
}
+ //load file from data folder
$(".stlImport").click(function(e){
e.preventDefault();
var fileName = $(this).data("file");
@@ -43,6 +44,7 @@ $(function(){
setFileName(fileName);
});
+ //upload from local filesystem
$("#uploadSTL").change(function() {
var input = $(this),
numFiles = input.get(0).files ? input.get(0).files.length : 1,
--
GitLab