diff --git a/js/cells/CubeCell.js b/js/cells/CubeCell.js index 5dee4090af8cffbb870ef5633068d3b93c5e3a3e..ff808f388f58590c312b7cc98f56d23908f035c7 100644 --- a/js/cells/CubeCell.js +++ b/js/cells/CubeCell.js @@ -6,7 +6,7 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], function(_, THREE, three, lattice, appState, DMACell){ - var unitCellGeo = new THREE.BoxGeometry(lattice.xScale(0),lattice.yScale(0),lattice.zScale(0)); + var unitCellGeo = new THREE.BoxGeometry(1,1,1); function CubeCell(index, superCell){ DMACell.call(this, index, superCell); diff --git a/js/cells/supercells/DMASuperCell.js b/js/cells/supercells/DMASuperCell.js index e02d5fd7f39059f910d320dd1258c1992161f487..a0d89863e5c2c6b00b16da61b6321bb94c9f04d3 100644 --- a/js/cells/supercells/DMASuperCell.js +++ b/js/cells/supercells/DMASuperCell.js @@ -85,15 +85,13 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'], }; DMASuperCell.prototype._iterCells = function(callback){ - var self = this; var cells = this.cells; _.each(cells, function(cellLayer){ _.each(cellLayer, function(cellColumn){ _.each(cellColumn, function(cell){ - callback(self, cell, cellColumn, cellLayer); + callback(cell, cellColumn, cellLayer); }); }); - }); }; diff --git a/js/models/PList.js b/js/models/PList.js index 3323f103f5d40997ec2a6dacafbd2ab771e5f6b1..6c30ae34e7fc7f682644ca7d9e30c61e21b19bd9 100644 --- a/js/models/PList.js +++ b/js/models/PList.js @@ -142,12 +142,12 @@ define(['three'], function(THREE){ rigid:{ name: "Rigid", color: "#aaa", - altColor: "#8391AC" + altColor: "#666" }, flexure: { name: "Flexure", color: "#aaa", - altColor: "#666" + altColor: "#8391AC" } } },