lattice model

js/models/fillGeometry.js

@@ -6,7 +6,6 @@
 FillGeometry = Backbone.Model.extend({
 
     defaults: {
-        scale: 1.0,
         material: new THREE.MeshLambertMaterial(
             {color:0xffa500,
                 shading: THREE.FlatShading,
@@ -23,9 +22,9 @@ FillGeometry = Backbone.Model.extend({
         //bind events
         this.on("change:mesh", this.getBounds);
         this.on("change:mesh", this.makeBoundingBoxHelper);
-        this.on("change:scale change:orientation", this.updateBoundingBox);
+        this.on("change:orientation", this.updateBoundingBox);
         this.on("change:geometry", this.buildNewMesh);
-        this.on("change:mesh change:scale change:orientation", this.render);
+        this.on("change:mesh change:orientation", this.render);
 
         this.buildNewMesh();
     },
@@ -33,7 +32,7 @@ FillGeometry = Backbone.Model.extend({
     buildNewMesh:function(){
 
         if (this.previous("mesh")) three.scene.remove(this.previous("mesh"));//remove current mesh from scene
-        this.set({scale:this.defaults.scale, orientation:this.defaults.orientation}, {silent:true});//restore defaults
+        this.set({orientation:this.defaults.orientation}, {silent:true});//restore defaults
         var mesh = new THREE.Mesh(this.get("geometry"), this.get("material"));
         three.scene.add(mesh);
         this.set({mesh: mesh});

js/models/lattice.js

+/**
+ * Created by aghassaei on 1/16/15.
+ */
+
+
+Lattice = Backbone.Model.extend({
+
+    defaults: {
+        scale: 1.0
+    },
+
+    initialize: function(){
+
+        //bind events
+
+    }
+
+
+
+});
\ No newline at end of file

js/views/importView.js

@@ -12,13 +12,12 @@ ImportView = Backbone.View.extend({
         "click .selectMesh":                "selectMesh",
         "fileselect .btn-file :file":       "readDataURL",
         "click .stlRotate":                 "rotate",
-        "slide #modelScale":                "scale"
     },
 
     initialize: function(){
 
         _.bindAll(this, "render", "onMeshLoad");
-        this.model.bind("change:filename change:boundingBoxHelper", this.render);//boundingBoxHelper covers orientation/scale
+        this.model.bind("change:filename change:boundingBoxHelper", this.render);//boundingBoxHelper covers orientation
 
         this.render();
     },
@@ -61,9 +60,9 @@ ImportView = Backbone.View.extend({
         this.model.set("geometry", e.content);
     },
 
-    scale: function(e){
-        this.model.set("scale", $(e.target).slider('getValue'));
-    },
+//    scale: function(e){
+//        this.model.set("scale", $(e.target).slider('getValue'));
+//    },
 
     makeDimensionString: function(){
         var bounds = this.model.get("boundingBoxHelper").box;
@@ -111,9 +110,9 @@ ImportView = Backbone.View.extend({
             </div>\
             </div> <!-- /.col-xs-3 -->\
             <div class="col-xs-9">\
-                Geometry:&nbsp;&nbsp;<%= filename %><br/>\
-                Dimensions:&nbsp;&nbsp;<%= dimensions %>\
-                <div>Change model scale:</div>\
+                <div>Geometry:&nbsp;&nbsp;<%= filename %><br/>\
+                Dimensions:&nbsp;&nbsp;<%= dimensions %><br/>\
+                Units:&nbsp;&nbsp;</div></br>\
                 <div class="col-xs-4">\
                     <a href="#" data-axis="z" class="stlRotate btn btn-block btn-lg btn-default">Rotate X</a>\
                 </div>\

main.html

@@ -29,8 +29,9 @@
     <script src="dependencies/OrbitControls.js"></script>
     <script src="js/threeMain.js"></script>
 
-    <!--stl export-->
+    <!--stl import/export-->
     <script src="dependencies/THREE2STL.js"></script>
+    <script src="dependencies/loaders/STLLoader.js"></script>
 
     <!--numerical javascript-->
     <script src="dependencies/numeric-1.2.6.js"></script>
@@ -39,17 +40,16 @@
     <script src="js/worker.js"></script>
     <script src="js/persistentWorkers.js"></script><!--global workers-->
 
-    <script src="js/main.js"></script>
-
     <!--models-->
     <script src="js/models/fillGeometry.js"></script>
+    <script src="js/models/Lattice.js"></script>
 
     <!--views-->
     <script src="js/views/importView.js"></script>
 
+    <script src="js/main.js"></script>
 
 
-    <script src="dependencies/loaders/STLLoader.js"></script>
     <!--<script src="js/views/importMenu.js"></script>-->
     <!--<script src="js/views/elementMenu.js"></script>-->
     <script src="js/views/exportMenu.js"></script>