Merge branch 'master' into visitor

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

1 files changed, 24 insertions, 0 deletions

diff --git a/src/opencsgrenderer.h b/src/opencsgrenderer.h
new file mode 100644
index 0000000..95ffc8e
--- /dev/null
+++ b/src/opencsgrenderer.h
@@ -0,0 +1,24 @@
+#ifndef OPENCSGRENDERER_H_
+#define OPENCSGRENDERER_H_
+
+#include "renderer.h"
+#include <GL/glew.h> // this must be included before the GL headers
+#include <qgl.h>
+
+class OpenCSGRenderer : public Renderer
+{
+public:
+	OpenCSGRenderer(class CSGChain *root_chain, CSGChain *highlights_chain, 
+									CSGChain *background_chain, GLint *shaderinfo);
+	void draw(bool showfaces, bool showedges) const;
+private:
+	void renderCSGChain(class CSGChain *chain, GLint *shaderinfo, 
+											bool highlight, bool background) const;
+
+	CSGChain *root_chain;
+	CSGChain *highlights_chain;
+	CSGChain *background_chain;
+	GLint *shaderinfo;
+};
+
+#endif