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

gik bound calculated correctly

parent 96dd0813
Branches
No related tags found
No related merge requests found
......@@ -206,6 +206,9 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
if (material.dimensions){
var subCellMax = (new THREE.Vector3(x, y, z)).add(material.dimensions);
dimVector.max(subCellMax);
} else if (cell.length){
var subCellMax = (new THREE.Vector3(x, y, z)).add(cell.applyAbsoluteRotation(new THREE.Vector3(cell.length, 1, 1)));
dimVector.max(subCellMax);
}
}
});
......
......@@ -21,7 +21,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!materi
},
_makeTemplateJSON: function(){
return _.extend(plist, {name:"name", color:"#ffff00", altColor:"#00ffff"});
return _.extend({name:"name", color:"#ffff00", altColor:"#00ffff"}, plist);
},
template: _.template(template)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment