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

fix warnings

This commit is contained in:
Sébastien Loriot 2015-07-16 10:14:42 +02:00
parent 6df729033d
commit f25bcd32aa
17 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
View File

@ -94,6 +94,7 @@ private:
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer)const
{
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT, viewer);

1
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
View File

@ -403,6 +403,7 @@ private:
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer)const
{
//vao containing the data for the facets

1
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
View File

@ -73,6 +73,7 @@ private:
std::vector<float> positions_lines;
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer)const
{

1
Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h
View File

@ -289,6 +289,7 @@ private:
mutable QOpenGLShaderProgram bbox_program;
mutable QOpenGLBuffer *in_bu;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_normals_and_vertices(void);
void compute_bbox(const Scene_interface::Bbox&);

1
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
View File

@ -107,6 +107,7 @@ private:
GLuint vao;
GLuint buffer[4];
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_vertices_and_texmap(void);
void compute_texture(int, int);

2
Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp
View File

@ -245,7 +245,7 @@ void Scene_nef_polyhedron_item::compute_normals_and_vertices(void)
}
//check if the facet is external or internal
std::queue<typename CDT::Face_handle> face_queue;
std::queue<CDT::Face_handle> face_queue;
face_queue.push(cdt.infinite_vertex()->face());
while(! face_queue.empty() ) {

1
Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
View File

@ -85,6 +85,7 @@ private:
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_normals_and_vertices(void);

1
Polyhedron/demo/Polyhedron/Scene_plane_item.h
View File

@ -158,6 +158,7 @@ private:
mutable bool smooth_shading;
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface*)const;
void compute_normals_and_vertices(void);
};

1
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
View File

@ -95,6 +95,7 @@ private:
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_normals_and_vertices(void);

2
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
View File

@ -188,7 +188,7 @@ Scene_polygon_soup_item::triangulate_polygon(Polygons_iterator pit)
}
//check if the facet is external or internal
std::queue<typename CDT::Face_handle> face_queue;
std::queue<CDT::Face_handle> face_queue;
face_queue.push(cdt.infinite_vertex()->face());
while(! face_queue.empty() ) {
CDT::Face_handle fh = face_queue.front();

1
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
View File

@ -170,6 +170,7 @@ private:
std::vector<float> positions_lines;
std::vector<float> normals;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_normals_and_vertices(void);
void triangulate_polygon(Polygons_iterator );

3
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
View File

@ -240,7 +240,7 @@ public:
typedef boost::unordered_set<Facet_handle, CGAL::Handle_hash_function> Selection_set_facet;
typedef boost::unordered_set<edge_descriptor, CGAL::Handle_hash_function> Selection_set_edge;
using Scene_polyhedron_item_decorator::draw;
virtual void draw(Viewer_interface*) const;
virtual void draw_edges() const { }
virtual void draw_edges(Viewer_interface*) const;
@ -704,6 +704,7 @@ private:
std::vector<float> positions_points;
mutable QOpenGLShaderProgram *program;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_elements();

2
Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
View File

@ -104,6 +104,7 @@ private:
std::vector<float> vertices;
mutable QOpenGLShaderProgram *program;
using Scene_polyhedron_item_decorator::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer = 0) const;
void compute_elements(void);
@ -120,6 +121,7 @@ public:
Primitives_mode get_primitives_mode() const;
virtual bool supportsRenderingMode(RenderingMode m) const;
using Scene_polyhedron_item_decorator::draw;
virtual void draw(Viewer_interface*) const;
// Points OpenGL drawing
virtual void draw_points(Viewer_interface*) const;

1
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
View File

@ -38,6 +38,7 @@ private:
qglviewer::Vec center_;
mutable QOpenGLShaderProgram *program;
std::vector<float> positions_lines;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_elements();

2
Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
View File

@ -463,7 +463,7 @@ Scene_polylines_item::compute_elements()
//Convert the triangle coordinates to lines coordinates for the
//Wiremode in the spheres
for(int i=0; i< (int) positions_spheres.size(); i=i)
for(int i=0; i< (int) positions_spheres.size();)
{
//draw triangles
if(i< (360/sectors)*12)

1
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
View File

@ -109,6 +109,7 @@ private:
typedef std::map<Point_3, int> Point_to_int_map;
typedef Point_to_int_map::iterator iterator;
void create_Sphere(double);
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_elements();

2
Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
View File

@ -62,6 +62,8 @@ private:
mutable QOpenGLShaderProgram* program;
bool smooth_shading;
using Scene_item::initialize_buffers;
void initialize_buffers(Viewer_interface *viewer) const;
void compute_normals_and_vertices(void);