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

Fix drawing of edges.

This commit is contained in:
Laurent Rineau 2008-07-16 16:39:19 +00:00
parent d47ab0f489
commit 96a79fccf5
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,38 +182,31 @@ Scene::draw()
if(entry.activated)
{
Polyhedron* poly = entry.polyhedron_ptr;
bool selected = index == selected_item;
if(entry.rendering_mode == Fill)
{
::glEnable(GL_LIGHTING);
::glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
draw(entry,selected);
::glDisable(GL_LIGHTING);
::glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
draw(entry,selected);
if(index == selected_item)
CGALglcolor(entry.color.lighter(120));
else
CGALglcolor(entry.color);
draw(entry);
}
::glDisable(GL_LIGHTING);
::glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
if(index == selected_item)
CGALglcolor(entry.color.lighter(70));
else
{
::glDisable(GL_LIGHTING);
::glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
draw(entry,selected);
}
CGALglcolor(entry.color.lighter(50));
draw(entry);
}
}
}
void
Scene::draw(Polyhedron_entry& entry,
const bool selected)
Scene::draw(Polyhedron_entry& entry)
{
::glEnable(GL_LIGHTING);
if(selected)
CGALglcolor(entry.color.lighter(120));
else
CGALglcolor(entry.color);
if(!entry.display_list_built)
{
::glDeleteLists(entry.display_list,1);
@ -232,9 +225,8 @@ Scene::draw(Polyhedron_entry& entry,
entry.display_list_built = true;
}
if(::glIsList(entry.display_list) == GL_TRUE)
// if(::glIsList(entry.display_list) == GL_TRUE)
::glCallList(entry.display_list);
}
int

2
Polyhedron/demo/Polyhedron/Scene.h
View File

@ -133,7 +133,7 @@ private:
bool display_list_built;
};
void draw(Polyhedron_entry& entry, const bool selected); // draw one entry
void draw(Polyhedron_entry& entry); // draw one entry
typedef QList<Polyhedron_entry> Polyhedra;
Polyhedra polyhedra;