diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /src/polyset.h | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'src/polyset.h')
| -rw-r--r-- | src/polyset.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/polyset.h b/src/polyset.h index 57f5057..5698621 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -27,14 +27,6 @@ public: BoundingBox getBoundingBox() const; - enum colormode_e { - COLORMODE_NONE, - COLORMODE_MATERIAL, - COLORMODE_CUTOUT, - COLORMODE_HIGHLIGHT, - COLORMODE_BACKGROUND - }; - enum csgmode_e { CSGMODE_NONE, CSGMODE_NORMAL = 1, @@ -45,8 +37,8 @@ public: CSGMODE_HIGHLIGHT_DIFFERENCE = 22 }; - void render_surface(colormode_e colormode, csgmode_e csgmode, const Transform3d &m, GLint *shaderinfo = NULL) const; - void render_edges(colormode_e colormode, csgmode_e csgmode) const; + void render_surface(csgmode_e csgmode, const Transform3d &m, GLint *shaderinfo = NULL) const; + void render_edges(csgmode_e csgmode) const; }; #endif |