diff options
| author | Marius Kintel <kintel@sim.no> | 2010-03-02 18:22:31 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2010-10-31 00:42:34 (GMT) |
| commit | 393c5a19fedfa4f97ca939fbcf52c2ccab1cde6a (patch) | |
| tree | fbcb75d32e8763aac3f0ad28528936a0ec11930b /src/polyset.cc | |
| parent | 746159d1838e895e80725cdc892f7bef85feb1af (diff) | |
Committed current version of visitor refactoring
Diffstat (limited to 'src/polyset.cc')
| -rw-r--r-- | src/polyset.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/polyset.cc b/src/polyset.cc index d438769..4548f8a 100644 --- a/src/polyset.cc +++ b/src/polyset.cc @@ -144,7 +144,9 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m bool mirrored = m3f.determinant() < 0; if (colormode == COLORMODE_MATERIAL) { - const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_FRONT_COLOR); +// FIXME: Reenable/rewrite - don't be dependant on GUI +// const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_FRONT_COLOR); + const QColor &col = QColor(0xf9, 0xd7, 0x2c); glColor3f(col.redF(), col.greenF(), col.blueF()); #ifdef ENABLE_OPENCSG if (shaderinfo) { @@ -154,7 +156,9 @@ void PolySet::render_surface(colormode_e colormode, csgmode_e csgmode, double *m #endif /* ENABLE_OPENCSG */ } if (colormode == COLORMODE_CUTOUT) { - const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_BACK_COLOR); +// FIXME: Reenable/rewrite - don't be dependant on GUI +// const QColor &col = Preferences::inst()->color(Preferences::OPENCSG_FACE_BACK_COLOR); + const QColor &col = QColor(0x9d, 0xcb, 0x51); glColor3f(col.redF(), col.greenF(), col.blueF()); #ifdef ENABLE_OPENCSG if (shaderinfo) { @@ -407,7 +411,7 @@ public: } }; -CGAL_Nef_polyhedron PolySet::render_cgal_nef_polyhedron() const +CGAL_Nef_polyhedron PolySet::renderCSGMesh() const { if (this->is2d) { |