diff --git a/src/SceneGraph/Animable.h b/src/SceneGraph/Animable.h index 9a5b66576..2f8df0020 100644 --- a/src/SceneGraph/Animable.h +++ b/src/SceneGraph/Animable.h @@ -216,12 +216,28 @@ template class MAGNUM_SCENEGRAPH_EXPORT Animabl } /** - * @brief %Animable group containing this animable + * @brief Group containing this animable * * If the animable doesn't belong to any group, returns `nullptr`. */ - AnimableGroup* group(); - const AnimableGroup* group() const; /**< @overload */ + AnimableGroup* animables(); + const AnimableGroup* animables() const; /**< @overload */ + + #ifdef MAGNUM_BUILD_DEPRECATED + /** + * @copydoc animables() + * @deprecated Use @ref Magnum::SceneGraph::Animable::animables() "animables()" + * instead. + */ + AnimableGroup* group() { return animables(); } + + /** + * @copydoc animables() + * @deprecated Use @ref Magnum::SceneGraph::Animable::animables() "animables()" + * instead. + */ + const AnimableGroup* group() const { return animables(); } + #endif protected: /** diff --git a/src/SceneGraph/Animable.hpp b/src/SceneGraph/Animable.hpp index 046811d2d..ddb6c5b9e 100644 --- a/src/SceneGraph/Animable.hpp +++ b/src/SceneGraph/Animable.hpp @@ -47,16 +47,16 @@ template Animable& AnimablewakeUp = true; + animables()->wakeUp = true; currentState = state; return *this; } -template AnimableGroup* Animable::group() { +template AnimableGroup* Animable::animables() { return static_cast*>(AbstractGroupedFeature, T>::group()); } -template const AnimableGroup* Animable::group() const { +template const AnimableGroup* Animable::animables() const { return static_cast*>(AbstractGroupedFeature, T>::group()); }