diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-01-19 16:16:37 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2017-01-27 07:04:21 +0000 |
commit | f4f671f201e2fb39c623a20e659b906d54a9d906 (patch) | |
tree | a60b49092b9720997a23af0890cfddb160d116f9 /src/animation/backend/handler_p.h | |
parent | e8ed0df38161d106c3fffac8bb14c5ad456941e5 (diff) |
Add animation components
Three levels of animation playback are available at present for
keyframe animation:
1) Direct playback of a clip via QClipAnimator
2) Playback of a blend tree of clips via QBlendedClipAnimator
3) Playback of a set of blend trees controlled with a state machine
via QConductedClipAnimator
This commit adds the frontend and backend nodes for all 3
components and registers them. The blended and conducted animator
components are just empty skeletons for now.
Change-Id: If2f0a912c003f3d20f830a8f6174946eea6b47e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation/backend/handler_p.h')
-rw-r--r-- | src/animation/backend/handler_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/animation/backend/handler_p.h b/src/animation/backend/handler_p.h index 164494c0e..248184a04 100644 --- a/src/animation/backend/handler_p.h +++ b/src/animation/backend/handler_p.h @@ -65,6 +65,12 @@ namespace Animation { class AnimationClip; class AnimationClipManager; +class ClipAnimator; +class ClipAnimatorManager; +class BlendedClipAnimator; +class BlendedClipAnimatorManager; +class ConductedClipAnimator; +class ConductedClipAnimatorManager; class Q_AUTOTEST_EXPORT Handler { @@ -73,11 +79,17 @@ public: ~Handler(); AnimationClipManager *animationClipManager() const Q_DECL_NOTHROW { return m_animationClipManager.data(); } + ClipAnimatorManager *clipAnimatorManager() const Q_DECL_NOTHROW { return m_clipAnimatorManager.data(); } + BlendedClipAnimatorManager *blendedClipAnimatorManager() const Q_DECL_NOTHROW { return m_blendedClipAnimatorManager.data(); } + ConductedClipAnimatorManager *conductedClipAnimatorManager() const Q_DECL_NOTHROW { return m_conductedClipAnimatorManager.data(); } QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time); private: QScopedPointer<AnimationClipManager> m_animationClipManager; + QScopedPointer<ClipAnimatorManager> m_clipAnimatorManager; + QScopedPointer<BlendedClipAnimatorManager> m_blendedClipAnimatorManager; + QScopedPointer<ConductedClipAnimatorManager> m_conductedClipAnimatorManager; #if defined(QT_BUILD_INTERNAL) friend class QT_PREPEND_NAMESPACE(tst_Handler); |