From aad65ee4848e5515588ec2463b2bd494a099167f Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 10 Jun 2015 16:02:27 -0700
Subject: [PATCH] small changes
---
js/cells/CubeCell.js | 2 +-
js/cells/supercells/DMASuperCell.js | 4 +---
js/models/PList.js | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/js/cells/CubeCell.js b/js/cells/CubeCell.js
index 5dee4090..ff808f38 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 e02d5fd7..a0d89863 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 3323f103..6c30ae34 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"
}
}
},
--
GitLab