diff options
| author | Chip Collier <gregory.collier@kdab.com> | 2017-07-21 11:02:35 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-07-24 09:02:37 +0000 |
| commit | 721c44edfdedb0360181f8160144709867ed8749 (patch) | |
| tree | 59f63b8a52a71632fac358b928daef35fb57a0ff /src/animation/frontend/qanimationaspect.cpp | |
| parent | e256972b2f1be3a0ccf2a0fa31424171ba856e01 (diff) | |
Add clock property to QAbstractClipAnimator
Introduces "clock" property to QAbstractClipAnimator and updates
associated tests. Updated backend animator nodes and associated
evaluation jobs.
Change-Id: Id18cabdd710b9b7253772642f21f63043d316a42
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/frontend/qanimationaspect.cpp')
| -rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index 00f97d5b6..bb786afff 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -40,6 +40,7 @@ #include "qanimationaspect.h" #include "qanimationaspect_p.h" #include <Qt3DAnimation/qabstractanimationclip.h> +#include <Qt3DAnimation/qclock.h> #include <Qt3DAnimation/qblendedclipanimator.h> #include <Qt3DAnimation/qclipanimator.h> #include <Qt3DAnimation/qchannelmapping.h> @@ -95,7 +96,10 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent) registerBackendType<QAbstractAnimationClip>( QSharedPointer<Animation::NodeFunctor<Animation::AnimationClip, Animation::AnimationClipLoaderManager>>::create(d->m_handler.data(), - d->m_handler->animationClipLoaderManager())); + d->m_handler->animationClipLoaderManager())); + registerBackendType<QClock>( + QSharedPointer<Animation::NodeFunctor<Animation::Clock, Animation::ClockManager>>::create(d->m_handler.data(), + d->m_handler->clockManager())); registerBackendType<QClipAnimator>( QSharedPointer<Animation::NodeFunctor<Animation::ClipAnimator, Animation::ClipAnimatorManager>>::create(d->m_handler.data(), d->m_handler->clipAnimatorManager())); |