Fix warnings

This commit is contained in:
Maxime Gimeno 2018-07-16 14:24:53 +02:00
parent 8a289ed498
commit 390967dfe6
2 changed files with 12 additions and 13 deletions

View File

@ -378,15 +378,15 @@ void
Scene_polylines_item::draw(CGAL::Three::Viewer_interface* viewer) const { Scene_polylines_item::draw(CGAL::Three::Viewer_interface* viewer) const {
if(!visible()) if(!visible())
return; return;
if(!are_buffers_filled) if(!are_buffers_filled)
{ {
d->computeElements(); d->computeElements();
d->initializeBuffers(viewer); d->initializeBuffers(viewer);
} }
if(d->draw_extremities) if(d->draw_extremities)
{ {
Scene_group_item::draw(viewer); Scene_group_item::draw(viewer);
} }
} }
// Wireframe OpenGL drawing // Wireframe OpenGL drawing

View File

@ -191,12 +191,11 @@ void Scene::render_polyhedron(Viewer *viewer)
// draw black edges // draw black edges
if(m_pPolyhedron != NULL) if(m_pPolyhedron != NULL)
{ {
typedef typename Polyhedron::Traits Kernel; typedef Kernel::Point_3 Point;
typedef typename Kernel::Point_3 Point;
std::vector<GLfloat> verts; std::vector<GLfloat> verts;
typename Polyhedron::Edge_iterator he; Polyhedron::Edge_iterator he;
for(he = m_pPolyhedron->edges_begin(); for(he = m_pPolyhedron->edges_begin();
he != m_pPolyhedron->edges_end(); he != m_pPolyhedron->edges_end();
he++) he++)
@ -213,7 +212,7 @@ void Scene::render_polyhedron(Viewer *viewer)
rendering_program.setAttributeBuffer("vertex", GL_FLOAT, 0,3); rendering_program.setAttributeBuffer("vertex", GL_FLOAT, 0,3);
rendering_program.enableAttributeArray("vertex"); rendering_program.enableAttributeArray("vertex");
buffers[3].release(); buffers[3].release();
viewer->glDrawArrays(GL_LINES, 0, verts.size()/3); viewer->glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(verts.size()/3));
vao[3].release(); vao[3].release();
} }
} }