From 7bd2b14429dca91ca6cbb60b671d55489e738dff Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 4 Nov 2015 12:02:49 +0100 Subject: [PATCH] Clean-up in Scene_implicit_function_item --- Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp index cce34f625d9..a98ceec9023 100644 --- a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp @@ -61,7 +61,6 @@ void Scene_implicit_function_item::initialize_buffers(CGAL::Three::Viewer_interf program->setAttributeBuffer("vertex",GL_FLOAT,0,3); buffers[2].release(); - program->setAttributeValue("colors", QVector3D(0,0,0)); program->release(); vaos[1]->release(); } @@ -78,7 +77,6 @@ void Scene_implicit_function_item::initialize_buffers(CGAL::Three::Viewer_interf program->enableAttributeArray("vertex"); program->setAttributeBuffer("vertex",GL_FLOAT,0,3); buffers[3].release(); - program->setAttributeValue("colors", QVector3D(0.6f, 0.6f, 0.6f)); program->release(); vaos[2]->release(); } @@ -429,6 +427,7 @@ Scene_implicit_function_item::draw_edges(CGAL::Three::Viewer_interface* viewer) attrib_buffers(viewer, PROGRAM_WITHOUT_LIGHT); program = getShaderProgram(PROGRAM_WITHOUT_LIGHT); program->bind(); + program->setAttributeValue("colors", QVector3D(0,0,0)); viewer->glDrawArrays(GL_LINES, 0, static_cast(positions_cube.size()/3)); vaos[1]->release(); vaos[2]->bind(); @@ -440,6 +439,7 @@ Scene_implicit_function_item::draw_edges(CGAL::Three::Viewer_interface* viewer) f_mat.data()[i] = GLfloat(d_mat[i]); } program->setUniformValue("f_matrix", f_mat); + program->setAttributeValue("colors", QVector3D(0.6,0.6,0.6)); viewer->glDrawArrays(GL_LINES, 0, static_cast(positions_grid.size()/3)); vaos[2]->release(); program->release();