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

remove zscale from cells now that inverse is not a thing

parent 96291317
No related branches found
No related tags found
No related merge requests found
......@@ -81,7 +81,7 @@ DMAFreeFormOctaCell.prototype.calcHighlighterPosition = function(face){
direction.applyQuaternion(this.cellMesh.quaternion);
var position = this.getPosition();
var zScale = this.zScale();
var zScale = dmaGlobals.lattice.zScale();
position.x += direction.x*zScale/2;
position.y += direction.y*zScale/2;
position.z += direction.z*zScale/2;
......@@ -101,11 +101,6 @@ DMAFreeFormOctaCell.prototype.getType = function(){
return "octa";
};
DMAFreeFormOctaCell.prototype.zScale = function(scale){
if (!scale) scale = dmaGlobals.lattice.get("scale");
return 2*scale/Math.sqrt(6);
};
///////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////EDGE CONNECTED/////////////////////////////////////////////////////////
......@@ -124,7 +119,7 @@ DMAEdgeOctaCell.prototype.calcHighlighterPosition = function(face){
direction.applyQuaternion(this.cellMesh.quaternion);
var position = this.getPosition();
var zScale = this.zScale();
var zScale = dmaGlobals.lattice.zScale();
position.x += direction.x*zScale/2;
position.y += direction.y*zScale/2;
position.z += direction.z*zScale/2;
......
......@@ -85,7 +85,7 @@ DMAFreeFormTetraCell.prototype.calcHighlighterPosition = function(face){
direction.applyQuaternion(this.cellMesh.quaternion);
var position = this.getPosition();
var zScale = this.zScale();
var zScale = dmaGlobals.lattice.zScale();
position.x += direction.x*zScale/2;
position.y += direction.y*zScale/2;
position.z += direction.z*zScale/2;
......@@ -97,9 +97,9 @@ DMAFreeFormTetraCell.prototype.getType = function(){
return "tetra";
};
DMAFreeFormTetraCell.prototype.zScale = function(scale){
if (!scale) scale = dmaGlobals.lattice.get("scale");
return 2*scale/Math.sqrt(24);
};
//DMAFreeFormTetraCell.prototype.zScale = function(scale){
// if (!scale) scale = dmaGlobals.lattice.get("scale");
// return 2*scale/Math.sqrt(24);
//};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment