diff options
author | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
commit | 2af5648eda19ef006715d02c8a917229824ba5a8 (patch) | |
tree | b1b727198ae1d68d21c5936fcf99d8231b43fe88 /src/throwntogetherrenderer.h | |
parent | c65a3f5d743a75b1e4adc0da46b13a2cf8998def (diff) | |
parent | 00d7bb401c0732a5f1b33cd0059a643933286c5d (diff) |
Merge branch 'master' into visitor
Conflicts:
src/OpenCSGRenderer.cc
src/csgops.cc
src/mainwin.cc
src/polyset.cc
src/projection.cc
Diffstat (limited to 'src/throwntogetherrenderer.h')
-rw-r--r-- | src/throwntogetherrenderer.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/throwntogetherrenderer.h b/src/throwntogetherrenderer.h deleted file mode 100644 index 09d13f3..0000000 --- a/src/throwntogetherrenderer.h +++ /dev/null @@ -1,21 +0,0 @@ -#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 |