diff --git a/js/three/FillGeometry.js b/js/three/FillGeometry.js index 8fcf1f8b8472727c96d5c06222703a32b2fb9369..0b0d386cf39d69fda1ba1ba04d449f58b4eb0330 100644 --- a/js/three/FillGeometry.js +++ b/js/three/FillGeometry.js @@ -10,7 +10,6 @@ define(['three', 'underscore', 'backbone', 'lattice', 'threeModel'], defaults: { filename: "No File Loaded", mesh: null, - boundingBox: null,//show bounding box for mesh scale: 1 }, @@ -47,8 +46,8 @@ define(['three', 'underscore', 'backbone', 'lattice', 'threeModel'], var scale = this.get("scale"); var offset = this.get("mesh").position.clone(); console.log(offset); - var scaledMin = boundingBox.min.clone().multiplyScalar(scale).add(offset); - var scaledMax = boundingBox.max.clone().multiplyScalar(scale).add(offset); + var scaledMin = boundingBox.min.clone().multiplyScalar(scale);//.add(offset) + var scaledMax = boundingBox.max.clone().multiplyScalar(scale); var minIndex = lattice.getIndexForPosition(scaledMin); var maxIndex = lattice.getIndexForPosition(scaledMax); @@ -115,9 +114,7 @@ define(['three', 'underscore', 'backbone', 'lattice', 'threeModel'], removeMesh: function(){ if (!this.get("mesh")) return; three.sceneRemove(this.get("mesh")); - three.sceneRemove(this.get("boundingBox")); this.set("mesh", null); - this.set("boundingBox", null); this.set("filename", this.defaults.filename); three.render(); }, diff --git a/todo b/todo index f709229dacef094ca7b9d95b0a140073166de11e..689cbfd84a16b6b8be267e7757d9e95d2e7b202d 100644 --- a/todo +++ b/todo @@ -1,5 +1,4 @@ import - offset, scale, rotation -fill geometry persists parse sparseCells -> cells hierarchical