Merge branch 'master' into visitor

Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc

1 files changed, 56 insertions, 0 deletions

diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h
new file mode 100644
index 0000000..282d6ab
--- /dev/null
+++ b/src/CGALEvaluator.h
@@ -0,0 +1,56 @@
+#ifndef CGALEVALUATOR_H_
+#define CGALEVALUATOR_H_
+
+#include "myqhash.h"
+#include "visitor.h"
+#include "Tree.h"
+#include "cgal.h"
+#include "PolySetCGALEvaluator.h"
+
+#include <string>
+#include <map>
+#include <list>
+
+extern CGAL_Nef_polyhedron3 minkowski3(CGAL_Nef_polyhedron3 a, CGAL_Nef_polyhedron3 b);
+extern CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2 a, CGAL_Nef_polyhedron2 b);
+
+using std::string;
+using std::map;
+using std::list;
+using std::pair;
+
+class CGALEvaluator : public Visitor
+{
+public:
+	enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI, HULL};
+	// 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) {}
+  virtual ~CGALEvaluator() {}
+
+  virtual Response visit(State &state, const AbstractNode &node);
+ 	virtual Response visit(State &state, const AbstractIntersectionNode &node);
+ 	virtual Response visit(State &state, const CsgNode &node);
+ 	virtual Response visit(State &state, const TransformNode &node);
+	virtual Response visit(State &state, const AbstractPolyNode &node);
+
+ 	CGAL_Nef_polyhedron evaluateCGALMesh(const AbstractNode &node);
+	CGAL_Nef_polyhedron evaluateCGALMesh(const PolySet &polyset);
+
+	const Tree &getTree() const { return this->tree; }
+
+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);
+
+  string currindent;
+  typedef list<pair<const AbstractNode *, string> > ChildList;
+  map<int, ChildList> visitedchildren;
+
+	QHash<string, CGAL_Nef_polyhedron> &cache;
+	const Tree &tree;
+	PolySetCGALEvaluator psevaluator;
+};
+
+#endif