From 10d7350bfb6e9578de5580418e07eb5c35a3ac18 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 27 May 2015 15:24:27 -0700
Subject: [PATCH] highlighter looks good
---
js/cells/DMACell.js | 1 +
js/cells/supercells/GIKSuperCell.js | 2 +-
js/threeViews/Highlighter.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/js/cells/DMACell.js b/js/cells/DMACell.js
index c1e28eeb..73b1644b 100644
--- a/js/cells/DMACell.js
+++ b/js/cells/DMACell.js
@@ -105,6 +105,7 @@ DMACell.prototype.setSuperCell = function(superCell, index){
DMACell.prototype.setMode = function(mode){
if (mode === undefined) mode = globals.appState.get("cellMode");
+ if (this.superCell) this.superCell.setMode(mode);
switch(mode) {
case "cell":
diff --git a/js/cells/supercells/GIKSuperCell.js b/js/cells/supercells/GIKSuperCell.js
index d18c44be..65c5e454 100644
--- a/js/cells/supercells/GIKSuperCell.js
+++ b/js/cells/supercells/GIKSuperCell.js
@@ -19,7 +19,7 @@ GIKSuperCell = function(length, range, cells){
});
if (this.indices) globals.three.sceneAdd(this.object3D, "supercell");
-// this.setMode();
+ this.setMode();
};
GIKSuperCell.prototype = Object.create(DMACell.prototype);
diff --git a/js/threeViews/Highlighter.js b/js/threeViews/Highlighter.js
index bb032115..efe36725 100644
--- a/js/threeViews/Highlighter.js
+++ b/js/threeViews/Highlighter.js
@@ -206,7 +206,7 @@ CubeHighlighter = Highlighter.extend({
GIKHighlighter = Highlighter.extend({
_makeGeometry: function(){
- return new THREE.BoxGeometry(1,1,1);//globals.lattice.zScale(0)
+ return new THREE.BoxGeometry(1,1,globals.lattice.zScale(0));
},
_setPosition: function(position, direction){
--
GitLab