diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 17:38:52 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:28 +0000 |
commit | 7a3648ef4e884429dbe4bb60ab5a0a838bc5abfc (patch) | |
tree | fe617ede422a28854daeddff9f8d9a7874415750 /src/quick3d/quick3danimation | |
parent | 2a485273c1da1f56412bfd19795ac5a29331b770 (diff) |
Introduce QAbstractAnimationClip and rename QAnimationClip
Introduced an abstract base class for types of animation clip. Also
renamed QAnimationClip to QAnimationClipLoader since it loads data
from files.
Also renamed corresponding backend type and fixed up unit tests
accordingly.
Task-number: QTBUG-58898
Change-Id: I01a96e108cbbcd12e01913693e96610598965018
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/quick3d/quick3danimation')
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dabstractclipblendnode.cpp | 24 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dabstractclipblendnode_p.h | 14 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode.cpp b/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode.cpp index 7a709c2d6..7094d2bcf 100644 --- a/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode.cpp +++ b/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode.cpp @@ -50,38 +50,38 @@ Quick3DAbstractClipBlendNode::Quick3DAbstractClipBlendNode(QObject *parent) { } -QQmlListProperty<QAnimationClip> Quick3DAbstractClipBlendNode::clipList() +QQmlListProperty<QAbstractAnimationClip> Quick3DAbstractClipBlendNode::clipList() { - return QQmlListProperty<QAnimationClip>(this, 0, - &Quick3DAbstractClipBlendNode::appendClip, - &Quick3DAbstractClipBlendNode::clipCount, - &Quick3DAbstractClipBlendNode::clipAt, - &Quick3DAbstractClipBlendNode::clearClips); + return QQmlListProperty<QAbstractAnimationClip>(this, 0, + &Quick3DAbstractClipBlendNode::appendClip, + &Quick3DAbstractClipBlendNode::clipCount, + &Quick3DAbstractClipBlendNode::clipAt, + &Quick3DAbstractClipBlendNode::clearClips); } -void Quick3DAbstractClipBlendNode::appendClip(QQmlListProperty<QAnimationClip> *list, QAnimationClip *clip) +void Quick3DAbstractClipBlendNode::appendClip(QQmlListProperty<QAbstractAnimationClip> *list, QAbstractAnimationClip *clip) { Quick3DAbstractClipBlendNode *extension = qobject_cast<Quick3DAbstractClipBlendNode *>(list->object); extension->parentAbstractClipBlendNode()->addClip(clip); } -QAnimationClip *Quick3DAbstractClipBlendNode::clipAt(QQmlListProperty<QAnimationClip> *list, int index) +QAbstractAnimationClip *Quick3DAbstractClipBlendNode::clipAt(QQmlListProperty<QAbstractAnimationClip> *list, int index) { Quick3DAbstractClipBlendNode *extension = qobject_cast<Quick3DAbstractClipBlendNode *>(list->object); return extension->parentAbstractClipBlendNode()->clips().at(index); } -int Quick3DAbstractClipBlendNode::clipCount(QQmlListProperty<QAnimationClip> *list) +int Quick3DAbstractClipBlendNode::clipCount(QQmlListProperty<QAbstractAnimationClip> *list) { Quick3DAbstractClipBlendNode *extension = qobject_cast<Quick3DAbstractClipBlendNode *>(list->object); return extension->parentAbstractClipBlendNode()->clips().count(); } -void Quick3DAbstractClipBlendNode::clearClips(QQmlListProperty<QAnimationClip> *list) +void Quick3DAbstractClipBlendNode::clearClips(QQmlListProperty<QAbstractAnimationClip> *list) { Quick3DAbstractClipBlendNode *extension = qobject_cast<Quick3DAbstractClipBlendNode *>(list->object); - const QVector<QAnimationClip *> clips = extension->parentAbstractClipBlendNode()->clips(); - for (QAnimationClip *clip : clips) + const QVector<QAbstractAnimationClip *> clips = extension->parentAbstractClipBlendNode()->clips(); + for (QAbstractAnimationClip *clip : clips) extension->parentAbstractClipBlendNode()->removeClip(clip); } diff --git a/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode_p.h b/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode_p.h index bfb1825a7..8524600f4 100644 --- a/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode_p.h +++ b/src/quick3d/quick3danimation/items/quick3dabstractclipblendnode_p.h @@ -53,7 +53,7 @@ #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h> #include <Qt3DAnimation/qabstractclipblendnode.h> -#include <Qt3DAnimation/qanimationclip.h> +#include <Qt3DAnimation/qabstractanimationclip.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -65,19 +65,19 @@ namespace Quick { class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Quick3DAbstractClipBlendNode : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAnimationClip> clips READ clipList CONSTANT) + Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAbstractAnimationClip> clips READ clipList CONSTANT) public: explicit Quick3DAbstractClipBlendNode(QObject *parent = nullptr); inline QAbstractClipBlendNode *parentAbstractClipBlendNode() const { return qobject_cast<QAbstractClipBlendNode *>(parent()); } - QQmlListProperty<QAnimationClip> clipList(); + QQmlListProperty<QAbstractAnimationClip> clipList(); private: - static void appendClip(QQmlListProperty<QAnimationClip> *list, QAnimationClip *clip); - static QAnimationClip *clipAt(QQmlListProperty<QAnimationClip> *list, int index); - static int clipCount(QQmlListProperty<QAnimationClip> *list); - static void clearClips(QQmlListProperty<QAnimationClip> *list); + static void appendClip(QQmlListProperty<QAbstractAnimationClip> *list, QAbstractAnimationClip *clip); + static QAbstractAnimationClip *clipAt(QQmlListProperty<QAbstractAnimationClip> *list, int index); + static int clipCount(QQmlListProperty<QAbstractAnimationClip> *list); + static void clearClips(QQmlListProperty<QAbstractAnimationClip> *list); }; } // Quick |