dimensions added back in

js/main.js

@@ -8,7 +8,7 @@ $(function(){
     three = Three();
 
     //init models and views
-    window.fillGeometry = new FillGeometry();//init a singleton, add to global scope
+    fillGeometry = new FillGeometry();//init a singleton, add to global scope
     new ImportView({model: window.fillGeometry});
 
 

js/models/fillGeometry.js

@@ -15,7 +15,7 @@ FillGeometry = Backbone.Model.extend({
                 side:THREE.DoubleSide}),
         geometry: new THREE.BoxGeometry(100, 100, 100),
         filename: "Cube",
-        orientation: "",
+        orientation: [0,0,0]
     },
 
     initialize: function(){
@@ -53,11 +53,14 @@ FillGeometry = Backbone.Model.extend({
     makeBoundingBoxHelper: function(){
         var helper = new THREE.BoundingBoxHelper(this.get("mesh"), 0x000000);
         this.set("boundingBoxHelper", helper);
+        helper.update();
         three.scene.add(helper.object);
+        console.log(helper.box);
     },
 
     updateBoundingBox: function(){
         this.get("boundingBoxHelper").update();
+        console.log(helper.box);
 
 //        var boundingBox = this.get("geometry").boundingBox;
 //        if (!boundingBox){
@@ -75,14 +78,19 @@ FillGeometry = Backbone.Model.extend({
     },
 
     rotate: function(axis){
+        var orientation = this.get("orientation");
         var mesh = this.get("mesh");
         if (axis == "x"){
             mesh.rotateX(Math.PI/2);
+            orientation[0] += Math.PI/2;
         } else if (axis == "y"){
             mesh.rotateX(Math.PI/2);
+            orientation[1] += Math.PI/2;
         } else {
             mesh.rotateX(Math.PI/2);
+            orientation[2] += Math.PI/2;
         }
+        this.trigger("change:orientation");
     }
 
 });

js/views/importMenu.js

@@ -80,10 +80,11 @@ $(function(){
         $("#STLFilename").html("Current file loaded:&nbsp&nbsp"+name);
     }
 
-    function showDimensions(scale){
-        var boundingBox = modelMesh.geometry.boundingBox;
-        $("#meshDimensions").html("Dimensions: " + ((boundingBox.max.x - boundingBox.min.x)*scale).toFixed(1) + " x " +
-            ((boundingBox.max.y - boundingBox.min.y)*scale).toFixed(1) + " x " + ((boundingBox.max.z - boundingBox.min.z)*scale).toFixed(1));
+    function showDimensions(scale, orintation){
+        //todo add in orientation effects
+        var bounds = this.model.get("bounds");
+        $("#meshDimensions").html("Dimensions: " + ((bounds.max.x - bounds.min.x)*scale).toFixed(1) + " x " +
+            ((bounds.max.y - bounds.min.y)*scale).toFixed(1) + " x " + ((bounds.max.z - bounds.min.z)*scale).toFixed(1));
     }
 
     $("#stlRotateX").click(function(e){

js/views/importView.js

@@ -66,9 +66,11 @@ ImportView = Backbone.View.extend({
     },
 
     makeDimensionString: function(){
-//        var boundingBox = this.model.get("boundingBox");
-//        return ((boundingBox.max.x - boundingBox.min.x)*scale).toFixed(1) + " x " +
-//            ((boundingBox.max.y - boundingBox.min.y)*scale).toFixed(1) + " x " + ((boundingBox.max.z - boundingBox.min.z)*scale).toFixed(1);
+        //todo add in orientation effects
+        var scale = this.model.get("scale");
+        var bounds = this.model.get("bounds");
+        return ((bounds.max.x - bounds.min.x)*scale).toFixed(1) + " x " +
+            ((bounds.max.y - bounds.min.y)*scale).toFixed(1) + " x " + ((bounds.max.z - bounds.min.z)*scale).toFixed(1);
     },
 
     rotate: function(e){