From e2dbe2e08cc9719a5e537389f6b7367fe29feba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 28 Jun 2019 14:55:47 +0200 Subject: [PATCH] overrides --- ObjectTypes/PolyLine/PolyLineNodeT.hh | 10 +++++----- .../PolyLineCollection/PolyLineCollectionNodeT.hh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ObjectTypes/PolyLine/PolyLineNodeT.hh b/ObjectTypes/PolyLine/PolyLineNodeT.hh index c78f188..b8a23ec 100644 --- a/ObjectTypes/PolyLine/PolyLineNodeT.hh +++ b/ObjectTypes/PolyLine/PolyLineNodeT.hh @@ -105,16 +105,16 @@ public: ACG_CLASSNAME(PolyLineNodeT); /// 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; /// draw lines and normals - 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; /** \brief Add the objects to the given renderer * @@ -123,7 +123,7 @@ public: * @param _drawMode The active draw mode * @param _mat Current material */ - void getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::SceneGraph::DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat); + void getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::SceneGraph::DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat) override; /// Trigger an update of the vbo void update() { updateVBO_ = true; }; diff --git a/ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh b/ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh index 48feee2..93b1e36 100644 --- a/ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh +++ b/ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh @@ -92,16 +92,16 @@ public: ACG_CLASSNAME(PolyLineCollectionNodeT); /// 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; /// draw lines and normals - 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; /** \brief Add the objects to the given renderer * @@ -110,7 +110,7 @@ public: * @param _drawMode The active draw mode * @param _mat Current material */ - void getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::SceneGraph::DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat); + void getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::SceneGraph::DrawModes::DrawMode& _drawMode , const ACG::SceneGraph::Material* _mat) override; /// Trigger an update of the vbo void update() { updateVBO_ = true; } -- 2.22.0