Skip to content
Snippets Groups Projects
Commit 6c2d9bcc authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

moving stuff around

parent 36a34bc9
Branches
No related tags found
No related merge requests found
File moved
File moved
File moved
File moved
File moved
...@@ -3,16 +3,14 @@ ...@@ -3,16 +3,14 @@
*/ */
FillGeometryView = Backbone.View.extend({ FillGeometryView = PushPullMeshView.extend({
events: { events: {
}, },
initialize: function(options){ initialize: function(options){
this.three = options.three; PushPullMeshView.prototype.initialize.apply(this, arguments);
//bind events //bind events
this.listenTo(this.model, "change:geometry", this.replaceFillGeometry); this.listenTo(this.model, "change:geometry", this.replaceFillGeometry);
......
/**
* Created by aghassaei on 1/17/15.
*/
//this is a parent class for other threeJS VCs that allows push and pull scale and orientation changes in the threeJS scene
PushPullMeshView = Backbone.View.extend({
events: {
},
initialize: function(options){
this.three = options.three;
//bind events
}
//
// render: function(){
// this.three.render();
// }
});
\ No newline at end of file
File moved
...@@ -45,17 +45,18 @@ ...@@ -45,17 +45,18 @@
<script src="js/models/lattice.js"></script> <script src="js/models/lattice.js"></script>
<!--views--> <!--views-->
<script src="js/views/threeView.js"></script> <script src="js/threeViews/threeView.js"></script>
<script src="js/views/importView.js"></script> <script src="js/threeViews/pushPullMeshView.js"></script>
<script src="js/views/fillGeometryView.js"></script> <script src="js/menus/importView.js"></script>
<script src="js/threeViews/fillGeometryView.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<!--<script src="js/views/importMenu.js"></script>--> <!--<script src="js/views/importMenu.js"></script>-->
<!--<script src="js/views/elementMenu.js"></script>--> <!--<script src="js/views/elementMenu.js"></script>-->
<script src="js/views/exportMenu.js"></script> <script src="js/menus/exportMenu.js"></script>
<script src="js/views/navbar.js"></script> <script src="js/menus/navbar.js"></script>
<link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/main.css">
</head> </head>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment