diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-10-02 16:29:42 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-10-08 12:48:09 +0100 |
commit | cae430b9ede8327217e5fa8e48b0de1f3d7cc364 (patch) | |
tree | 3b78501f72b89b0111b666b7f963fae45a87293b /src/animation/frontend | |
parent | ee7dd0b8ec9e79f80c44bb7235e5cf54f3a6666c (diff) |
Update LoadAnimationClipJob to use direct sync
Change-Id: I41f8de8776c40cf9ed4f08c33bd480a719aa1c82
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation/frontend')
-rw-r--r-- | src/animation/frontend/qabstractanimationclip.cpp | 13 | ||||
-rw-r--r-- | src/animation/frontend/qabstractanimationclip.h | 1 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcliploader.cpp | 13 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcliploader.h | 1 |
4 files changed, 0 insertions, 28 deletions
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp index 7e6df4d70..e662a1408 100644 --- a/src/animation/frontend/qabstractanimationclip.cpp +++ b/src/animation/frontend/qabstractanimationclip.cpp @@ -153,19 +153,6 @@ float QAbstractAnimationClip::duration() const return d->m_duration; } -/*! - \internal -*/ -void QAbstractAnimationClip::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) -{ - Q_D(QAbstractAnimationClip); - if (change->type() == Qt3DCore::PropertyUpdated) { - Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change); - if (e->propertyName() == QByteArrayLiteral("duration")) - d->setDuration(e->value().toFloat()); - } -} - } // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h index 79464b13d..f68950c4c 100644 --- a/src/animation/frontend/qabstractanimationclip.h +++ b/src/animation/frontend/qabstractanimationclip.h @@ -62,7 +62,6 @@ Q_SIGNALS: protected: QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAbstractAnimationClip) diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp index d31f9bd5d..446995b17 100644 --- a/src/animation/frontend/qanimationcliploader.cpp +++ b/src/animation/frontend/qanimationcliploader.cpp @@ -142,19 +142,6 @@ void QAnimationClipLoader::setSource(const QUrl &source) emit sourceChanged(source); } -/*! - \internal -*/ -void QAnimationClipLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) -{ - Q_D(QAnimationClipLoader); - if (change->type() == Qt3DCore::PropertyUpdated) { - const Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change); - if (e->propertyName() == QByteArrayLiteral("status")) - d->setStatus(static_cast<QAnimationClipLoader::Status>(e->value().toInt())); - } -} - Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClipLoader::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAnimationClipLoaderData>::create(this); diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h index bf82f742e..1ff388297 100644 --- a/src/animation/frontend/qanimationcliploader.h +++ b/src/animation/frontend/qanimationcliploader.h @@ -78,7 +78,6 @@ Q_SIGNALS: protected: explicit QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QAnimationClipLoader) |