diff --git a/js/main.js b/js/main.js index d1ce6d60b2d0400f5541850bb14eb049a6df44e7..9dd30edd81e81d465dd5580aaa8ce5ad1cc9035a 100644 --- a/js/main.js +++ b/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"}); diff --git a/js/models/fillGeometry.js b/js/models/fillGeometry.js index 7ca06180ae8d62859c93d28e6e944848cefedbf4..44a198158c99078d05f3a49d63b6b1ab57465b2a 100644 --- a/js/models/fillGeometry.js +++ b/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"); } - }); diff --git a/js/models/lattice.js b/js/models/lattice.js index 889d472f4fe99e3275ccc096f89ae5c770817f01..51f96a828bf04ebcf18372f00f4289e8e3c7b6c9 100644 --- a/js/models/lattice.js +++ b/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(){ diff --git a/js/views/importView.js b/js/views/importView.js index 1957d7da7e724398001fd6d45a11c1cf5af07692..80258f50be8fbfe5bf52fba98170060046cca784 100644 --- a/js/views/importView.js +++ b/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 diff --git a/main.html b/main.html index c55cbadb4f271a50f185041cdca560c5bd4fb5f5..66b4b3542980fc205c7e60ee7ee7c8ee42927adf 100644 --- a/main.html +++ b/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>