eod

js/cells/TetraEdgeCell.js

-/**
- * Created by aghassaei on 5/26/15.
- */
-
-
-define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'TetraStackedCell'],
-    function(_, THREE, three, lattice, appState, TetraFaceCell){
-    
-    function TetraEdgeCell(index, superCell){
-        TetraFaceCell.call(this, index, superCell);
-    }
-    TetraEdgeCell.prototype = Object.create(TetraFaceCell.prototype);
-    
-    TetraEdgeCell.prototype._rotateCell = function(){};
-    
-    return TetraEdgeCell;
-});
\ No newline at end of file

js/cells/TetraVertexCell.js

+/**
+ * Created by aghassaei on 6/5/15.
+ */
+
+
+define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'],
+    function(_, THREE, three, lattice, appState, DMACell){
+
+    var unitGeo = new THREE.TetrahedronGeometry(Math.sqrt(3/8));
+    unitGeo.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI/4));
+    unitGeo.applyMatrix(new THREE.Matrix4().makeRotationX((Math.PI-Math.atan(2*Math.sqrt(2)))/2));
+    unitGeo.applyMatrix(new THREE.Matrix4().makeTranslation(0,0,Math.sqrt(3/8)-2/Math.sqrt(6)));
+    unitGeo.applyMatrix(new THREE.Matrix4().makeRotationZ(Math.PI));
+
+    function TetraStackedCell(index, superCell){
+        DMACell.call(this, index, superCell);
+    }
+    TetraStackedCell.prototype = Object.create(DMACell.prototype);
+
+    TetraStackedCell.prototype._getGeometry = function(){//abstract mesh representation of cell
+        return unitGeo;
+    };
+
+    TetraStackedCell.prototype.calcHighlighterParams = function(face){
+        var direction = face.normal;
+        if (direction.z<-0.95) direction = new THREE.Vector3(0,0,-1);
+        else direction = new THREE.Vector3(0,0,1);
+        direction.applyQuaternion(this.getAbsoluteOrientation());
+        var position = this.getAbsolutePosition();
+        position.z += direction.z*this.zScale()/2;
+        return {position:position, direction: direction};
+    };
+
+    return TetraStackedCell;
+});
\ No newline at end of file

js/lattice/TetraVertexLattice.js

 /**
- * Created by aghassaei on 6/5/15.
+ * Created by aghassaei on 6/4/15.
  */
 
-
 define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'],
     function(_, Backbone, appState, lattice, globals, plist, THREE, three){
 
@@ -18,11 +17,20 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
         },
 
         getIndexForPosition: function(absPosition){
-            return this._indexForPosition(absPosition);
+            var yIndex = Math.floor(absPosition.y/this.yScale());
+            if (yIndex%2 != 0) absPosition.x += this.xScale()/2;
+            var index = this._indexForPosition(absPosition);
+            if (index.z%2 == 1) index.y += 1;
+            return index;
         },
 
         getPositionForIndex: function(index){
-            return this._positionForIndex(index);
+            var position = index.clone();
+            position.x = (position.x+1/2);
+            position.y = position.y*this.yScale()+1/Math.sqrt(3)/2;
+            position.z = (position.z+0.5)*this.zScale();
+            if ((index.y%2) != 0) position.x -= this.xScale()/2;
+            return position;
         },
 
         xScale: function(cellSeparation){
@@ -40,7 +48,7 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
         },
 
         makeCellForLatticeType: function(indices, callback){
-            require(['tetraStackedCell'], function(TetraVertexCell){
+            require(['tetraVertexCell'], function(TetraVertexCell){
                 var cell = new TetraVertexCell(indices);
                 if (callback) callback(cell);
                 return cell;
@@ -56,4 +64,4 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'th
     };
 
     return TetraVertexLattice;
-});
\ No newline at end of file
+});

js/main.js

@@ -59,7 +59,7 @@ require.config({
         octaVertexCell: 'cells/OctaVertexCell',
         octaRotEdgeCell: 'cells/OctaRotEdgeCell',
         tetraStackedCell: 'cells/TetraStackedCell',
-        tetraFaceCell: 'cells/TetraFaceCell',
+        tetraVertexCell: 'cells/TetraVertexCell',
         truncatedCubeCell: 'cells/TruncatedCubeCell',
         kelvinCell: 'cells/KelvinCell',
         cubeCell: 'cells/CubeCell',