From b7ff40554c485280e6e9227ec742d2f8d506ac3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 24 Jul 2013 23:44:33 +0200 Subject: [PATCH] SceneGraph: no need to have virtual destructor in AbstractCamera. Protected constructor and destructor is sufficient, AbstractCamera itself isn't meant to be deleted (via pointer). --- src/SceneGraph/AbstractCamera.h | 16 ++++++++-------- src/SceneGraph/AbstractCamera.hpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SceneGraph/AbstractCamera.h b/src/SceneGraph/AbstractCamera.h index c504986dd..b66ec8aad 100644 --- a/src/SceneGraph/AbstractCamera.h +++ b/src/SceneGraph/AbstractCamera.h @@ -76,14 +76,6 @@ relevant sections in */ template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera: public AbstractFeature { public: - /** - * @brief Constructor - * @param object Object holding the camera - */ - explicit AbstractCamera(AbstractObject* object); - - virtual ~AbstractCamera() = 0; - /** @brief Aspect ratio policy */ AspectRatioPolicy aspectRatioPolicy() const { return _aspectRatioPolicy; } @@ -143,6 +135,14 @@ template class MAGNUM_SCENEGRAPH_EXPORT Abstrac virtual void draw(DrawableGroup& group); protected: + /** + * @brief Constructor + * @param object Object holding the camera + */ + explicit AbstractCamera(AbstractObject* object); + + ~AbstractCamera(); + /** Recalculates camera matrix */ void cleanInverted(const typename DimensionTraits::MatrixType& invertedAbsoluteTransformationMatrix) override { _cameraMatrix = invertedAbsoluteTransformationMatrix; diff --git a/src/SceneGraph/AbstractCamera.hpp b/src/SceneGraph/AbstractCamera.hpp index dacc6fc5c..891108d4a 100644 --- a/src/SceneGraph/AbstractCamera.hpp +++ b/src/SceneGraph/AbstractCamera.hpp @@ -72,7 +72,7 @@ template AbstractCamera::Abstrac AbstractFeature::setCachedTransformations(CachedTransformation::InvertedAbsolute); } -template AbstractCamera::~AbstractCamera() {} +template AbstractCamera::~AbstractCamera() = default; template AbstractCamera* AbstractCamera::setAspectRatioPolicy(AspectRatioPolicy policy) { _aspectRatioPolicy = policy;