merge master

1 files changed, 78 insertions, 64 deletions

diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc
index 10160ae..550f300 100644
--- a/src/CGALEvaluator.cc
+++ b/src/CGALEvaluator.cc
@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <QRegExp>
 
+#include <boost/foreach.hpp>
+
 CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const AbstractNode &node)
 {
 	if (!isCached(node)) {
@@ -75,22 +77,23 @@ void CGALEvaluator::process(CGAL_Nef_polyhedron &target, const CGAL_Nef_polyhedr
 CGAL_Nef_polyhedron CGALEvaluator::applyToChildren(const AbstractNode &node, CGALEvaluator::CsgOp op)
 {
 	CGAL_Nef_polyhedron N;
-	if (this->visitedchildren[node.index()].size() > 0) {
-		for (ChildList::const_iterator iter = this->visitedchildren[node.index()].begin();
-				 iter != this->visitedchildren[node.index()].end();
-				 iter++) {
-			const AbstractNode *chnode = iter->first;
-			const string &chcacheid = iter->second;
-			// FIXME: Don't use deep access to modinst members
-			if (chnode->modinst->tag_background) continue;
-			assert(isCached(*chnode));
-			if (N.empty()) {
-				N = CGALCache::instance()->get(chcacheid).copy();
-			} else {
-				process(N, CGALCache::instance()->get(chcacheid), op);
-			}
-			chnode->progress_report();
+	BOOST_FOREACH(const ChildItem &item, this->visitedchildren[node.index()]) {
+		const AbstractNode *chnode = item.first;
+		const CGAL_Nef_polyhedron &chN = item.second;
+		// FIXME: Don't use deep access to modinst members
+		if (chnode->modinst->tag_background) continue;
+
+    // NB! We insert into the cache here to ensure that all children of
+    // a node is a valid object. If we inserted as we created them, the 
+    // cache could have been modified before we reach this point due to a large
+    // sibling object. 
+		if (!isCached(*chnode)) {
+			CGALCache::instance()->insert(this->tree.getIdString(*chnode), chN);
 		}
+		if (N.empty()) N = chN.copy();
+		else process(N, chN, op);
+
+		chnode->progress_report();
 	}
 	return N;
 }
@@ -100,31 +103,25 @@ extern CGAL_Nef_polyhedron2 *convexhull2(std::list<CGAL_Nef_polyhedron2*> a);
 CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node)
 {
 	CGAL_Nef_polyhedron N;
-	if (this->visitedchildren[node.index()].size() > 0) {
-		std::list<CGAL_Nef_polyhedron2*> polys;
-		bool all2d = true;
-		for (ChildList::const_iterator iter = this->visitedchildren[node.index()].begin();
-				 iter != this->visitedchildren[node.index()].end();
-				 iter++) {
-			const AbstractNode *chnode = iter->first;
-			const string &chcacheid = iter->second;
-			// FIXME: Don't use deep access to modinst members
-			if (chnode->modinst->tag_background) continue;
-			assert(isCached(*chnode));
-			const CGAL_Nef_polyhedron &ch = CGALCache::instance()->get(chcacheid);
-			if (ch.dim == 2) {
-		    polys.push_back(ch.p2.get());
-			}
-			else if (ch.dim == 3) {
-				PRINT("WARNING: hull() is not implemented yet for 3D objects!");
-		    all2d = false;
-			}
-			chnode->progress_report();
+	std::list<CGAL_Nef_polyhedron2*> polys;
+	bool all2d = true;
+	BOOST_FOREACH(const ChildItem &item, this->visitedchildren[node.index()]) {
+		const AbstractNode *chnode = item.first;
+		const CGAL_Nef_polyhedron &chN = item.second;
+		// FIXME: Don't use deep access to modinst members
+		if (chnode->modinst->tag_background) continue;
+		if (chN.dim == 2) {
+			polys.push_back(chN.p2.get());
 		}
-
-		if (all2d) {
-			N = CGAL_Nef_polyhedron(convexhull2(polys));
+		else if (chN.dim == 3) {
+			PRINT("WARNING: hull() is not implemented yet for 3D objects!");
+			all2d = false;
 		}
+		chnode->progress_report();
+	}
+	
+	if (all2d) {
+		N = CGAL_Nef_polyhedron(convexhull2(polys));
 	}
 	return N;
 }
@@ -140,11 +137,10 @@ Response CGALEvaluator::visit(State &state, const AbstractNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
-		if (!isCached(node)) {
-			CGAL_Nef_polyhedron N = applyToChildren(node, CGE_UNION);
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
-		}
-		addToParent(state, node);
+		CGAL_Nef_polyhedron N;
+		if (!isCached(node)) N = applyToChildren(node, CGE_UNION);
+		else N = CGALCache::instance()->get(this->tree.getIdString(node));
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -153,11 +149,10 @@ Response CGALEvaluator::visit(State &state, const AbstractIntersectionNode &node
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
-		if (!isCached(node)) {
-			CGAL_Nef_polyhedron N = applyToChildren(node, CGE_INTERSECTION);
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
-		}
-		addToParent(state, node);
+		CGAL_Nef_polyhedron N;
+		if (!isCached(node)) N = applyToChildren(node, CGE_INTERSECTION);
+		else N = CGALCache::instance()->get(this->tree.getIdString(node));
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -166,6 +161,7 @@ Response CGALEvaluator::visit(State &state, const CsgNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
+		CGAL_Nef_polyhedron N;
 		if (!isCached(node)) {
 			CGALEvaluator::CsgOp op;
 			switch (node.type) {
@@ -181,10 +177,12 @@ Response CGALEvaluator::visit(State &state, const CsgNode &node)
 			default:
 				assert(false);
 			}
-			CGAL_Nef_polyhedron N = applyToChildren(node, op);
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
+			N = applyToChildren(node, op);
+		}
+		else {
+			N = CGALCache::instance()->get(this->tree.getIdString(node));
 		}
-		addToParent(state, node);
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -193,9 +191,10 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
+		CGAL_Nef_polyhedron N;
 		if (!isCached(node)) {
 			// First union all children
-			CGAL_Nef_polyhedron N = applyToChildren(node, CGE_UNION);
+			N = applyToChildren(node, CGE_UNION);
 
 			// Then apply transform
 			// If there is no geometry under the transform, N will be empty and of dim 0,
@@ -231,9 +230,11 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node)
 					node.matrix(2,0), node.matrix(2,1), node.matrix(2,2), node.matrix(2,3), node.matrix(3,3));
 				N.p3->transform(t);
 			}
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
 		}
-		addToParent(state, node);
+		else {
+			N = CGALCache::instance()->get(this->tree.getIdString(node));
+		}
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -242,18 +243,20 @@ Response CGALEvaluator::visit(State &state, const AbstractPolyNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
+		CGAL_Nef_polyhedron N;
 		if (!isCached(node)) {
 			// Apply polyset operation
 			shared_ptr<PolySet> ps = this->psevaluator.getPolySet(node, false);
-			CGAL_Nef_polyhedron N;
 			if (ps) {
 				N = evaluateCGALMesh(*ps);
 //				print_messages_pop();
 				node.progress_report();
 			}
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
 		}
-		addToParent(state, node);
+		else {
+			N = CGALCache::instance()->get(this->tree.getIdString(node));
+		}
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -262,8 +265,8 @@ Response CGALEvaluator::visit(State &state, const CgaladvNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
+		CGAL_Nef_polyhedron N;
 		if (!isCached(node)) {
-			CGAL_Nef_polyhedron N;
 			CGALEvaluator::CsgOp op;
 			switch (node.type) {
 			case MINKOWSKI:
@@ -282,9 +285,11 @@ Response CGALEvaluator::visit(State &state, const CgaladvNode &node)
 				N = applyHull(node);
 				break;
 			}
-			CGALCache::instance()->insert(this->tree.getIdString(node), N);
 		}
-		addToParent(state, node);
+		else {
+			N = CGALCache::instance()->get(this->tree.getIdString(node));
+		}
+		addToParent(state, node, N);
 	}
 	return ContinueTraversal;
 }
@@ -293,12 +298,18 @@ Response CGALEvaluator::visit(State &state, const CgaladvNode &node)
 	Adds ourself to out parent's list of traversed children.
 	Call this for _every_ node which affects output during the postfix traversal.
 */
-void CGALEvaluator::addToParent(const State &state, const AbstractNode &node)
+void CGALEvaluator::addToParent(const State &state, const AbstractNode &node, const CGAL_Nef_polyhedron &N)
 {
 	assert(state.isPostfix());
 	this->visitedchildren.erase(node.index());
 	if (state.parent()) {
-		this->visitedchildren[state.parent()->index()].push_back(std::make_pair(&node, this->tree.getIdString(node)));
+		this->visitedchildren[state.parent()->index()].push_back(std::make_pair(&node, N));
+	}
+	else {
+		// Root node, insert into cache
+		if (!isCached(node)) {
+			CGALCache::instance()->insert(this->tree.getIdString(node), N);
+		}
 	}
 }
 
@@ -520,9 +531,12 @@ CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const PolySet &ps)
 		};
 
 		PolyReducer pr(ps);
-		PRINTF("Number of polygons before reduction: %d\n", pr.polygons.size());
+		int numpolygons_before = pr.polygons.size();
 		pr.reduce();
-		PRINTF("Number of polygons after reduction: %d\n", pr.polygons.size());
+		int numpolygons_after = pr.polygons.size();
+		if (numpolygons_after < numpolygons_before) {
+			PRINTF("reduce polygons: %d -> %d", numpolygons_before, numpolygons_after);
+		}
 		return CGAL_Nef_polyhedron(pr.toNef());
 #endif
 #if 0