From f17d91f4e3e4c49c6be22d4fbb6e8d4d00cae823 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 8 Jul 2015 14:51:48 +0200 Subject: [PATCH] Fix warnings about unused variables/local types/local functions --- Mesh_3/demo/Mesh_3/C3t3_rib_exporter_plugin.cpp | 4 ++-- Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp | 12 ------------ .../demo/Periodic_3_triangulation_3/Scene.cpp | 6 +++--- Triangulation_3/demo/Triangulation_3/Viewer.cpp | 6 +++--- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Mesh_3/demo/Mesh_3/C3t3_rib_exporter_plugin.cpp b/Mesh_3/demo/Mesh_3/C3t3_rib_exporter_plugin.cpp index f2fe7afacda..6881495f62c 100644 --- a/Mesh_3/demo/Mesh_3/C3t3_rib_exporter_plugin.cpp +++ b/Mesh_3/demo/Mesh_3/C3t3_rib_exporter_plugin.cpp @@ -716,8 +716,6 @@ void C3t3_rib_exporter_plugin:: write_surface_cells(const C3t3& c3t3, const Plane& plane, std::ofstream& out) { - typedef Kernel::Oriented_side Side; - for ( C3t3::Cells_in_complex_iterator it_cell = c3t3.cells_in_complex_begin(), end = c3t3.cells_in_complex_end() ; it_cell != end ; ++it_cell ) { @@ -788,6 +786,8 @@ write_surface_cells(const C3t3& c3t3, const Plane& plane, std::ofstream& out) QColor edgecolor = facecolor.darker(150); /* + typedef Kernel::Oriented_side Side; + // Transparency on the negative side of the plane const Side s0 = plane.oriented_side(c->vertex(0)->point()); const Side s1 = plane.oriented_side(c->vertex(1)->point()); diff --git a/Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp b/Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp index ef5596feb40..32249a091f8 100644 --- a/Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp +++ b/Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp @@ -19,18 +19,6 @@ #include #include -namespace { - void CGALglcolor(QColor c, int dv = 0) - { - if ( 0 != dv ) - { - c = c.darker(dv); -#undef darker - } - - ::glColor4f(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); - } -} struct Scene_c3t3_item_priv { Scene_c3t3_item_priv() : c3t3() {} Scene_c3t3_item_priv(const C3t3& c3t3_) : c3t3(c3t3_) {} diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp index d31def92de5..282228520be 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp @@ -1355,9 +1355,9 @@ void Scene::gl_draw_location() { Point cp = Point(c.x(),c.y(),c.z()); // project facet center double px,py,pz; - // gluProject(cp.x(),cp.y(),cp.z(), - // modelMatrix, projMatrix, viewport, - // &px,&py,&pz); + gluProject(cp.x(),cp.y(),cp.z(), + modelMatrix, projMatrix, viewport, + &px,&py,&pz); cf.push_back(Projected_triangle(pz,Triangle(p,q,r))); } } diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.cpp b/Triangulation_3/demo/Triangulation_3/Viewer.cpp index 815e1e91680..5905714d9e2 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.cpp +++ b/Triangulation_3/demo/Triangulation_3/Viewer.cpp @@ -2390,9 +2390,9 @@ void Viewer::draw_cylinder(float R, int prec, std::vector *vertices, std: { vertices->resize(0); normals->resize(0); - int rings=360/prec, sectors=360/prec; - float T, P; - float x[4],y[4],z[4]; + // int rings=360/prec, sectors=360/prec; + // float T, P; + // float x[4],y[4],z[4]; //Closing nicely the tubes will cause z-fighting and the spherical parts will get all messy /* //top of the cylinder