From d004db6075398666748a616b16091d3c11bf7938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Aug 2018 10:01:43 +0200 Subject: [PATCH] SceneGraph: Camera::setViewport() and draw() don't need to be virtual. If you need to override this functionality, simply call the subclass implementation directly instead of calling it through a Camera pointer/reference. --- doc/changelog.dox | 4 ++++ src/Magnum/SceneGraph/Camera.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 064cee224..eb7dabf4e 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -263,6 +263,10 @@ See also: working to fail with an assertion. See the new @ref Math::Matrix3::rotationShear() and @ref Math::Matrix4::rotationShear() accessors for a possible solution. +- @ref SceneGraph::Camera::setViewport() and @ref SceneGraph::Camera::draw() + are no longer @cpp virtual @ce functions. If you need to override their + functionality, simply call the subclass implementation directly instead of + calling it through a @ref SceneGraph::Camera. - @ref Shaders::Flat::bindTexture(), @ref Shaders::Phong::bindAmbientTexture(), @ref Shaders::Phong::bindDiffuseTexture(), @ref Shaders::Phong::bindSpecularTexture() and diff --git a/src/Magnum/SceneGraph/Camera.h b/src/Magnum/SceneGraph/Camera.h index 8ed5c9898..140cdfc8b 100644 --- a/src/Magnum/SceneGraph/Camera.h +++ b/src/Magnum/SceneGraph/Camera.h @@ -184,14 +184,14 @@ template class Camera: public AbstractFeature& group); + void draw(DrawableGroup& group); private: /** Recalculates camera matrix */