Merge branch 'master' into visitor

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

1 files changed, 21 insertions, 0 deletions

diff --git a/src/throwntogetherrenderer.h b/src/throwntogetherrenderer.h
new file mode 100644
index 0000000..09d13f3
--- /dev/null
+++ b/src/throwntogetherrenderer.h
@@ -0,0 +1,21 @@
+#ifndef THROWNTOGETHERRENDERER_H_
+#define THROWNTOGETHERRENDERER_H_
+
+#include "renderer.h"
+
+class ThrownTogetherRenderer : public Renderer
+{
+public:
+	ThrownTogetherRenderer(class CSGChain *root_chain,
+												 CSGChain *highlights_chain, CSGChain *background_chain);
+	void draw(bool showfaces, bool showedges) const;
+private:
+	void renderCSGChain(CSGChain *chain, bool highlight, bool background, bool showedges, 
+											bool fberror) const;
+
+	CSGChain *root_chain;
+	CSGChain *highlights_chain;
+	CSGChain *background_chain;
+};
+
+#endif