diff options
| author | Giles Bathgate <gilesbathgate@gmail.com> | 2011-04-09 05:42:00 (GMT) |
|---|---|---|
| committer | Giles Bathgate <gilesbathgate@gmail.com> | 2011-04-09 05:42:00 (GMT) |
| commit | e02eb751b136e656e25518c41bd8572e20d46997 (patch) | |
| tree | bd015bf72af119e3b47c1803fe0e7171c002907f /src/mainwin.cc | |
| parent | 2ddbc3f1bc86253f2cfd09a9ec1757bd3656242c (diff) | |
Move setColor into Polyhedron class which is a much more sensible place.
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index d3df908..24136bf 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -78,7 +78,7 @@ #if 1 #include "CGAL_renderer.h" using OpenSCAD::OGL::Polyhedron; -using OpenSCAD::OGL::Nef3_Converter; +using CGAL::OGL::Nef3_Converter; #else // a little hackish: we need access to default-private members of // CGAL::OGL::Nef3_Converter so we can implement our own draw function @@ -1493,11 +1493,11 @@ static void renderGLviaCGAL(void *vp) Polyhedron *p = (Polyhedron*)m->cgal_ogl_p; if (!p) { m->cgal_ogl_p = p = new Polyhedron(); - Nef3_Converter<CGAL_Nef_polyhedron3>::setColor(p,Polyhedron::CGAL_NEF3_MARKED_FACET_COLOR, + p->setColor(Polyhedron::CGAL_NEF3_MARKED_FACET_COLOR, Preferences::inst()->color(Preferences::CGAL_FACE_BACK_COLOR).red(), Preferences::inst()->color(Preferences::CGAL_FACE_BACK_COLOR).green(), Preferences::inst()->color(Preferences::CGAL_FACE_BACK_COLOR).blue()); - Nef3_Converter<CGAL_Nef_polyhedron3>::setColor(p,Polyhedron::CGAL_NEF3_UNMARKED_FACET_COLOR, + p->setColor(Polyhedron::CGAL_NEF3_UNMARKED_FACET_COLOR, Preferences::inst()->color(Preferences::CGAL_FACE_FRONT_COLOR).red(), Preferences::inst()->color(Preferences::CGAL_FACE_FRONT_COLOR).green(), Preferences::inst()->color(Preferences::CGAL_FACE_FRONT_COLOR).blue()); |