Merge branch 'master' into visitor

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

1 files changed, 20 insertions, 0 deletions

diff --git a/src/cgalrenderer.h b/src/cgalrenderer.h
new file mode 100644
index 0000000..b3c1638
--- /dev/null
+++ b/src/cgalrenderer.h
@@ -0,0 +1,20 @@
+#ifndef CGALRENDERER_H_
+#define CGALRENDERER_H_
+
+#include "renderer.h"
+#include "cgal.h"
+
+class CGALRenderer : public Renderer
+{
+public:
+	CGALRenderer(const CGAL_Nef_polyhedron &root);
+	~CGALRenderer();
+	void draw(bool showfaces, bool showedges) const;
+
+private:
+	const CGAL_Nef_polyhedron &root;
+	class Polyhedron *polyhedron;
+	class PolySet *polyset;
+};
+
+#endif