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

Merge pull request #4587 from maxGimeno/Demo-Fix_coff-maxGimeno 

Polyhedron Demo: Fix colored soups reading
This commit is contained in:
Sebastien Loriot 2020-03-23 13:19:06 +01:00 committed by GitHub
parent df1e7d3235 e8bb985edc
commit b8be965d18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,9 +41,14 @@ void Triangle_container::initGL( Viewer_interface* viewer)
} }
else else
{ {
if(!getVao(viewer)) if(!getVao(viewer))
setVao(viewer, new Vao(viewer->getShaderProgram(getProgram()))); setVao(viewer, new Vao(viewer->getShaderProgram(getProgram())));
//in both because of the soup item
if(!getVbo(VColors))
setVbo(VColors,
new Vbo("colors",
Vbo::COLORS));
getVao(viewer)->addVbo(getVbo(VColors));
if(isDataIndexed()) if(isDataIndexed())
{ {
if(!getVbo(Smooth_vertices)) if(!getVbo(Smooth_vertices))
@ -65,11 +70,6 @@ void Triangle_container::initGL( Viewer_interface* viewer)
Vbo::NORMALS)); Vbo::NORMALS));
getVao(viewer)->addVbo(getVbo(Smooth_normals)); getVao(viewer)->addVbo(getVbo(Smooth_normals));
} }
if(!getVbo(VColors))
setVbo(VColors,
new Vbo("colors",
Vbo::COLORS));
getVao(viewer)->addVbo(getVbo(VColors));
if(viewer->getShaderProgram(getProgram())->property("hasDistanceValues").toBool()) if(viewer->getShaderProgram(getProgram())->property("hasDistanceValues").toBool())
{ {
if(!getVbo(Distances)) if(!getVbo(Distances))