diff --git a/js/elementMenu.js b/js/elementMenu.js new file mode 100644 index 0000000000000000000000000000000000000000..f0ff7292060b45eb4d9a7f6d20c1206d0f459b91 --- /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 b639d5b4c2df2f79f7d6e9579d0ee95027da46ce..f4257250ac2955788e57929bf73921a8222bb5f0 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 b24330246a161ce0a49c977864318dd1799b55e9..2ea746f49a8d30c36bb9e68750196b7621cc7f27 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>