Commit 0c264d53 authored by Jan Möbius's avatar Jan Möbius

Silence some cppcheck warnings

parent 0ac840a0
......@@ -609,7 +609,7 @@ ACG::Vec3f GLCone::normalOnCone(int _sliceNumber, int _stackNumber)
ACG::Vec3f normal;
double beta = ((2.0 * M_PI) / slices_) * _sliceNumber;
double relativeHeight = _stackNumber / (double) stacks_;
// double relativeHeight = _stackNumber / (double) stacks_;
normal[0] = sin(beta);
normal[1] = cos(beta);
......
......@@ -146,11 +146,11 @@ public:
void addToRenderer(class IRenderer* _renderer, const struct RenderObject* _base, float _radius, const ACG::Vec3f& _center = ACG::Vec3f(0.0f, 0.0f, 0.0f));
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
void addTriangle(int sl0, int st0, int sl1, int st1, int sl2, int st2);
......@@ -185,9 +185,9 @@ public:
ACG::Vec3f _upDir = ACG::Vec3f(0.0f, 0.0f, 1.0f),
float _radiusScale = 1.0f);
int getNumTriangles();
int getNumTriangles() override;
void updateVBO();
void updateVBO() override;
void setBottomRadius(float _bottomRadius);
void setTopRadius(float _topRadius);
void setNormalOrientation(NormalOrientation orienation);
......@@ -228,7 +228,7 @@ public:
void setInnerRadius(float _innerRadius);
void setOuterRadius(float _outerRadius);
int getNumTriangles();
int getNumTriangles() override;
void draw(
GLState& _state,
......@@ -236,7 +236,7 @@ public:
ACG::Vec3f _upDir = ACG::Vec3f(0.0f, 0.0f, 1.0f));
protected:
void updateVBO();
void updateVBO() override;
private:
int slices_;
......@@ -263,11 +263,11 @@ public:
GLBox();
~GLBox();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -279,12 +279,12 @@ public:
GLLineBox();
~GLLineBox();
int getNumTriangles();
int getNumLines();
int getNumTriangles() override;
int getNumLines() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -296,11 +296,11 @@ public:
GLDodecahedron();
~GLDodecahedron();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -312,11 +312,11 @@ public:
GLIcosahedron();
~GLIcosahedron();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -328,11 +328,11 @@ public:
GLOctahedron();
~GLOctahedron();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -344,11 +344,11 @@ public:
GLTetrahedron();
~GLTetrahedron();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
};
//------------------------------------------------------------------------
......@@ -362,11 +362,11 @@ public:
GLint nsides, GLint rings);
~GLTorus();
int getNumTriangles();
int getNumTriangles() override;
private:
void updateVBO();
void updateVBO() override;
int rings_;
int nsides_;
......
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