Commit 80785d64 authored by Jan Möbius's avatar Jan Möbius

Silence some cppcheck warnings

parent 5e111303
......@@ -201,9 +201,9 @@ public:
protected:
virtual GLSL::Program* setupPass(int _pass, GLuint _srcTex);
virtual GLSL::Program* setupPass(int _pass, GLuint _srcTex) override;
void updateKernel();
void updateKernel() override;
private:
......@@ -282,9 +282,9 @@ public:
const std::vector<ACG::Vec2f>& offsetsY() const {return offsetsY_;}
protected:
virtual GLSL::Program* setupPass(int _pass, GLuint _srcTex);
virtual GLSL::Program* setupPass(int _pass, GLuint _srcTex) override;
void updateKernel();
void updateKernel() override;
private:
......
......@@ -196,14 +196,14 @@ public:
MeshCompilerDefaultFaceInput(int _numFaces, int _numIndices);
virtual ~MeshCompilerDefaultFaceInput(){}
int getNumFaces() const {return numFaces_;}
int getNumIndices() const {return numIndices_;}
int getNumFaces() const override {return numFaces_;}
int getNumIndices() const override {return numIndices_;}
int getFaceSize(const int _faceID) const {return faceSize_[_faceID];}
int getFaceSize(const int _faceID) const override {return faceSize_[_faceID];}
int getSingleFaceAttr(const int _faceID, const int _faceCorner, const int _attrID) const;
int getSingleFaceAttr(const int _faceID, const int _faceCorner, const int _attrID) const override;
bool getFaceAttr(const int _faceID, const int _attrID, int* _out) const;
bool getFaceAttr(const int _faceID, const int _attrID, int* _out) const override;
void dbgWriteToObjFile(FILE* _file, int _posAttrID = 0, int _normalAttrID = -1, int _texcAttrID = -1);
......
......@@ -100,16 +100,16 @@ public:
ACG_CLASSNAME(GridNode);
/// return available draw modes
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const;
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const override;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
/// drawing the primitive
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/// don't pick me
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
public:
......
......@@ -106,7 +106,7 @@ public:
virtual void setIdentity();
virtual void setIdentity() override;
/// set draw_cylinder_
void set_draw_cylinder(bool _b) { draw_cylinder_ = _b; }
......@@ -136,13 +136,13 @@ public:
}
/// draw the cylinder (if enabled)
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/// picking
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
/// get mouse events
virtual void mouseEvent(GLState& _state, QMouseEvent* _event);
virtual void mouseEvent(GLState& _state, QMouseEvent* _event) override;
/** if the manipulator node has been clicked by the mouse, this function
* will return true. Use reset_touched to reset this flag
......
......@@ -207,7 +207,7 @@ public:
*
* This function returns the bounding box of the node.
*/
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
private:
......@@ -294,12 +294,12 @@ public:
/** \brief Draws the object
*
*/
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/** \brief Draws the object deferred
*
*/
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const Material* _mat) override;
/** \brief Get DrawMesh instance
......@@ -312,7 +312,7 @@ public:
* The drawmodes are constructed based on the mesh properties and the hardware capabilities
* of the system.
*/
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const;
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const override;
private:
......@@ -357,7 +357,7 @@ public:
/** \brief Draws the object in picking mode
*
*/
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
/** @} */
......
......@@ -96,16 +96,16 @@ public:
/// return available draw modes
DrawModes::DrawMode availableDrawModes() const;
DrawModes::DrawMode availableDrawModes() const override;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
/// drawing the primitive
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/// picking
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
struct Face
......
......@@ -89,16 +89,16 @@ public:
ACG_CLASSNAME( OSDTransformNode );
/// set up transformation used for drawing
inline void enter( GLState &_state, const DrawModes::DrawMode &_drawMode ) { enterOSD( _state, _drawMode ); }
inline void enter( GLState &_state, const DrawModes::DrawMode &_drawMode ) override { enterOSD( _state, _drawMode ); }
/// restore transformation used for drawing
inline void leave( GLState &_state, const DrawModes::DrawMode &_drawMode ) { leaveOSD( _state, _drawMode ); }
inline void leave( GLState &_state, const DrawModes::DrawMode &_drawMode ) override { leaveOSD( _state, _drawMode ); }
/// set up transformation used for picking
inline void enterPick( GLState &_state, PickTarget _target, const DrawModes::DrawMode &_drawMode ) { enterOSD( _state, _drawMode ); }
inline void enterPick( GLState &_state, PickTarget _target, const DrawModes::DrawMode &_drawMode ) override { enterOSD( _state, _drawMode ); }
/// restore transformation used for picking
inline void leavePick( GLState &_state, PickTarget _target, const DrawModes::DrawMode &_drawMode ) { leaveOSD( _state, _drawMode ); }
inline void leavePick( GLState &_state, PickTarget _target, const DrawModes::DrawMode &_drawMode ) override { leaveOSD( _state, _drawMode ); }
/// set center of OSD
inline void setCenter( double _x, double _y ) { center_[0] = _x; center_[1] = _y; }
......
......@@ -209,13 +209,13 @@ public:
ACG_CLASSNAME(PrincipalAxisNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes() const;
DrawModes::DrawMode availableDrawModes() const override;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
/// drawing the primitive
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
void draw_principal_component( const PrincipalComponent& _pc);
......@@ -224,7 +224,7 @@ public:
void draw_line( const Vec3d& _axis, double _w);
/// picking
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
// set drawing parameters
......
......@@ -80,11 +80,11 @@ public:
ACG_CLASSNAME(QuadNode);
DrawModes::DrawMode availableDrawModes() const;
DrawModes::DrawMode availableDrawModes() const override;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void pick(GLState& _state, PickTarget _target);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
void pick(GLState& _state, PickTarget _target) override;
void add_quad( const ACG::Vec3f & _p0,
const ACG::Vec3f & _p1,
......
......@@ -91,15 +91,15 @@ public:
ACG_CLASSNAME( SliceNode );
DrawModes::DrawMode availableDrawModes() const;
DrawModes::DrawMode availableDrawModes() const override;
void boundingBox( Vec3d & _bbMin, Vec3d & _bbMax );
void boundingBox( Vec3d & _bbMin, Vec3d & _bbMax ) override;
void draw( GLState& _state, const DrawModes::DrawMode& _drawMode );
void draw( GLState& _state, const DrawModes::DrawMode& _drawMode ) override;
void draw_frame() const;
void draw_planes() const;
void pick( GLState& _state, PickTarget _target );
void pick( GLState& _state, PickTarget _target ) override;
bool is_enabled ( Plane _plane ) const;
void set_enabled( Plane _plane );
......
......@@ -91,18 +91,18 @@ public:
void setReference (GLuint _ref);
/// set stencil reference for all z-pass pixels
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode);
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
/// restores original stencil behavior
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode);
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
/** \brief Do nothing in picking
*/
void enterPick(GLState& _state, PickTarget _target, const DrawModes::DrawMode& _drawMode );
void enterPick(GLState& _state, PickTarget _target, const DrawModes::DrawMode& _drawMode ) override;
/** \brief Do nothing in picking
*/
void leavePick(GLState& _state, PickTarget _target, const DrawModes::DrawMode& _drawMode );
void leavePick(GLState& _state, PickTarget _target, const DrawModes::DrawMode& _drawMode ) override;
private:
......
......@@ -86,10 +86,10 @@ public:
unsigned char * _data );
/// set texture
void enter( GLState& _state, const DrawModes::DrawMode& _drawmode );
void enter( GLState& _state, const DrawModes::DrawMode& _drawmode ) override;
/// restores original texture (or no-texture)
void leave( GLState& _state, const DrawModes::DrawMode& _drawmode );
void leave( GLState& _state, const DrawModes::DrawMode& _drawmode ) override;
void set_texture_mode( GLenum _mode )
......
......@@ -131,7 +131,7 @@ public:
/// override TransformNode::setIdentity() (update radius_)
virtual void setIdentity() {
virtual void setIdentity() override{
Vec3d vec (1.0, 1.0, 1.0);
vec = scale ().transform_point(vec);
......@@ -153,11 +153,11 @@ public:
/// Draw the trackball + axes (if enabled)
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/// get mouse events
virtual void mouseEvent(GLState& _state, QMouseEvent* _event);
virtual void mouseEvent(GLState& _state, QMouseEvent* _event) override;
private:
......
......@@ -140,7 +140,7 @@ public:
// METHODS
//
virtual void setIdentity();
virtual void setIdentity() override;
/// set draw_cylinder_
void set_draw_cylinder(bool _b) { draw_manipulator_ = _b; }
......@@ -203,10 +203,10 @@ public:
}
/// draw the cylinder (if enabled)
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/// create renderobjects for shaderpipeline renderer
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const Material* _mat) override;
/// computes world matrix, transforms from model to world space
GLMatrixd computeWorldMatrix();
......@@ -215,13 +215,13 @@ public:
// void leave(GLState& _state, const DrawModes::DrawMode& _drawMode);
/// picking
void pick(GLState& _state, PickTarget _target);
void pick(GLState& _state, PickTarget _target) override;
/// get mouse events
virtual void mouseEvent(GLState& _state, QMouseEvent* _event);
virtual void mouseEvent(GLState& _state, QMouseEvent* _event) override;
/// bounding box of node
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
/// set current operation mode
void setMode (ManipulatorMode _mode);
......
......@@ -81,11 +81,11 @@ public:
ACG_CLASSNAME(TriangleNode);
DrawModes::DrawMode availableDrawModes() const;
DrawModes::DrawMode availableDrawModes() const override;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void pick(GLState& _state, PickTarget _target);
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
void pick(GLState& _state, PickTarget _target) override;
void add_triangle( const ACG::Vec3f & _p0,
const ACG::Vec3f & _p1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment