From 35210293ba789815b98079ebcd6d0238e1c67518 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 9 Jan 2015 01:32:32 -0500
Subject: [PATCH] messing around
---
js/elementMenu.js | 28 ++++++++++++++++++++++++++++
js/importMenu.js | 6 ++----
main.html | 1 +
3 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 js/elementMenu.js
diff --git a/js/elementMenu.js b/js/elementMenu.js
new file mode 100644
index 00000000..f0ff7292
--- /dev/null
+++ b/js/elementMenu.js
@@ -0,0 +1,28 @@
+/**
+ * Created by aghassaei on 1/8/15.
+ */
+
+$(function(){
+
+ $("#elementCube").click(function(e){
+ e.preventDefault();
+
+ for ( var i = 0; i < 500; i ++ ) {
+ var mesh = createCubeGeometry(10);
+ mesh.position.x = ( Math.random() - 0.5 ) * 1000;
+ mesh.position.y = ( Math.random() - 0.5 ) * 1000;
+ mesh.position.z = ( Math.random() - 0.5 ) * 1000;
+ mesh.updateMatrix();
+ mesh.matrixAutoUpdate = false;
+ three.scene.add( mesh );
+ }
+ three.render();
+ });
+
+ function createCubeGeometry(size){
+ var geometry = new THREE.BoxGeometry(size, size, size);
+ var material = new THREE.MeshLambertMaterial( { color:0xffffff, shading: THREE.FlatShading } );
+ return new THREE.Mesh( geometry, material );
+ }
+
+});
\ No newline at end of file
diff --git a/js/importMenu.js b/js/importMenu.js
index b639d5b4..f4257250 100644
--- a/js/importMenu.js
+++ b/js/importMenu.js
@@ -2,13 +2,13 @@
* Created by aghassaei on 1/8/15.
*/
-//todo - put stl loading in background thread, allow scaling when loaded
+//todo - put stl loading in background thread
$(function(){
three = three || {};
- var modelMesh;
+ var modelMesh = {};
var modelScaleSlider = $('#stlModelScale');
function loadSTL(file){
@@ -69,6 +69,4 @@ $(function(){
function setFileName(name){
$("#STLFilename").html("Current file loaded:  "+name);
}
-
-
});
\ No newline at end of file
diff --git a/main.html b/main.html
index b2433024..2ea746f4 100644
--- a/main.html
+++ b/main.html
@@ -33,6 +33,7 @@
<script src="js/main.js"></script>
<script src="dependencies/loaders/STLLoader.js"></script>
<script src="js/importMenu.js"></script>
+ <script src="js/elementMenu.js"></script>
<link rel="stylesheet" type="text/css" href="css/main.css">
</head>
--
GitLab