diff --git a/js/models/BasePlane.js b/js/models/BasePlane.js index b349f156385ea963543644665b9c9b3d30658c9c..3cbb141c3d71e815e2036c0372a412c6b7e9da30 100644 --- a/js/models/BasePlane.js +++ b/js/models/BasePlane.js @@ -128,8 +128,12 @@ OctaBasePlane = BasePlane.extend({ _renderZIndexChange: function(){ var zIndex = this.get("zIndex"); var scale = dmaGlobals.lattice.get("scale"); + var xScale = dmaGlobals.lattice.xScale(scale); + var yScale = dmaGlobals.lattice.yScale(scale); + var zScale = dmaGlobals.lattice.zScale(scale); + _.each(this.get("mesh"), function(mesh){ - mesh.position.set(0, 0, zIndex*scale*2/Math.sqrt(6)); + mesh.position.set(xScale*(zIndex%2)/2, -yScale/3*(zIndex%2), zIndex*zScale); mesh.rotation.set(Math.PI*(zIndex%2),0,0) }); dmaGlobals.three.render(); @@ -220,9 +224,9 @@ SquareBasePlane = BasePlane.extend({ _renderZIndexChange: function(){ var zIndex = this.get("zIndex"); - var scale = dmaGlobals.lattice.get("scale"); + var zScale = dmaGlobals.lattice.zScale(); _.each(this.get("mesh"), function(mesh){ - mesh.position.set(0, 0, zIndex*scale); + mesh.position.set(0, 0, zIndex*zScale); }); dmaGlobals.three.render(); },