From d55bb545f9af00429b1079b5be0059c41416c447 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 10 Jun 2015 15:50:06 -0700
Subject: [PATCH] super cell highlighter
---
js/highlighter/SuperCellHighlighter.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/js/highlighter/SuperCellHighlighter.js b/js/highlighter/SuperCellHighlighter.js
index 3fdd6589..c66d2fab 100644
--- a/js/highlighter/SuperCellHighlighter.js
+++ b/js/highlighter/SuperCellHighlighter.js
@@ -24,10 +24,8 @@ define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', '
},
_setPosition: function(position, direction){
- console.log(position);
this.mesh.position.set(position.x+lattice.xScale()*direction.x/2, position.y+lattice.yScale()*direction.y/2,
position.z+lattice.zScale()*direction.z/2);
- console.log(this.mesh.position);
},
_setRotation: function(direction){
@@ -39,9 +37,9 @@ define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', '
else this.mesh.rotation.set(0,0,0);
var superCellIndex = appState.get("superCellIndex");
- this.mesh.translateX(-((superCellIndex.x + 0.5)*lattice.xScale() - this.mesh.scale.x/2));
- this.mesh.translateY(-((superCellIndex.y + 0.5)*lattice.yScale() - this.mesh.scale.y/2));
- this.mesh.translateZ(-((superCellIndex.z + 0.5)*lattice.zScale() - this.mesh.scale.z/2));
+ this.mesh.translateX(-(superCellIndex.x + 0.5 - this.mesh.scale.x/2)*lattice.xScale());
+ this.mesh.translateY(-(superCellIndex.y + 0.5 - this.mesh.scale.y/2)*lattice.yScale());
+ this.mesh.translateZ(-(superCellIndex.z + 0.5 - this.mesh.scale.z/2)*lattice.zScale());
},
_superCellParamDidChange: function(){
--
GitLab