mirror of https://github.com/CGAL/cgal
fix warnings
This commit is contained in:
parent
6df729033d
commit
f25bcd32aa
|
|
@ -94,6 +94,7 @@ private:
|
||||||
|
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer)const
|
void initialize_buffers(Viewer_interface *viewer)const
|
||||||
{
|
{
|
||||||
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT, viewer);
|
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT, viewer);
|
||||||
|
|
|
||||||
|
|
@ -403,6 +403,7 @@ private:
|
||||||
|
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer)const
|
void initialize_buffers(Viewer_interface *viewer)const
|
||||||
{
|
{
|
||||||
//vao containing the data for the facets
|
//vao containing the data for the facets
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ private:
|
||||||
|
|
||||||
std::vector<float> positions_lines;
|
std::vector<float> positions_lines;
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer)const
|
void initialize_buffers(Viewer_interface *viewer)const
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -289,6 +289,7 @@ private:
|
||||||
mutable QOpenGLShaderProgram bbox_program;
|
mutable QOpenGLShaderProgram bbox_program;
|
||||||
|
|
||||||
mutable QOpenGLBuffer *in_bu;
|
mutable QOpenGLBuffer *in_bu;
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
void compute_bbox(const Scene_interface::Bbox&);
|
void compute_bbox(const Scene_interface::Bbox&);
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,7 @@ private:
|
||||||
|
|
||||||
GLuint vao;
|
GLuint vao;
|
||||||
GLuint buffer[4];
|
GLuint buffer[4];
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_vertices_and_texmap(void);
|
void compute_vertices_and_texmap(void);
|
||||||
void compute_texture(int, int);
|
void compute_texture(int, int);
|
||||||
|
|
|
||||||
|
|
@ -245,7 +245,7 @@ void Scene_nef_polyhedron_item::compute_normals_and_vertices(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
//check if the facet is external or internal
|
//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());
|
face_queue.push(cdt.infinite_vertex()->face());
|
||||||
|
|
||||||
while(! face_queue.empty() ) {
|
while(! face_queue.empty() ) {
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@ private:
|
||||||
|
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -158,6 +158,7 @@ private:
|
||||||
mutable bool smooth_shading;
|
mutable bool smooth_shading;
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface*)const;
|
void initialize_buffers(Viewer_interface*)const;
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,7 @@ private:
|
||||||
|
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
|
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ Scene_polygon_soup_item::triangulate_polygon(Polygons_iterator pit)
|
||||||
}
|
}
|
||||||
|
|
||||||
//check if the facet is external or internal
|
//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());
|
face_queue.push(cdt.infinite_vertex()->face());
|
||||||
while(! face_queue.empty() ) {
|
while(! face_queue.empty() ) {
|
||||||
CDT::Face_handle fh = face_queue.front();
|
CDT::Face_handle fh = face_queue.front();
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,7 @@ private:
|
||||||
std::vector<float> positions_lines;
|
std::vector<float> positions_lines;
|
||||||
std::vector<float> normals;
|
std::vector<float> normals;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
void triangulate_polygon(Polygons_iterator );
|
void triangulate_polygon(Polygons_iterator );
|
||||||
|
|
|
||||||
|
|
@ -240,7 +240,7 @@ public:
|
||||||
typedef boost::unordered_set<Facet_handle, CGAL::Handle_hash_function> Selection_set_facet;
|
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;
|
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(Viewer_interface*) const;
|
||||||
virtual void draw_edges() const { }
|
virtual void draw_edges() const { }
|
||||||
virtual void draw_edges(Viewer_interface*) const;
|
virtual void draw_edges(Viewer_interface*) const;
|
||||||
|
|
@ -704,6 +704,7 @@ private:
|
||||||
std::vector<float> positions_points;
|
std::vector<float> positions_points;
|
||||||
|
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_elements();
|
void compute_elements();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,7 @@ private:
|
||||||
std::vector<float> vertices;
|
std::vector<float> vertices;
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
|
|
||||||
|
using Scene_polyhedron_item_decorator::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer = 0) const;
|
void initialize_buffers(Viewer_interface *viewer = 0) const;
|
||||||
void compute_elements(void);
|
void compute_elements(void);
|
||||||
|
|
||||||
|
|
@ -120,6 +121,7 @@ public:
|
||||||
Primitives_mode get_primitives_mode() const;
|
Primitives_mode get_primitives_mode() const;
|
||||||
|
|
||||||
virtual bool supportsRenderingMode(RenderingMode m) const;
|
virtual bool supportsRenderingMode(RenderingMode m) const;
|
||||||
|
using Scene_polyhedron_item_decorator::draw;
|
||||||
virtual void draw(Viewer_interface*) const;
|
virtual void draw(Viewer_interface*) const;
|
||||||
// Points OpenGL drawing
|
// Points OpenGL drawing
|
||||||
virtual void draw_points(Viewer_interface*) const;
|
virtual void draw_points(Viewer_interface*) const;
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ private:
|
||||||
qglviewer::Vec center_;
|
qglviewer::Vec center_;
|
||||||
mutable QOpenGLShaderProgram *program;
|
mutable QOpenGLShaderProgram *program;
|
||||||
std::vector<float> positions_lines;
|
std::vector<float> positions_lines;
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_elements();
|
void compute_elements();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -463,7 +463,7 @@ Scene_polylines_item::compute_elements()
|
||||||
|
|
||||||
//Convert the triangle coordinates to lines coordinates for the
|
//Convert the triangle coordinates to lines coordinates for the
|
||||||
//Wiremode in the spheres
|
//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
|
//draw triangles
|
||||||
if(i< (360/sectors)*12)
|
if(i< (360/sectors)*12)
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,7 @@ private:
|
||||||
typedef std::map<Point_3, int> Point_to_int_map;
|
typedef std::map<Point_3, int> Point_to_int_map;
|
||||||
typedef Point_to_int_map::iterator iterator;
|
typedef Point_to_int_map::iterator iterator;
|
||||||
void create_Sphere(double);
|
void create_Sphere(double);
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_elements();
|
void compute_elements();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,8 @@ private:
|
||||||
mutable QOpenGLShaderProgram* program;
|
mutable QOpenGLShaderProgram* program;
|
||||||
|
|
||||||
bool smooth_shading;
|
bool smooth_shading;
|
||||||
|
|
||||||
|
using Scene_item::initialize_buffers;
|
||||||
void initialize_buffers(Viewer_interface *viewer) const;
|
void initialize_buffers(Viewer_interface *viewer) const;
|
||||||
void compute_normals_and_vertices(void);
|
void compute_normals_and_vertices(void);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue