Implemented CGAL caching

1 files changed, 3 insertions, 5 deletions

diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h
index a8e9844..c1b5ae8 100644
--- a/src/CGALEvaluator.h
+++ b/src/CGALEvaluator.h
@@ -20,8 +20,7 @@ class CGALEvaluator : public Visitor
 {
 public:
 	enum CsgOp {CGE_UNION, CGE_INTERSECTION, CGE_DIFFERENCE, CGE_MINKOWSKI};
-	// FIXME: If a cache is not given, we need to fix this ourselves
-	CGALEvaluator(QHash<string, CGAL_Nef_polyhedron> &cache, const Tree &tree) : cache(cache), tree(tree), psevaluator(*this) {}
+	CGALEvaluator(const Tree &tree) : tree(tree), psevaluator(*this) {}
   virtual ~CGALEvaluator() {}
 
   virtual Response visit(State &state, const AbstractNode &node);
@@ -40,14 +39,13 @@ private:
   void addToParent(const State &state, const AbstractNode &node);
   bool isCached(const AbstractNode &node) const;
 	void process(CGAL_Nef_polyhedron &target, const CGAL_Nef_polyhedron &src, CGALEvaluator::CsgOp op);
-	void applyToChildren(const AbstractNode &node, CGALEvaluator::CsgOp op);
-	void applyHull(const CgaladvNode &node);
+	CGAL_Nef_polyhedron applyToChildren(const AbstractNode &node, CGALEvaluator::CsgOp op);
+	CGAL_Nef_polyhedron applyHull(const CgaladvNode &node);
 
   string currindent;
   typedef list<pair<const AbstractNode *, string> > ChildList;
   map<int, ChildList> visitedchildren;
 
-	QHash<string, CGAL_Nef_polyhedron> &cache;
 	const Tree &tree;
 public:
 	// FIXME: Do we need to make this visible? Used for cache management