...
 
Commits (1)
......@@ -116,7 +116,7 @@ class ACGDLLEXPORT QtManipulatorNode : public QObject , public ManipulatorNode
//
/// get mouse events
void mouseEvent(GLState& _state, QMouseEvent* _event);
void mouseEvent(GLState& _state, QMouseEvent* _event) override;
/// Set an identifier for that manipulator
void setIdentifier( int _id) { identifier_ = _id; };
......
......@@ -91,10 +91,10 @@ public:
ACG_CLASSNAME(ArrowNode);
/// 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;
/// reserve mem for _n arrows
void reserve(int _n);
......@@ -224,7 +224,7 @@ public:
int n_arrows() const;
/// draw arrows
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
/** \brief Add the objects to the given renderer
*
......@@ -233,7 +233,7 @@ public:
* @param _drawMode The active draw mode
* @param _mat Current material
*/
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat) override;
private:
......
......@@ -138,9 +138,9 @@ public:
ACG_CLASSNAME(LightSourceNode);
/// set current Light Sources
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode);
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
/// restores original Light Sources
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode);
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
/// enable LightSource _nr
void enable(GLenum _nr)
......
......@@ -236,7 +236,7 @@ public:
void get_axes_colors(Vec4f out_colors[3]) const;
/// Overriding BaseNode::getRenderObjects.
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat) override;
/// world transform of an axis (orientation and translation)
GLMatrixd axisTransform(const PrincipalComponent& _pc, int _axis, double* _outSize = 0) const;
......
......@@ -250,13 +250,13 @@ public:
@param _drawMode active Drawmode
@param _mat active Material
*/
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const class Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state, const DrawModes::DrawMode& _drawMode, const class Material* _mat) override;
DrawModes::DrawMode availableDrawModes() const;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void pick(GLState& /* _state */ , PickTarget /* _target */ ) {}
DrawModes::DrawMode availableDrawModes() const override;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax) override;
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode) override;
void pick(GLState& /* _state */ , PickTarget /* _target */ ) override {}
private:
......