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/opencsgrenderer.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/opencsgrenderer.h')
| -rw-r--r-- | src/opencsgrenderer.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/opencsgrenderer.h b/src/opencsgrenderer.h deleted file mode 100644 index 95ffc8e..0000000 --- a/src/opencsgrenderer.h +++ /dev/null @@ -1,24 +0,0 @@ -#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 |