diff options
| author | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
| commit | 0b1029ff4d6f17a9f397adbf3f0a011cc20d76a5 (patch) | |
| tree | e59dc3c1f4068bb748ebedde54c935a5ab3ef9ca /src/polyset.h | |
| parent | 8dfc6d71cae370a84e50f4cc7624c05c859a4cea (diff) | |
| parent | 20280e88cacc8935de139cd2ce46836beda87e0b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/polyset.h')
| -rw-r--r-- | src/polyset.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/polyset.h b/src/polyset.h index 4ca57bf..6626f79 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -29,14 +29,15 @@ public: BoundingBox getBoundingBox() const; +#define CSGMODE_DIFFERENCE_FLAG 0x10 enum csgmode_e { - CSGMODE_NONE, - CSGMODE_NORMAL = 1, - CSGMODE_DIFFERENCE = 2, - CSGMODE_BACKGROUND = 11, - CSGMODE_BACKGROUND_DIFFERENCE = 12, - CSGMODE_HIGHLIGHT = 21, - CSGMODE_HIGHLIGHT_DIFFERENCE = 22 + CSGMODE_NONE = 0x00, + CSGMODE_NORMAL = 0x01, + CSGMODE_DIFFERENCE = CSGMODE_NORMAL | CSGMODE_DIFFERENCE_FLAG, + CSGMODE_BACKGROUND = 0x02, + CSGMODE_BACKGROUND_DIFFERENCE = CSGMODE_BACKGROUND | CSGMODE_DIFFERENCE_FLAG, + CSGMODE_HIGHLIGHT = 0x03, + CSGMODE_HIGHLIGHT_DIFFERENCE = CSGMODE_HIGHLIGHT | CSGMODE_DIFFERENCE_FLAG }; void render_surface(csgmode_e csgmode, const Transform3d &m, GLint *shaderinfo = NULL) const; |