From 29a2b3234463fb83635bee31a109c003cfa9c559 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 16 Jan 2015 20:26:24 -0500
Subject: [PATCH] cleaning up
---
js/main.js | 2 ++
js/models/fillGeometry.js | 2 --
js/models/lattice.js | 4 +++-
js/views/importView.js | 11 -----------
main.html | 2 +-
5 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/js/main.js b/js/main.js
index d1ce6d60..9dd30edd 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 7ca06180..44a19815 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 889d472f..51f96a82 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 1957d7da..80258f50 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 c55cbadb..66b4b354 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>
--
GitLab