Skip to content
Snippets Groups Projects
Commit 098c9f28 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

eod

parent 7b7515c5
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,12 @@ DMACell.prototype.getObject3D = function(){//careful, used for stock sim only fo
return this.object3D;
};
DMACell.prototype._rotateCell = function(object3D){
return object3D;//by default, no mesh transformations
};
......@@ -95,11 +101,16 @@ DMACell.prototype.getMaterial = function(){
DMACell.prototype.setOpacity = function(opacity){
};
DMACell.prototype._initParts = function(){
return [];//override in subclasses
};
DMACell.prototype.setSuperCell = function(superCell, index){
DMACell.prototype.setSuperCell = function(superCell, index){//todo get rid of this
this.superCell = superCell;
this.superCellIndex = index;
......
......@@ -14,11 +14,11 @@ Highlighter = Backbone.View.extend({
var geometry = this._makeGeometry();
this.mesh = new THREE.Mesh(geometry,
new THREE.MeshBasicMaterial({
side:THREE.DoubleSide,
// side:THREE.DoubleSide,
transparent:true,
opacity:0.4,
color:0xffffff,
vertexColors:THREE.FaceColors
color:0xffffff
// vertexColors:THREE.FaceColors
}));
globals.three.sceneAdd(this.mesh, null);
......@@ -120,7 +120,6 @@ Highlighter = Backbone.View.extend({
},
addRemoveVoxel: function(shouldAdd){
if (shouldAdd){
if (!this.isVisible() || !this.highlightedObject) return;
if (globals.lattice.get("connectionType") == "freeformFace"){
......@@ -233,7 +232,6 @@ GIKHighlighter = Highlighter.extend({
},
addRemoveVoxel: function(shouldAdd){
if (shouldAdd){
if (!this.isVisible() || !this.highlightedObject) return;
var position = this._getNextCellPosition();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment