songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Demo polyhedron: commented addition of tex polyhedron and indentation.

This commit is contained in:
Pierre Alliez 2008-09-04 13:16:44 +00:00
parent 84bc8a904c
commit a3e70b5fa3
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polyhedron/demo/Polyhedron/MainWindow_parameterization.cpp
View File

@ -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);
}

36
Polyhedron/demo/Polyhedron/Scene.cpp
View File

@ -75,21 +75,21 @@ Scene::destroy_entry_ptr(Polyhedron_ptr ptr)
{
switch(ptr.which())
{
case POLYHEDRON_ENTRY:
case POLYHEDRON_ENTRY:
{
Polyhedron** p = boost::get<Polyhedron*>(&ptr);
Q_ASSERT(p != NULL);
this->destroy_polyhedron(*p);
break;
}
case TEX_POLYHEDRON_ENTRY:
case TEX_POLYHEDRON_ENTRY:
{
Textured_polyhedron** p = boost::get<Textured_polyhedron*>(&ptr);
Q_ASSERT(p != NULL);
this->destroy_tex_polyhedron(*p);
break;
}
case NEF_ENTRY:
case NEF_ENTRY:
{
Nef_polyhedron** p = boost::get<Nef_polyhedron*>(&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<Nef_polyhedron*>(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<Nef_polyhedron*>(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<Nef_polyhedron*>(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<Polyhedron*>(ptr);
gl_render_polyhedron_facets(p);
break;
Polyhedron* p = boost::get<Polyhedron*>(ptr);
gl_render_polyhedron_facets(p);
break;
}
case TEX_POLYHEDRON_ENTRY:
{
Textured_polyhedron* p = boost::get<Textured_polyhedron*>(ptr);
gl_render_polyhedron_facets(p);
Textured_polyhedron* p = boost::get<Textured_polyhedron*>(ptr);
gl_render_polyhedron_facets(p);
}
}
}

2
Polyhedron/demo/Polyhedron/Scene_rendering.cpp
View File

@ -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)