diff --git a/Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp b/Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp index 5aef9e52a92..ff66f64a1a7 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp @@ -83,12 +83,12 @@ void MainWindow::parameterize(const Parameterization_method method) scene->polyhedronRenderingMode(index)); Textured_polyhedron *pTex_polyhedron = new Textured_polyhedron(); - *((Polyhedron *)pTex_polyhedron) = *pMesh; // copy - scene->addTexPolyhedron(pTex_polyhedron, - tr("%1 (parameterization)").arg(scene->polyhedronName(index)), - Qt::magenta, - scene->isPolyhedronActivated(index), - scene->polyhedronRenderingMode(index)); + //*((Polyhedron *)pTex_polyhedron) = *pMesh; // copy -> BUG + //scene->addTexPolyhedron(pTex_polyhedron, + // tr("%1 (parameterization)").arg(scene->polyhedronName(index)), + // Qt::magenta, + // scene->isPolyhedronActivated(index), + // scene->polyhedronRenderingMode(index)); QApplication::setOverrideCursor(Qt::ArrowCursor); } diff --git a/Polyhedron/demo/Polyhedron/Scene.cpp b/Polyhedron/demo/Polyhedron/Scene.cpp index 2537679fd93..3d4708ef2b1 100644 --- a/Polyhedron/demo/Polyhedron/Scene.cpp +++ b/Polyhedron/demo/Polyhedron/Scene.cpp @@ -75,21 +75,21 @@ Scene::destroy_entry_ptr(Polyhedron_ptr ptr) { switch(ptr.which()) { - case POLYHEDRON_ENTRY: + case POLYHEDRON_ENTRY: { Polyhedron** p = boost::get(&ptr); Q_ASSERT(p != NULL); this->destroy_polyhedron(*p); break; } - case TEX_POLYHEDRON_ENTRY: + case TEX_POLYHEDRON_ENTRY: { Textured_polyhedron** p = boost::get(&ptr); Q_ASSERT(p != NULL); this->destroy_tex_polyhedron(*p); break; } - case NEF_ENTRY: + case NEF_ENTRY: { Nef_polyhedron** p = boost::get(&ptr); Q_ASSERT(p != NULL); @@ -307,11 +307,11 @@ Scene::draw(bool with_names) switch(entry.polyhedron_ptr.which()) { - case NEF_ENTRY: + case NEF_ENTRY: CGALglcolor(Qt::black); gl_render_nef_edges(boost::get(entry.polyhedron_ptr)); break; - case POLYHEDRON_ENTRY: + case POLYHEDRON_ENTRY: case TEX_POLYHEDRON_ENTRY: draw(entry); } @@ -353,25 +353,25 @@ void Scene::gl_render_facets(Polyhedron_ptr ptr) { case NEF_ENTRY: { - Nef_polyhedron* p = boost::get(ptr); - glEnable(GL_LIGHTING); - gl_render_nef_facets(p); - glDisable(GL_LIGHTING); - CGALglcolor(Qt::black); - gl_render_nef_vertices(p); - glEnable(GL_LIGHTING); - break; + Nef_polyhedron* p = boost::get(ptr); + glEnable(GL_LIGHTING); + gl_render_nef_facets(p); + glDisable(GL_LIGHTING); + CGALglcolor(Qt::black); + gl_render_nef_vertices(p); + glEnable(GL_LIGHTING); + break; } case POLYHEDRON_ENTRY: { - Polyhedron* p = boost::get(ptr); - gl_render_polyhedron_facets(p); - break; + Polyhedron* p = boost::get(ptr); + gl_render_polyhedron_facets(p); + break; } case TEX_POLYHEDRON_ENTRY: { - Textured_polyhedron* p = boost::get(ptr); - gl_render_polyhedron_facets(p); + Textured_polyhedron* p = boost::get(ptr); + gl_render_polyhedron_facets(p); } } } diff --git a/Polyhedron/demo/Polyhedron/Scene_rendering.cpp b/Polyhedron/demo/Polyhedron/Scene_rendering.cpp index f353731089b..6ec99de6b9b 100644 --- a/Polyhedron/demo/Polyhedron/Scene_rendering.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_rendering.cpp @@ -10,7 +10,7 @@ void gl_render_polyhedron_facets(Polyhedron *p) void gl_render_polyhedron_facets(Textured_polyhedron *p) { - gl_render_facets(*p); + //gl_render_facets(*p); } void gl_render_polyhedron_edges(Polyhedron *p)