diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js index 3cbb141c3d71e815e2036c0372a412c6b7e9da30..9bfd363386078a1989f99c8daab3900b8305857c 100644 --- a/js/models/BasePlane.js +++ b/js/models/BasePlane.js @@ -142,8 +142,10 @@ OctaBasePlane = BasePlane.extend({ _calcOctaFaceVertices: function(colSep){ var vertices = []; - var latticeScale = 1+2*colSep; - var triangleHeight = latticeScale/2*Math.sqrt(3); + + var xScale = dmaGlobals.lattice.xScale(1); + var yScale = dmaGlobals.lattice.yScale(1); + var dimX = this.get("dimX"); var dimY = this.get("dimY"); @@ -157,12 +159,12 @@ OctaBasePlane = BasePlane.extend({ var xOffset = 0; if (Math.abs(j)%2==0) { } else { - xOffset = 1/2*latticeScale; + xOffset = 1/2*xScale; } - vertices.push(new THREE.Vector3(i*latticeScale + xOffset - horizontalOffset, j*triangleHeight + baseVertOffset, 0)); - vertices.push(new THREE.Vector3(i*latticeScale + xOffset + horizontalOffset, j*triangleHeight + baseVertOffset, 0)); - vertices.push(new THREE.Vector3(i*latticeScale + xOffset, j*triangleHeight - pointVertOffset, 0)); + 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)); } diff --git a/js/models/Lattice.js b/js/models/Lattice.js index 5ffd611e0d9abca4fcdc53e72215b468395999c6..b9948e23dcc8f0edb5821453c592345f1e881fbe 100644 --- a/js/models/Lattice.js +++ b/js/models/Lattice.js @@ -375,11 +375,11 @@ Lattice = Backbone.Model.extend({ _initLatticeType: function(){ //bind events + this.set("columnSeparation", 0.0); this.listenTo(this, "change:columnSeparation", this._changeColSeparation); this.set("basePlane", new OctaBasePlane({scale:this.get("scale")})); this.set("highlighter", new OctaFaceHighlighter({scale:this.get("scale")})); - this.set("columnSeparation", 0.0); }, _changeColSeparation: function(){ @@ -452,11 +452,11 @@ Lattice = Backbone.Model.extend({ _initLatticeType: function(){ //bind events + this.set("columnSeparation", 0.0); this.listenTo(this, "change:columnSeparation", this._changeColSeparation); this.set("basePlane", new OctaBasePlane({scale:this.get("scale")})); this.set("highlighter", new OctaFaceHighlighter({scale:this.get("scale")})); - this.set("columnSeparation", 0.0); }, _changeColSeparation: function(){