diff --git a/js/baseplane/BasePlane.js b/js/baseplane/BasePlane.js
new file mode 100644
index 0000000000000000000000000000000000000000..f623f112b31aa3a6d048a8f88ae27b971c3f084f
--- /dev/null
+++ b/js/baseplane/BasePlane.js
@@ -0,0 +1,68 @@
+/**
+ * Created by aghassaei on 1/31/15.
+ */
+
+define(['appState', 'threeModel'], function(appState, three){
+
+ return Backbone.Model.extend({
+
+ defaults: {
+ zIndex: 0,
+ object3D: null,
+ dimX: 100,
+ dimY: 100,
+ material: new THREE.MeshBasicMaterial({color:0x000000, transparent:true, opacity:0.2, wireframe:true})
+ },
+
+ initialize: function(){
+
+ //bind events
+ this.listenTo(this, "change:zIndex", this._renderZIndexChange);
+ this.listenTo(appState, "change:basePlaneIsVisible", this._setVisibility);
+
+ //draw mesh
+ var meshes = this._makeBasePlaneMesh();
+ var object3D = new THREE.Object3D();
+ _.each(meshes, function(mesh){
+ object3D.add(mesh);
+ });
+ object3D.myParent = this;
+ this.set("object3D", object3D);
+ three.sceneAdd(object3D, "basePlane");
+ three.render();
+ this._setVisibility();
+ },
+
+ updateXYSeparation: function(xySep) {},
+
+ getOrientation: function(){
+ return new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,0,1), Math.PI);
+ },
+
+ _setVisibility: function(){
+ this.get("object3D").visible = appState.get("basePlaneIsVisible");
+ three.render();
+ },
+
+ getIndex: function(){
+ return this.index.clone();
+ },
+
+ _removeMesh: function(){
+ this.get("object3D").myParent = null;
+ three.sceneRemove(this.get("object3D"), "basePlane");
+ three.render();
+ },
+
+ destroy: function(){
+ this.stopListening();
+ this.set("zIndex", null, {silent:true});
+ this._removeMesh();
+ this.set("object3D", null, {silent:true});
+ this.set("material", null, {silent:true});
+ this.set("unitGeometry", null, {silent:true});
+ this.set("dimX", null, {silent:true});
+ this.set("dimY", null, {silent:true});
+ }
+ });
+});
\ No newline at end of file
diff --git a/js/baseplane/OctaBasePlane.js b/js/baseplane/OctaBasePlane.js
new file mode 100644
index 0000000000000000000000000000000000000000..1fe69bb07d86067993e69f3da89443267db52b6f
--- /dev/null
+++ b/js/baseplane/OctaBasePlane.js
@@ -0,0 +1,106 @@
+/**
+ * Created by aghassaei on 6/2/15.
+ */
+
+
+define(['baseplane', 'lattice', 'threeModel'], function(BasePlane, lattice, three){
+
+ return BasePlane.extend({
+
+ _makeBasePlaneMesh: function(){
+
+ var geometry = new THREE.Geometry();
+ geometry.vertices = this._calcOctaFaceVertices(0.0);
+ var faces = geometry.faces;
+
+ var dimX = this.get("dimX");
+ var dimY = this.get("dimY");
+
+ var currentOffset = 0;
+ for (var j=-dimX;j<=dimX;j++){
+ for (var i=-dimY;i<=dimY;i++){
+
+ currentOffset++;
+ if (j == -dimX || i == -dimY) continue;
+
+ if (Math.abs(j)%2==1){
+ faces.push(new THREE.Face3(3*currentOffset-4, 3*currentOffset-8-6*dimY, 3*currentOffset-6-6*dimY));//pt, base, base
+ } else {
+ faces.push(new THREE.Face3(3*currentOffset-1, 3*currentOffset-8-6*dimY, 3*currentOffset-6-6*dimY));//pt, base, base
+ }
+
+ }
+
+ }
+
+ geometry.computeFaceNormals();
+ return [new THREE.Mesh(geometry, this.get("material"))];
+ },
+
+ getType: function(){//todo hack from freeform octa, get rid of this eventually
+ return "octa";
+ },
+
+ _renderZIndexChange: function(){
+ var zIndex = this.get("zIndex");
+ var xScale = lattice.xScale();
+ var yScale = lattice.yScale();
+ var zScale = lattice.zScale();
+
+ _.each(this.get("mesh"), function(mesh){
+ mesh.position.set(xScale*(zIndex%2)/2, -yScale/3*(zIndex%2), zIndex*zScale);
+ mesh.rotation.set(Math.PI*(zIndex%2),0,0)
+ });
+ three.render();
+ },
+
+ _calcOctaFaceVertices: function(xySep){
+
+ var vertices = [];
+
+ var xScale = lattice.xScale();
+ var yScale = lattice.yScale();
+
+ var dimX = this.get("dimX");
+ var dimY = this.get("dimY");
+
+ var baseVertOffset = xySep/Math.sqrt(3);
+ var pointVertOffset = 2*baseVertOffset;
+ var horizontalOffset = xySep;
+
+ for (var j=-dimX;j<=dimX;j++){
+ for (var i=-dimY;i<=dimY;i++){
+
+ var xOffset = 0;
+ if (Math.abs(j)%2!=0) {
+ xOffset = 1/2*xScale;
+ }
+
+ vertices.push(new THREE.Vector3(i*xScale + xOffset - horizontalOffset, j*yScale + baseVertOffset, 0));
+ vertices.push(new THREE.Vector3(i*xScale + xOffset + horizontalOffset, j*yScale + baseVertOffset, 0));
+ vertices.push(new THREE.Vector3(i*xScale + xOffset, j*yScale - pointVertOffset, 0));
+
+ }
+
+ }
+ return vertices;
+ },
+
+ updateXYSeparation: function(xySep){
+ var geometry = this.get("mesh")[0].geometry;
+ geometry.vertices = this._calcOctaFaceVertices(xySep);
+ geometry.verticesNeedUpdate = true;
+ },
+
+ calcHighlighterPosition: function(face, position){
+ position.z = 0;
+ var index = lattice.getIndexForPosition(position);
+ if (index.z%2 != 0) index.x -= 1;
+ index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
+ var position = lattice.getPositionForIndex(index);
+ position.z += lattice.zScale()/2;
+ this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
+ return {index: index, direction: new THREE.Vector3(0,0,1), position:position};
+ }
+ });
+});
\ No newline at end of file
diff --git a/js/baseplane/RotEdgeOctaBasePlane.js b/js/baseplane/RotEdgeOctaBasePlane.js
new file mode 100644
index 0000000000000000000000000000000000000000..a62057b3ad8312454986f1c8705211562d7b8db3
--- /dev/null
+++ b/js/baseplane/RotEdgeOctaBasePlane.js
@@ -0,0 +1,20 @@
+/**
+ * Created by aghassaei on 6/2/15.
+ */
+
+
+define(['squareBaseplane', 'lattice'], function(SquareBasePlane, lattice){
+
+ return SquareBasePlane.extend({
+
+ calcHighlighterPosition: function(face, position){
+ var index = lattice.getIndexForPosition(position);
+ index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
+ var latticePosition = lattice.getPositionForIndex(index);
+ latticePosition.x -= lattice.xScale()/2;
+ latticePosition.y -= lattice.yScale()/2;
+ this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
+ return {index: index, direction: new THREE.Vector3(0,0,1), position:latticePosition};
+ }
+ });
+});
\ No newline at end of file
diff --git a/js/baseplane/SquareBasePlane.js b/js/baseplane/SquareBasePlane.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c405460afe14c312730c374dcc07d7b45dcb0e2
--- /dev/null
+++ b/js/baseplane/SquareBasePlane.js
@@ -0,0 +1,57 @@
+/**
+ * Created by aghassaei on 6/2/15.
+ */
+
+
+define(['baseplane', 'lattice', 'threeModel'], function(BasePlane, lattice, three){
+
+ return BasePlane.extend({
+
+ _makeBasePlaneMesh: function(){
+
+ var scale = lattice.xScale();
+ var dimX = this.get("dimX")*scale;
+ var dimY = this.get("dimY")*scale;
+
+ var geometry = new THREE.Geometry();
+
+ for ( var i = - dimX; i <= dimX; i += scale ) {
+ geometry.vertices.push( new THREE.Vector3(-dimX, i, 0));
+ geometry.vertices.push( new THREE.Vector3(dimX, i, 0));
+ geometry.vertices.push( new THREE.Vector3(i, -dimX, 0));
+ geometry.vertices.push( new THREE.Vector3(i, dimX, 0));
+
+ }
+
+ var planeGeometry = new THREE.Geometry();
+ planeGeometry.vertices.push( new THREE.Vector3(-dimX, -dimX, 0));
+ planeGeometry.vertices.push( new THREE.Vector3(dimX, -dimX, 0));
+ planeGeometry.vertices.push( new THREE.Vector3(-dimX, dimX, 0));
+ planeGeometry.vertices.push( new THREE.Vector3(dimX, dimX, 0));
+ planeGeometry.faces.push(new THREE.Face3(0, 1, 3));
+ planeGeometry.faces.push(new THREE.Face3(0, 3, 2));
+ planeGeometry.computeFaceNormals();
+
+ var mesh = new THREE.Mesh(planeGeometry, new THREE.MeshBasicMaterial({color:0x000000, transparent:true, opacity:0.0}));
+ return [mesh, new THREE.Line(geometry, new THREE.LineBasicMaterial({color:0x000000, transparent:true, linewidth:2, opacity:this.get("material").opacity}), THREE.LinePieces)];
+ },
+
+ _renderZIndexChange: function(){
+ var zIndex = this.get("zIndex");
+ var zScale = lattice.zScale();
+ _.each(this.get("mesh"), function(mesh){
+ mesh.position.set(0, 0, zIndex*zScale);
+ });
+ three.render();
+ },
+
+ calcHighlighterPosition: function(face, position){
+ var index = lattice.getIndexForPosition(position);
+ index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
+ var latticePosition = lattice.getPositionForIndex(index);
+ latticePosition.z += lattice.zScale()/2;
+ this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
+ return {index: index, direction: new THREE.Vector3(0,0,1), position:latticePosition};
+ }
+ });
+});
diff --git a/js/main.js b/js/main.js
index 4d311b591a234d0e8f6a7d23531dd8fc025c129f..daad85d418e294d02cfb3ac75c7216a985138cec 100644
--- a/js/main.js
+++ b/js/main.js
@@ -20,9 +20,17 @@ require.config({
//models
plist: 'models/PList',
appState: 'models/AppState',
- lattice: 'lattice/Lattice',
fileSaver: 'models/FileSaver',
+ //lattice
+ lattice: 'lattice/Lattice',
+
+ //baseplane
+ baseplane: 'baseplane/BasePlane',
+ squareBaseplane: 'baseplane/SquareBasePlane',
+ octaBaseplane: 'baseplane/OctaBasePlane',
+ rotEdgeOctaBaseplane: 'baseplane/RotEdgeOctaBasePlane',
+
//UI
navbar: 'menus/Navbar',
navViewMenu: 'menus/NavViewMenu',//view dropdown
diff --git a/js/three/BasePlane.js b/js/three/BasePlane.js
deleted file mode 100644
index 9ebc08ed6993bcb42efdc7c9d5175812d63d1d6b..0000000000000000000000000000000000000000
--- a/js/three/BasePlane.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Created by aghassaei on 1/31/15.
- */
-
-
-BasePlane = Backbone.Model.extend({
-
- defaults: {
- zIndex: 0,
- object3D: null,
- dimX: 100,
- dimY: 100,
- material: new THREE.MeshBasicMaterial({color:0x000000, transparent:true, opacity:0.2, wireframe:true})
- },
-
- initialize: function(){
-
- //bind events
- this.listenTo(this, "change:zIndex", this._renderZIndexChange);
- this.listenTo(globals.appState, "change:basePlaneIsVisible", this._setVisibility);
-
- //draw mesh
- var meshes = this._makeBasePlaneMesh();
- var object3D = new THREE.Object3D();
- _.each(meshes, function(mesh){
- object3D.add(mesh);
- });
- object3D.myParent = this;
- this.set("object3D", object3D);
- globals.three.sceneAdd(object3D, "basePlane");
- globals.three.render();
- this._setVisibility();
- },
-
- updateXYSeparation: function(xySep) {},
-
- getOrientation: function(){
- return new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,0,1), Math.PI);
- },
-
- _setVisibility: function(){
- this.get("object3D").visible = globals.appState.get("basePlaneIsVisible");
- globals.three.render();
- },
-
- getIndex: function(){
- return this.index.clone();
- },
-
- _removeMesh: function(){
- this.get("object3D").myParent = null;
- globals.three.sceneRemove(this.get("object3D"), "basePlane");
- globals.three.render();
- },
-
- destroy: function(){
- this.stopListening();
- this.set("zIndex", null, {silent:true});
- this._removeMesh();
- this.set("object3D", null, {silent:true});
- this.set("material", null, {silent:true});
- this.set("unitGeometry", null, {silent:true});
- this.set("dimX", null, {silent:true});
- this.set("dimY", null, {silent:true});
- }
-
-});
-
-
-
-///////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////OCTA FACE/////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////
-
-OctaBasePlane = BasePlane.extend({
-
- _makeBasePlaneMesh: function(){
-
- var geometry = new THREE.Geometry();
- geometry.vertices = this._calcOctaFaceVertices(0.0);
- var faces = geometry.faces;
-
- var dimX = this.get("dimX");
- var dimY = this.get("dimY");
-
- var currentOffset = 0;
- for (var j=-dimX;j<=dimX;j++){
- for (var i=-dimY;i<=dimY;i++){
-
- currentOffset++;
- if (j == -dimX || i == -dimY) continue;
-
- if (Math.abs(j)%2==1){
- faces.push(new THREE.Face3(3*currentOffset-4, 3*currentOffset-8-6*dimY, 3*currentOffset-6-6*dimY));//pt, base, base
- } else {
- faces.push(new THREE.Face3(3*currentOffset-1, 3*currentOffset-8-6*dimY, 3*currentOffset-6-6*dimY));//pt, base, base
- }
-
- }
-
- }
-
- geometry.computeFaceNormals();
- return [new THREE.Mesh(geometry, this.get("material"))];
- },
-
- getType: function(){//todo hack from freeform octa, get rid of this eventually
- return "octa";
- },
-
- _renderZIndexChange: function(){
- var zIndex = this.get("zIndex");
- var xScale = globals.lattice.xScale();
- var yScale = globals.lattice.yScale();
- var zScale = globals.lattice.zScale();
-
- _.each(this.get("mesh"), function(mesh){
- mesh.position.set(xScale*(zIndex%2)/2, -yScale/3*(zIndex%2), zIndex*zScale);
- mesh.rotation.set(Math.PI*(zIndex%2),0,0)
- });
- globals.three.render();
- },
-
- _calcOctaFaceVertices: function(xySep){
-
- var vertices = [];
-
- var xScale = globals.lattice.xScale();
- var yScale = globals.lattice.yScale();
-
- var dimX = this.get("dimX");
- var dimY = this.get("dimY");
-
- var baseVertOffset = xySep/Math.sqrt(3);
- var pointVertOffset = 2*baseVertOffset;
- var horizontalOffset = xySep;
-
- for (var j=-dimX;j<=dimX;j++){
- for (var i=-dimY;i<=dimY;i++){
-
- var xOffset = 0;
- if (Math.abs(j)%2!=0) {
- xOffset = 1/2*xScale;
- }
-
- vertices.push(new THREE.Vector3(i*xScale + xOffset - horizontalOffset, j*yScale + baseVertOffset, 0));
- vertices.push(new THREE.Vector3(i*xScale + xOffset + horizontalOffset, j*yScale + baseVertOffset, 0));
- vertices.push(new THREE.Vector3(i*xScale + xOffset, j*yScale - pointVertOffset, 0));
-
- }
-
- }
- return vertices;
- },
-
- updateXYSeparation: function(xySep){
- var geometry = this.get("mesh")[0].geometry;
- geometry.vertices = this._calcOctaFaceVertices(xySep);
- geometry.verticesNeedUpdate = true;
- },
-
- calcHighlighterPosition: function(face, position){
- position.z = 0;
- var index = globals.lattice.getIndexForPosition(position);
- if (index.z%2 != 0) index.x -= 1;
- index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
- var position = globals.lattice.getPositionForIndex(index);
- position.z += globals.lattice.zScale()/2;
- this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
- return {index: index, direction: new THREE.Vector3(0,0,1), position:position};
- }
-
-});
-
-
-///////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////CUBE GRID/////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////
-
-SquareBasePlane = BasePlane.extend({
-
- _makeBasePlaneMesh: function(){
-
- var scale = globals.lattice.xScale();
- var dimX = this.get("dimX")*scale;
- var dimY = this.get("dimY")*scale;
-
- var geometry = new THREE.Geometry();
-
- for ( var i = - dimX; i <= dimX; i += scale ) {
- geometry.vertices.push( new THREE.Vector3(-dimX, i, 0));
- geometry.vertices.push( new THREE.Vector3(dimX, i, 0));
- geometry.vertices.push( new THREE.Vector3(i, -dimX, 0));
- geometry.vertices.push( new THREE.Vector3(i, dimX, 0));
-
- }
-
- var planeGeometry = new THREE.Geometry();
- planeGeometry.vertices.push( new THREE.Vector3(-dimX, -dimX, 0));
- planeGeometry.vertices.push( new THREE.Vector3(dimX, -dimX, 0));
- planeGeometry.vertices.push( new THREE.Vector3(-dimX, dimX, 0));
- planeGeometry.vertices.push( new THREE.Vector3(dimX, dimX, 0));
- planeGeometry.faces.push(new THREE.Face3(0, 1, 3));
- planeGeometry.faces.push(new THREE.Face3(0, 3, 2));
- planeGeometry.computeFaceNormals();
-
- var mesh = new THREE.Mesh(planeGeometry, new THREE.MeshBasicMaterial({color:0x000000, transparent:true, opacity:0.0}));
- return [mesh, new THREE.Line(geometry, new THREE.LineBasicMaterial({color:0x000000, transparent:true, linewidth:2, opacity:this.get("material").opacity}), THREE.LinePieces)];
- },
-
- _renderZIndexChange: function(){
- var zIndex = this.get("zIndex");
- var zScale = globals.lattice.zScale();
- _.each(this.get("mesh"), function(mesh){
- mesh.position.set(0, 0, zIndex*zScale);
- });
- globals.three.render();
- },
-
- calcHighlighterPosition: function(face, position){
- var index = globals.lattice.getIndexForPosition(position);
- index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
- var latticePosition = globals.lattice.getPositionForIndex(index);
- latticePosition.z += globals.lattice.zScale()/2;
- this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
- return {index: index, direction: new THREE.Vector3(0,0,1), position:latticePosition};
- }
-
-});
-
-
-
-///////////////////////////////////////////////////////////////////////////////////
-//////////////////////////OCTA EDGE ROT////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////
-
-RotEdgeOctaBasePlane = SquareBasePlane.extend({
-
- calcHighlighterPosition: function(face, position){
- var index = globals.lattice.getIndexForPosition(position);
- index.z = this.get("zIndex") - 1;//pretend we're on the top of the cell underneath the baseplane
- var latticePosition = globals.lattice.getPositionForIndex(index);
- latticePosition.x -= globals.lattice.xScale()/2;
- latticePosition.y -= globals.lattice.yScale()/2;
- this.index = new THREE.Vector3(index.x, index.y, index.z);//todo no!!!
- return {index: index, direction: new THREE.Vector3(0,0,1), position:latticePosition};
- }
-});
\ No newline at end of file