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

Merge pull request #2378 from maxGimeno/Fix_c3t3_intersection_visibility-GF 

Polyhedron demo: Fix the c3t3 tets visibility.
This commit is contained in:
Laurent Rineau 2017-09-04 15:09:17 +02:00
parent 0c30b8697a 85c35e905f
commit f931c5e2ce
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
View File

@ -43,7 +43,8 @@ class Scene_intersection_item : public CGAL::Three::Scene_item
Q_OBJECT
public :
Scene_intersection_item(Scene_c3t3_item* parent)
:CGAL::Three::Scene_item(NumberOfBuffers,NumberOfVaos)
:CGAL::Three::Scene_item(NumberOfBuffers,NumberOfVaos),
is_fast(false)
{
setParent(parent);
}
@ -130,6 +131,8 @@ public :
//Displays the item
void draw(CGAL::Three::Viewer_interface* viewer) const
{
if(is_fast)
return;
vaos[Facets]->bind();
program = getShaderProgram(PROGRAM_C3T3_TETS);
attribBuffers(viewer, PROGRAM_C3T3_TETS);
@ -144,6 +147,8 @@ public :
}
void drawEdges(CGAL::Three::Viewer_interface* viewer) const
{
if(is_fast)
return;
vaos[Lines]->bind();
program = getShaderProgram(PROGRAM_NO_SELECTION);
attribBuffers(viewer, PROGRAM_NO_SELECTION);
@ -153,6 +158,12 @@ public :
program->release();
vaos[Lines]->release();
}
void setFast(bool b)
{
is_fast = b;
}
void addTriangle(const Tr::Bare_point& pa, const Tr::Bare_point& pb,
const Tr::Bare_point& pc, const CGAL::Color color)
{
@ -241,6 +252,7 @@ private:
mutable std::vector<float> *colors;
mutable std::vector<float> *barycenters;
mutable QOpenGLShaderProgram *program;
mutable bool is_fast;
}; //end of class Scene_triangle_item
@ -901,16 +913,17 @@ void Scene_c3t3_item::draw(CGAL::Three::Viewer_interface* viewer) const {
vaos[Scene_c3t3_item_priv::Facets]->release();
if(d->show_tetrahedra){
if(!d->frame->isManipulated())
d->intersection->setFast(false);
else
d->intersection->setFast(true);
if(!d->frame->isManipulated() && !d->are_intersection_buffers_filled)
{
if(!d->intersection->visible())
d->intersection->setVisible(true);
ncthis->d->computeIntersections();
d->intersection->initialize_buffers(viewer);
d->are_intersection_buffers_filled = true;
}
else if(d->frame->isManipulated() && d->intersection->visible())
d->intersection->setVisible(false);
}
if(d->spheres_are_shown)
@ -979,16 +992,16 @@ void Scene_c3t3_item::drawEdges(CGAL::Three::Viewer_interface* viewer) const {
vaos[Scene_c3t3_item_priv::Edges]->release();
if(d->show_tetrahedra){
if(!d->frame->isManipulated())
d->intersection->setFast(false);
else
d->intersection->setFast(true);
if(!d->frame->isManipulated() && !d->are_intersection_buffers_filled)
{
if(!d->intersection->visible())
d->intersection->setVisible(true);
ncthis->d->computeIntersections();
d->intersection->initialize_buffers(viewer);
d->are_intersection_buffers_filled = true;
}
else if(d->frame->isManipulated() && d->intersection->visible())
d->intersection->setVisible(false);
}
if(d->spheres_are_shown)
{