From 86733e890ed559a4c8f5c30bef15844d2d7bad43 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 30 Jun 2015 16:03:54 -0700
Subject: [PATCH] done with fill geo for now
---
js/three/FillGeometry.js | 7 ++-----
todo | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/js/three/FillGeometry.js b/js/three/FillGeometry.js
index 8fcf1f8b..0b0d386c 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 f709229d..689cbfd8 100644
--- a/todo
+++ b/todo
@@ -1,5 +1,4 @@
import - offset, scale, rotation
-fill geometry persists
parse sparseCells -> cells
hierarchical
--
GitLab