From 426896a6cf27fcf4ce3b4c4ceec67aeb831bf0b8 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 24 Jun 2015 14:45:11 -0700
Subject: [PATCH] gik bound calculated correctly
---
js/lattice/LatticeBase.js | 3 +++
js/menus/MaterialEditorMenuView.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js
index adff6d49..06fdd267 100644
--- a/js/lattice/LatticeBase.js
+++ b/js/lattice/LatticeBase.js
@@ -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);
}
}
});
diff --git a/js/menus/MaterialEditorMenuView.js b/js/menus/MaterialEditorMenuView.js
index 8ad5e68d..deafc0c6 100644
--- a/js/menus/MaterialEditorMenuView.js
+++ b/js/menus/MaterialEditorMenuView.js
@@ -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)
--
GitLab