diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-09-20 08:17:11 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-09-20 11:09:32 +0100 |
| commit | eaf652cff66d43457174ce8b7e5104f38894c8e8 (patch) | |
| tree | a588180df6253ed98f46e8a371c7c3558b976e0b /src/animation | |
| parent | 41968b79393df2cb2c859f76b92922c7c5dbc3b1 (diff) | |
Update QAbstractSkeleton to use direct sync
Nothing to sync and keep old message based method for
backend to backend communication
Change-Id: I494f1e8ba62aa772e87878959754a3e6a67681a1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/backend/skeleton.cpp | 9 | ||||
| -rw-r--r-- | src/animation/backend/skeleton_p.h | 2 | ||||
| -rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/animation/backend/skeleton.cpp b/src/animation/backend/skeleton.cpp index dcfaf55e7..720b43e33 100644 --- a/src/animation/backend/skeleton.cpp +++ b/src/animation/backend/skeleton.cpp @@ -62,14 +62,7 @@ void Skeleton::cleanup() m_jointLocalPoses.clear(); } -void Skeleton::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) -{ - // Nothing to initialize from the frontend. We get all of our internal state - // from whatever aspect loads the skeleton data - the render aspect in the - // default case. - Q_UNUSED(change); -} - +// TODOSYNC remove once backend > backend communication no longer requires messages void Skeleton::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { // Get the joint names and initial local poses from a change sent diff --git a/src/animation/backend/skeleton_p.h b/src/animation/backend/skeleton_p.h index f1ddb1e81..668ff8712 100644 --- a/src/animation/backend/skeleton_p.h +++ b/src/animation/backend/skeleton_p.h @@ -112,8 +112,6 @@ public: #endif private: - void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; - QVector<QString> m_jointNames; QVector<Qt3DCore::Sqt> m_jointLocalPoses; }; diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index 13477ab57..9b722fd4c 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -131,7 +131,7 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent) registerBackendType<QClipBlendValue>( QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::ClipBlendValue, Animation::ClipAnimatorManager>>::create(d->m_handler.data(), d->m_handler->clipBlendNodeManager())); - registerBackendType<Qt3DCore::QAbstractSkeleton>( + registerBackendType<Qt3DCore::QAbstractSkeleton, true>( QSharedPointer<Animation::NodeFunctor<Animation::Skeleton, Animation::SkeletonManager>>::create(d->m_handler.data(), d->m_handler->skeletonManager())); } |