cleaning up

js/main.js

@@ -11,6 +11,8 @@ $(function(){
     fillGeometry = new FillGeometry();//init a singleton, add to global scope
     new ImportView({model: window.fillGeometry});
 
+    lattice = new Lattice();
+
 
     //window.fillGeometry.set({geometry:"stuff"});
 

js/models/fillGeometry.js

@@ -62,7 +62,6 @@ FillGeometry = Backbone.Model.extend({
     },
 
     render: function(){
-        console.log("renderfillgeo");
         three.render();
     },
 
@@ -81,6 +80,5 @@ FillGeometry = Backbone.Model.extend({
         }
         this.trigger("change:orientation");
     }
-
 });
 

js/models/lattice.js

@@ -6,7 +6,9 @@
 Lattice = Backbone.Model.extend({
 
     defaults: {
-        scale: 1.0
+        scale: 1.0,
+        translation: new THREE.Vector3(0,0,0),
+        rotation: new THREE.Vector3(0,0,0)
     },
 
     initialize: function(){

js/views/importView.js

@@ -77,16 +77,7 @@ ImportView = Backbone.View.extend({
     },
 
     render: function(){
-
-        console.log("renderView");
         this.$el.html(this.template(_.extend(this.model.attributes, {dimensions:this.makeDimensionString()})));
-
-//        $(".slider").slider({//format slider
-//            formatter: function(value) {
-//                console.log(value);
-//                return value;
-//            }
-//        });
     },
 
     template: _.template(
@@ -124,6 +115,4 @@ ImportView = Backbone.View.extend({
                 </div>\
             </div>\
         </div>')
-
-
 });
\ No newline at end of file

main.html

@@ -42,7 +42,7 @@
 
     <!--models-->
     <script src="js/models/fillGeometry.js"></script>
-    <script src="js/models/Lattice.js"></script>
+    <script src="js/models/lattice.js"></script>
 
     <!--views-->
     <script src="js/views/importView.js"></script>