diff options
author | Antti Määttä <antti.maatta@qt.io> | 2017-02-06 11:01:06 +0200 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2017-02-07 09:03:12 +0000 |
commit | c0df6af32e80a09a8bf72bd6c9cc28270613220b (patch) | |
tree | a196bce7410ddd934a8327506eed6fdc5d8f1ca4 /src | |
parent | 1150383da5f55b44d6101f086cca310fa94db6a5 (diff) |
Move animations from extras to animations
Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/animation/frontend/frontend.pri | 25 | ||||
-rw-r--r-- | src/animation/frontend/qabstractanimation.cpp (renamed from src/extras/animations/qabstractanimation.cpp) | 6 | ||||
-rw-r--r-- | src/animation/frontend/qabstractanimation.h (renamed from src/extras/animations/qabstractanimation.h) | 14 | ||||
-rw-r--r-- | src/animation/frontend/qabstractanimation_p.h (renamed from src/extras/animations/qabstractanimation_p.h) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcontroller.cpp (renamed from src/extras/animations/qanimationcontroller.cpp) | 16 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcontroller.h (renamed from src/extras/animations/qanimationcontroller.h) | 28 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcontroller_p.h (renamed from src/extras/animations/qanimationcontroller_p.h) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qanimationgroup.cpp (renamed from src/extras/animations/qanimationgroup.cpp) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qanimationgroup.h (renamed from src/extras/animations/qanimationgroup.h) | 24 | ||||
-rw-r--r-- | src/animation/frontend/qanimationgroup_p.h (renamed from src/extras/animations/qanimationgroup_p.h) | 14 | ||||
-rw-r--r-- | src/animation/frontend/qkeyframeanimation.cpp (renamed from src/extras/animations/qkeyframeanimation.cpp) | 6 | ||||
-rw-r--r-- | src/animation/frontend/qkeyframeanimation.h (renamed from src/extras/animations/qkeyframeanimation.h) | 16 | ||||
-rw-r--r-- | src/animation/frontend/qkeyframeanimation_p.h (renamed from src/extras/animations/qkeyframeanimation_p.h) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qmorphinganimation.cpp (renamed from src/extras/animations/qmorphinganimation.cpp) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qmorphinganimation.h (renamed from src/extras/animations/qmorphinganimation.h) | 26 | ||||
-rw-r--r-- | src/animation/frontend/qmorphinganimation_p.h (renamed from src/extras/animations/qmorphinganimation_p.h) | 14 | ||||
-rw-r--r-- | src/animation/frontend/qmorphtarget.cpp (renamed from src/extras/animations/qmorphtarget.cpp) | 6 | ||||
-rw-r--r-- | src/animation/frontend/qmorphtarget.h (renamed from src/extras/animations/qmorphtarget.h) | 14 | ||||
-rw-r--r-- | src/animation/frontend/qmorphtarget_p.h (renamed from src/extras/animations/qmorphtarget_p.h) | 12 | ||||
-rw-r--r-- | src/animation/frontend/qvertexblendanimation.cpp (renamed from src/extras/animations/qvertexblendanimation.cpp) | 16 | ||||
-rw-r--r-- | src/animation/frontend/qvertexblendanimation.h (renamed from src/extras/animations/qvertexblendanimation.h) | 26 | ||||
-rw-r--r-- | src/animation/frontend/qvertexblendanimation_p.h (renamed from src/extras/animations/qvertexblendanimation_p.h) | 14 | ||||
-rw-r--r-- | src/extras/animations/animations.pri | 26 | ||||
-rw-r--r-- | src/extras/extras.pro | 1 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimp.pro | 2 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.cpp | 40 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.h | 6 | ||||
-rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 20 | ||||
-rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 19 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/items.pri | 14 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp (renamed from src/quick3d/quick3dextras/items/quick3danimationcontroller.cpp) | 4 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h (renamed from src/quick3d/quick3dextras/items/quick3danimationcontroller_p.h) | 32 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3danimationgroup.cpp (renamed from src/quick3d/quick3dextras/items/quick3danimationgroup.cpp) | 24 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3danimationgroup_p.h (renamed from src/quick3d/quick3dextras/items/quick3danimationgroup_p.h) | 32 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp (renamed from src/quick3d/quick3dextras/items/quick3dkeyframeanimation.cpp) | 4 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h (renamed from src/quick3d/quick3dextras/items/quick3dkeyframeanimation_p.h) | 16 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp (renamed from src/quick3d/quick3dextras/items/quick3dmorphinganimation.cpp) | 22 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h (renamed from src/quick3d/quick3dextras/items/quick3dmorphinganimation_p.h) | 30 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp (renamed from src/quick3d/quick3dextras/items/quick3dmorphtarget.cpp) | 4 | ||||
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h (renamed from src/quick3d/quick3dextras/items/quick3dmorphtarget_p.h) | 16 | ||||
-rw-r--r-- | src/quick3d/quick3dextras/items/items.pri | 14 |
41 files changed, 329 insertions, 334 deletions
diff --git a/src/animation/frontend/frontend.pri b/src/animation/frontend/frontend.pri index 2716c3d39..0feeb2e42 100644 --- a/src/animation/frontend/frontend.pri +++ b/src/animation/frontend/frontend.pri @@ -20,7 +20,21 @@ HEADERS += \ $$PWD/qclipblendnodecreatedchange.h \ $$PWD/qclipblendnodecreatedchange_p.h \ $$PWD/qadditiveblend.h \ - $$PWD/qadditiveblend_p.h + $$PWD/qadditiveblend_p.h \ + $$PWD/qanimationcontroller.h \ + $$PWD/qanimationcontroller_p.h \ + $$PWD/qanimationgroup.h \ + $$PWD/qanimationgroup_p.h \ + $$PWD/qkeyframeanimation.h \ + $$PWD/qkeyframeanimation_p.h \ + $$PWD/qmorphinganimation.h \ + $$PWD/qmorphinganimation_p.h \ + $$PWD/qabstractanimation.h \ + $$PWD/qabstractanimation_p.h \ + $$PWD/qmorphtarget.h \ + $$PWD/qmorphtarget_p.h \ + $$PWD/qvertexblendanimation.h \ + $$PWD/qvertexblendanimation_p.h SOURCES += \ $$PWD/qanimationaspect.cpp \ @@ -33,6 +47,13 @@ SOURCES += \ $$PWD/qchannelmapping.cpp \ $$PWD/qlerpblend.cpp \ $$PWD/qclipblendnodecreatedchange.cpp \ - $$PWD/qadditiveblend.cpp + $$PWD/qadditiveblend.cpp \ + $$PWD/qanimationcontroller.cpp \ + $$PWD/qanimationgroup.cpp \ + $$PWD/qkeyframeanimation.cpp \ + $$PWD/qmorphinganimation.cpp \ + $$PWD/qabstractanimation.cpp \ + $$PWD/qmorphtarget.cpp \ + $$PWD/qvertexblendanimation.cpp INCLUDEPATH += $$PWD diff --git a/src/extras/animations/qabstractanimation.cpp b/src/animation/frontend/qabstractanimation.cpp index f87455c18..6f5aa05d8 100644 --- a/src/extras/animations/qabstractanimation.cpp +++ b/src/animation/frontend/qabstractanimation.cpp @@ -35,11 +35,11 @@ ****************************************************************************/ #include "qabstractanimation.h" -#include "Qt3DExtras/private/qabstractanimation_p.h" +#include "Qt3DAnimation/private/qabstractanimation_p.h" QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QAbstractAnimationPrivate::QAbstractAnimationPrivate(QAbstractAnimation::AnimationType type) : QObjectPrivate() @@ -107,6 +107,6 @@ void QAbstractAnimation::setDuration(float duration) } } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qabstractanimation.h b/src/animation/frontend/qabstractanimation.h index 242fe293a..af70399b1 100644 --- a/src/extras/animations/qabstractanimation.h +++ b/src/animation/frontend/qabstractanimation.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QABSTRACTANIMATION_H -#define QT3DEXTRAS_QABSTRACTANIMATION_H +#ifndef QT3DANIMATION_QABSTRACTANIMATION_H +#define QT3DANIMATION_QABSTRACTANIMATION_H #include <QtCore/qobject.h> #include <QtCore/qvector.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qt3danimation_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAbstractAnimationPrivate; -class QT3DEXTRASSHARED_EXPORT QAbstractAnimation : public QObject +class QT3DANIMATIONSHARED_EXPORT QAbstractAnimation : public QObject { Q_OBJECT Q_PROPERTY(QString animationName READ animationName WRITE setAnimationName NOTIFY animationNameChanged) @@ -86,8 +86,8 @@ private: Q_DECLARE_PRIVATE(QAbstractAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QABSTRACTANIMATION_H +#endif // QT3DANIMATION_QABSTRACTANIMATION_H diff --git a/src/extras/animations/qabstractanimation_p.h b/src/animation/frontend/qabstractanimation_p.h index 1370ef2c7..197d8ab1c 100644 --- a/src/extras/animations/qabstractanimation_p.h +++ b/src/animation/frontend/qabstractanimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QABSTRACTANIMATION_P_H -#define QT3DEXTRAS_QABSTRACTANIMATION_P_H +#ifndef QT3DANIMATION_QABSTRACTANIMATION_P_H +#define QT3DANIMATION_QABSTRACTANIMATION_P_H // // W A R N I N G @@ -49,11 +49,11 @@ // #include <private/qobject_p.h> -#include <Qt3DExtras/QAbstractAnimation> +#include <Qt3DAnimation/QAbstractAnimation> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAbstractAnimationPrivate : public QObjectPrivate { @@ -68,8 +68,8 @@ public: Q_DECLARE_PUBLIC(QAbstractAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QANIMATIONCONTROLLER_P_H +#endif // QT3DANIMATION_QANIMATIONCONTROLLER_P_H diff --git a/src/extras/animations/qanimationcontroller.cpp b/src/animation/frontend/qanimationcontroller.cpp index adef3d45c..86d9eb537 100644 --- a/src/extras/animations/qanimationcontroller.cpp +++ b/src/animation/frontend/qanimationcontroller.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QAnimationControllerPrivate::QAnimationControllerPrivate() : QObjectPrivate() @@ -78,11 +78,11 @@ void QAnimationControllerPrivate::extractAnimations() Q_Q(QAnimationController); if (!m_entity) return; - QList<Qt3DExtras::QAbstractAnimation *> animations - = m_entity->findChildren<Qt3DExtras::QAbstractAnimation *>(QString(), + QList<Qt3DAnimation::QAbstractAnimation *> animations + = m_entity->findChildren<Qt3DAnimation::QAbstractAnimation *>(QString(), m_recursive ? Qt::FindChildrenRecursively : Qt::FindDirectChildrenOnly); if (animations.size() > 0) { - for (Qt3DExtras::QAbstractAnimation *a : animations) { + for (Qt3DAnimation::QAbstractAnimation *a : animations) { QAnimationGroup *group = findGroup(a->animationName()); if (!group) { group = new QAnimationGroup(q); @@ -95,7 +95,7 @@ void QAnimationControllerPrivate::extractAnimations() } void QAnimationControllerPrivate::clearAnimations() { - for (Qt3DExtras::QAnimationGroup *a : m_animationGroups) + for (Qt3DAnimation::QAnimationGroup *a : m_animationGroups) a->deleteLater(); m_animationGroups.clear(); m_activeAnimationGroup = 0; @@ -158,14 +158,14 @@ void QAnimationController::setAnimationGroups(const QVector<QAnimationGroup *> & d->updatePosition(d->m_position); } -void QAnimationController::addAnimationGroup(Qt3DExtras::QAnimationGroup *animationGroup) +void QAnimationController::addAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroup) { Q_D(QAnimationController); if (!d->m_animationGroups.contains(animationGroup)) d->m_animationGroups.push_back(animationGroup); } -void QAnimationController::removeAnimationGroup(Qt3DExtras::QAnimationGroup *animationGroup) +void QAnimationController::removeAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroup) { Q_D(QAnimationController); if (d->m_animationGroups.contains(animationGroup)) @@ -247,6 +247,6 @@ QAnimationGroup *QAnimationController::getGroup(int index) const return d->m_animationGroups.at(index); } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qanimationcontroller.h b/src/animation/frontend/qanimationcontroller.h index 4ee32dd8b..ae3272517 100644 --- a/src/extras/animations/qanimationcontroller.h +++ b/src/animation/frontend/qanimationcontroller.h @@ -34,22 +34,22 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QANIMATIONCONTROLLER_H -#define QT3DEXTRAS_QANIMATIONCONTROLLER_H +#ifndef QT3DANIMATION_QANIMATIONCONTROLLER_H +#define QT3DANIMATION_QANIMATIONCONTROLLER_H -#include <Qt3DExtras/qkeyframeanimation.h> -#include <Qt3DExtras/qanimationgroup.h> +#include <Qt3DAnimation/qkeyframeanimation.h> +#include <Qt3DAnimation/qanimationgroup.h> #include <Qt3DCore/qentity.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qt3danimation_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAnimationControllerPrivate; -class QT3DEXTRASSHARED_EXPORT QAnimationController : public QObject +class QT3DANIMATIONSHARED_EXPORT QAnimationController : public QObject { Q_OBJECT Q_PROPERTY(int activeAnimationGroup READ activeAnimationGroup WRITE setActiveAnimationGroup NOTIFY activeAnimationGroupChanged) @@ -62,7 +62,7 @@ class QT3DEXTRASSHARED_EXPORT QAnimationController : public QObject public: QAnimationController(QObject *parent = nullptr); - QVector<Qt3DExtras::QAnimationGroup *> animationGroupList(); + QVector<Qt3DAnimation::QAnimationGroup *> animationGroupList(); int activeAnimationGroup() const; float position() const; @@ -71,12 +71,12 @@ public: Qt3DCore::QEntity *entity() const; bool recursive() const; - void setAnimationGroups(const QVector<Qt3DExtras::QAnimationGroup *> &animationGroups); - void addAnimationGroup(Qt3DExtras::QAnimationGroup *animationGroups); - void removeAnimationGroup(Qt3DExtras::QAnimationGroup *animationGroups); + void setAnimationGroups(const QVector<Qt3DAnimation::QAnimationGroup *> &animationGroups); + void addAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroups); + void removeAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroups); Q_INVOKABLE int getAnimationIndex(const QString &name) const; - Q_INVOKABLE Qt3DExtras::QAnimationGroup *getGroup(int index) const; + Q_INVOKABLE Qt3DAnimation::QAnimationGroup *getGroup(int index) const; public Q_SLOTS: void setActiveAnimationGroup(int index); @@ -98,8 +98,8 @@ private: Q_DECLARE_PRIVATE(QAnimationController) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QANIMATIONCONTROLLER_H +#endif // QT3DANIMATION_QANIMATIONCONTROLLER_H diff --git a/src/extras/animations/qanimationcontroller_p.h b/src/animation/frontend/qanimationcontroller_p.h index dd5079ef5..1c309a183 100644 --- a/src/extras/animations/qanimationcontroller_p.h +++ b/src/animation/frontend/qanimationcontroller_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QANIMATIONCONTROLLER_P_H -#define QT3DEXTRAS_QANIMATIONCONTROLLER_P_H +#ifndef QT3DANIMATION_QANIMATIONCONTROLLER_P_H +#define QT3DANIMATION_QANIMATIONCONTROLLER_P_H // // W A R N I N G @@ -49,11 +49,11 @@ // #include <private/qobject_p.h> -#include <Qt3DExtras/QAnimationGroup> +#include <Qt3DAnimation/QAnimationGroup> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAnimationControllerPrivate : public QObjectPrivate { @@ -77,8 +77,8 @@ public: Q_DECLARE_PUBLIC(QAnimationController) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QANIMATIONCONTROLLER_P_H +#endif // QT3DANIMATION_QANIMATIONCONTROLLER_P_H diff --git a/src/extras/animations/qanimationgroup.cpp b/src/animation/frontend/qanimationgroup.cpp index e9febe811..91da1ead3 100644 --- a/src/extras/animations/qanimationgroup.cpp +++ b/src/animation/frontend/qanimationgroup.cpp @@ -35,11 +35,11 @@ ****************************************************************************/ #include "qanimationgroup.h" -#include "Qt3DExtras/private/qanimationgroup_p.h" +#include "Qt3DAnimation/private/qanimationgroup_p.h" QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QAnimationGroupPrivate::QAnimationGroupPrivate() : QObjectPrivate() @@ -68,7 +68,7 @@ QString QAnimationGroup::name() const return d->m_name; } -QVector<Qt3DExtras::QAbstractAnimation *> QAnimationGroup::animationList() +QVector<Qt3DAnimation::QAbstractAnimation *> QAnimationGroup::animationList() { Q_D(QAnimationGroup); return d->m_animations; @@ -95,12 +95,12 @@ void QAnimationGroup::setName(const QString &name) } } -void QAnimationGroup::setAnimations(const QVector<Qt3DExtras::QAbstractAnimation *> &animations) +void QAnimationGroup::setAnimations(const QVector<Qt3DAnimation::QAbstractAnimation *> &animations) { Q_D(QAnimationGroup); d->m_animations = animations; d->m_duration = 0.0f; - for (const Qt3DExtras::QAbstractAnimation *a : animations) + for (const Qt3DAnimation::QAbstractAnimation *a : animations) d->m_duration = qMax(d->m_duration, a->duration()); } @@ -120,6 +120,6 @@ void QAnimationGroup::setPosition(float position) } } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qanimationgroup.h b/src/animation/frontend/qanimationgroup.h index 4595a2082..1e23c61ee 100644 --- a/src/extras/animations/qanimationgroup.h +++ b/src/animation/frontend/qanimationgroup.h @@ -34,22 +34,22 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QANIMATIONGROUP_H -#define QT3DEXTRAS_QANIMATIONGROUP_H +#ifndef QT3DANIMATION_QANIMATIONGROUP_H +#define QT3DANIMATION_QANIMATIONGROUP_H #include <qobject.h> -#include <Qt3DExtras/qabstractanimation.h> +#include <Qt3DAnimation/qabstractanimation.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qt3danimation_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAnimationGroupPrivate; -class QT3DEXTRASSHARED_EXPORT QAnimationGroup : public QObject +class QT3DANIMATIONSHARED_EXPORT QAnimationGroup : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) @@ -60,13 +60,13 @@ public: explicit QAnimationGroup(QObject *parent = nullptr); QString name() const; - QVector<Qt3DExtras::QAbstractAnimation *> animationList(); + QVector<Qt3DAnimation::QAbstractAnimation *> animationList(); float position() const; float duration() const; - void setAnimations(const QVector<Qt3DExtras::QAbstractAnimation *> &animations); - void addAnimation(Qt3DExtras::QAbstractAnimation *animation); - void removeAnimation(Qt3DExtras::QAbstractAnimation *animation); + void setAnimations(const QVector<Qt3DAnimation::QAbstractAnimation *> &animations); + void addAnimation(Qt3DAnimation::QAbstractAnimation *animation); + void removeAnimation(Qt3DAnimation::QAbstractAnimation *animation); public Q_SLOTS: void setName(const QString &name); @@ -82,8 +82,8 @@ private: Q_DECLARE_PRIVATE(QAnimationGroup) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QANIMATIONGROUP_H +#endif // QT3DANIMATION_QANIMATIONGROUP_H diff --git a/src/extras/animations/qanimationgroup_p.h b/src/animation/frontend/qanimationgroup_p.h index cffe44636..1e13952aa 100644 --- a/src/extras/animations/qanimationgroup_p.h +++ b/src/animation/frontend/qanimationgroup_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QANIMATIONGROUP_P_H -#define QT3DEXTRAS_QANIMATIONGROUP_P_H +#ifndef QT3DANIMATION_QANIMATIONGROUP_P_H +#define QT3DANIMATION_QANIMATIONGROUP_P_H // // W A R N I N G @@ -49,11 +49,11 @@ // #include <private/qobject_p.h> -#include <Qt3DExtras/QAnimationGroup> +#include <Qt3DAnimation/QAnimationGroup> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QAnimationGroupPrivate : public QObjectPrivate { @@ -61,7 +61,7 @@ public: QAnimationGroupPrivate(); QString m_name; - QVector<Qt3DExtras::QAbstractAnimation *> m_animations; + QVector<Qt3DAnimation::QAbstractAnimation *> m_animations; float m_position; float m_duration; @@ -70,8 +70,8 @@ public: Q_DECLARE_PUBLIC(QAnimationGroup) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QANIMATIONGROUP_P_H +#endif // QT3DANIMATION_QANIMATIONGROUP_P_H diff --git a/src/extras/animations/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp index 425cbe0df..5c3ca1ca1 100644 --- a/src/extras/animations/qkeyframeanimation.cpp +++ b/src/animation/frontend/qkeyframeanimation.cpp @@ -35,13 +35,13 @@ ****************************************************************************/ #include "qkeyframeanimation.h" -#include "Qt3DExtras/private/qkeyframeanimation_p.h" +#include "Qt3DAnimation/private/qkeyframeanimation_p.h" #include <cmath> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QKeyframeAnimationPrivate::QKeyframeAnimationPrivate() : QAbstractAnimationPrivate(QAbstractAnimation::KeyframeAnimation) @@ -257,6 +257,6 @@ Qt3DCore::QTransform *QKeyframeAnimation::target() const return d->m_target; } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qkeyframeanimation.h b/src/animation/frontend/qkeyframeanimation.h index 178c9dbf1..d34f6cfba 100644 --- a/src/extras/animations/qkeyframeanimation.h +++ b/src/animation/frontend/qkeyframeanimation.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QKEYFRAMEANIMATION_H -#define QT3DEXTRAS_QKEYFRAMEANIMATION_H +#ifndef QT3DANIMATION_QKEYFRAMEANIMATION_H +#define QT3DANIMATION_QKEYFRAMEANIMATION_H #include <Qt3DCore/qtransform.h> -#include <Qt3DExtras/qabstractanimation.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qabstractanimation.h> +#include <Qt3DAnimation/qt3danimation_global.h> #include <QtCore/qeasingcurve.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QKeyframeAnimationPrivate; -class QT3DEXTRASSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation +class QT3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> framePositions READ framePositions WRITE setFramePositions NOTIFY framePositionsChanged) @@ -105,8 +105,8 @@ private: Q_DECLARE_PRIVATE(QKeyframeAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QKEYFRAMEANIMATION_H +#endif // QT3DANIMATION_QKEYFRAMEANIMATION_H diff --git a/src/extras/animations/qkeyframeanimation_p.h b/src/animation/frontend/qkeyframeanimation_p.h index 0095b9432..60fc50fb1 100644 --- a/src/extras/animations/qkeyframeanimation_p.h +++ b/src/animation/frontend/qkeyframeanimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QKEYFRAMEANIMATION_P_H -#define QT3DEXTRAS_QKEYFRAMEANIMATION_P_H +#ifndef QT3DANIMATION_QKEYFRAMEANIMATION_P_H +#define QT3DANIMATION_QKEYFRAMEANIMATION_P_H // // W A R N I N G @@ -49,12 +49,12 @@ // #include <private/qobject_p.h> -#include <Qt3DExtras/qkeyframeanimation.h> +#include <Qt3DAnimation/qkeyframeanimation.h> #include <private/qabstractanimation_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QKeyframeAnimationPrivate : public QAbstractAnimationPrivate { @@ -82,8 +82,8 @@ public: Q_DECLARE_PUBLIC(QKeyframeAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QKEYFRAMEANIMATION_P_H +#endif // QT3DANIMATION_QKEYFRAMEANIMATION_P_H diff --git a/src/extras/animations/qmorphinganimation.cpp b/src/animation/frontend/qmorphinganimation.cpp index e7fe05147..2ac09464f 100644 --- a/src/extras/animations/qmorphinganimation.cpp +++ b/src/animation/frontend/qmorphinganimation.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QMorphingAnimationPrivate::QMorphingAnimationPrivate() : QAbstractAnimationPrivate(QAbstractAnimation::MorphingAnimation) @@ -176,21 +176,21 @@ QEasingCurve::Type QMorphingAnimation::easing() const return d->m_easing.type(); } -void QMorphingAnimation::setMorphTargets(const QVector<Qt3DExtras::QMorphTarget *> &targets) +void QMorphingAnimation::setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets) { Q_D(QMorphingAnimation); d->m_morphTargets = targets; d->m_attributeNames = targets[0]->attributeNames(); } -void QMorphingAnimation::addMorphTarget(Qt3DExtras::QMorphTarget *target) +void QMorphingAnimation::addMorphTarget(Qt3DAnimation::QMorphTarget *target) { Q_D(QMorphingAnimation); if (!d->m_morphTargets.contains(target)) d->m_morphTargets.push_back(target); } -void QMorphingAnimation::removeMorphTarget(Qt3DExtras::QMorphTarget *target) +void QMorphingAnimation::removeMorphTarget(Qt3DAnimation::QMorphTarget *target) { Q_D(QMorphingAnimation); d->m_morphTargets.removeAll(target); @@ -236,7 +236,7 @@ QVector<float> QMorphingAnimation::getWeights(int positionIndex) return *d->m_weights[positionIndex]; } -QVector<Qt3DExtras::QMorphTarget *> QMorphingAnimation::morphTargetList() +QVector<Qt3DAnimation::QMorphTarget *> QMorphingAnimation::morphTargetList() { Q_D(QMorphingAnimation); return d->m_morphTargets; @@ -275,6 +275,6 @@ void QMorphingAnimation::updateAnimation(float position) d->updateAnimation(position); } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qmorphinganimation.h b/src/animation/frontend/qmorphinganimation.h index f8ca71ec9..b83288d04 100644 --- a/src/extras/animations/qmorphinganimation.h +++ b/src/animation/frontend/qmorphinganimation.h @@ -34,24 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QMORPHINGANIMATION_H -#define QT3DEXTRAS_QMORPHINGANIMATION_H +#ifndef QT3DANIMATION_QMORPHINGANIMATION_H +#define QT3DANIMATION_QMORPHINGANIMATION_H #include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DExtras/qabstractanimation.h> -#include <Qt3DExtras/qmorphtarget.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qabstractanimation.h> +#include <Qt3DAnimation/qmorphtarget.h> +#include <Qt3DAnimation/qt3danimation_global.h> #include <QtCore/qeasingcurve.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QMorphingAnimationPrivate; -class QT3DEXTRASSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation +class QT3DANIMATIONSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) @@ -78,14 +78,14 @@ public: QMorphingAnimation::Method method() const; QEasingCurve::Type easing() const; - void setMorphTargets(const QVector<Qt3DExtras::QMorphTarget *> &targets); - void addMorphTarget(Qt3DExtras::QMorphTarget *target); - void removeMorphTarget(Qt3DExtras::QMorphTarget *target); + void setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets); + void addMorphTarget(Qt3DAnimation::QMorphTarget *target); + void removeMorphTarget(Qt3DAnimation::QMorphTarget *target); void setWeights(int positionIndex, const QVector<float> &weights); QVector<float> getWeights(int positionIndex); - QVector<Qt3DExtras::QMorphTarget *> morphTargetList(); + QVector<Qt3DAnimation::QMorphTarget *> morphTargetList(); public Q_SLOTS: void setTargetPositions(const QVector<float> &targetPositions); @@ -109,8 +109,8 @@ private: Q_DECLARE_PRIVATE(QMorphingAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QMORPHINGANIMATION_H +#endif // QT3DANIMATION_QMORPHINGANIMATION_H diff --git a/src/extras/animations/qmorphinganimation_p.h b/src/animation/frontend/qmorphinganimation_p.h index e4a18f199..d9a04343c 100644 --- a/src/extras/animations/qmorphinganimation_p.h +++ b/src/animation/frontend/qmorphinganimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QMORPHINGANIMATION_P_H -#define QT3DEXTRAS_QMORPHINGANIMATION_P_H +#ifndef QT3DANIMATION_QMORPHINGANIMATION_P_H +#define QT3DANIMATION_QMORPHINGANIMATION_P_H // // W A R N I N G @@ -49,14 +49,14 @@ // #include <QtCore/qeasingcurve.h> -#include <Qt3DExtras/qmorphinganimation.h> +#include <Qt3DAnimation/qmorphinganimation.h> #include <private/qobject_p.h> #include <private/qabstractanimation_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QMorphingAnimationPrivate : public QAbstractAnimationPrivate { @@ -71,7 +71,7 @@ public: QVector<QVector<float>*> m_weights; QVector<float> m_morphKey; QStringList m_attributeNames; - QVector<Qt3DExtras::QMorphTarget *> m_morphTargets; + QVector<Qt3DAnimation::QMorphTarget *> m_morphTargets; QMorphTarget *m_flattened; QMorphingAnimation::Method m_method; QEasingCurve m_easing; @@ -86,8 +86,8 @@ public: Q_DECLARE_PUBLIC(QMorphingAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QMORPHINGANIMATION_P_H +#endif // QT3DANIMATION_QMORPHINGANIMATION_P_H diff --git a/src/extras/animations/qmorphtarget.cpp b/src/animation/frontend/qmorphtarget.cpp index 0c327a490..1040e33ff 100644 --- a/src/extras/animations/qmorphtarget.cpp +++ b/src/animation/frontend/qmorphtarget.cpp @@ -35,11 +35,11 @@ ****************************************************************************/ #include "qmorphtarget.h" -#include "Qt3DExtras/private/qmorphtarget_p.h" +#include "Qt3DAnimation/private/qmorphtarget_p.h" QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QMorphTargetPrivate::QMorphTargetPrivate() : QObjectPrivate() @@ -115,6 +115,6 @@ QMorphTarget *QMorphTarget::fromGeometry(Qt3DRender::QGeometry *geometry, const return target; } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qmorphtarget.h b/src/animation/frontend/qmorphtarget.h index 64c3037cb..0435924e1 100644 --- a/src/extras/animations/qmorphtarget.h +++ b/src/animation/frontend/qmorphtarget.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QMORPHTARGET_H -#define QT3DEXTRAS_QMORPHTARGET_H +#ifndef QT3DANIMATION_QMORPHTARGET_H +#define QT3DANIMATION_QMORPHTARGET_H #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qgeometry.h> #include <QtCore/qstringlist.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qt3danimation_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QMorphTargetPrivate; -class QT3DEXTRASSHARED_EXPORT QMorphTarget : public QObject +class QT3DANIMATIONSHARED_EXPORT QMorphTarget : public QObject { Q_OBJECT Q_PROPERTY(QStringList attributeNames READ attributeNames NOTIFY attributeNamesChanged) @@ -76,8 +76,8 @@ private: Q_DECLARE_PRIVATE(QMorphTarget) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QMORPHTARGET_H +#endif // QT3DANIMATION_QMORPHTARGET_H diff --git a/src/extras/animations/qmorphtarget_p.h b/src/animation/frontend/qmorphtarget_p.h index 7d42f8eb4..1fc3734ae 100644 --- a/src/extras/animations/qmorphtarget_p.h +++ b/src/animation/frontend/qmorphtarget_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QMORPHTARGET_P_H -#define QT3DEXTRAS_QMORPHTARGET_P_H +#ifndef QT3DANIMATION_QMORPHTARGET_P_H +#define QT3DANIMATION_QMORPHTARGET_P_H // // W A R N I N G @@ -48,13 +48,13 @@ // We mean it. // -#include <Qt3DExtras/qmorphtarget.h> +#include <Qt3DAnimation/qmorphtarget.h> #include <private/qobject_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QMorphTargetPrivate : public QObjectPrivate { @@ -69,8 +69,8 @@ public: Q_DECLARE_PUBLIC(QMorphTarget) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QMORPHTARGET_P_H +#endif // QT3DANIMATION_QMORPHTARGET_P_H diff --git a/src/extras/animations/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp index 1b45992fe..cd8f95f73 100644 --- a/src/extras/animations/qvertexblendanimation.cpp +++ b/src/animation/frontend/qvertexblendanimation.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { QVertexBlendAnimationPrivate::QVertexBlendAnimationPrivate() : QAbstractAnimationPrivate(QAbstractAnimation::VertexBlendAnimation) @@ -90,8 +90,8 @@ void QVertexBlendAnimationPrivate::updateAnimation(float position) if (!m_target || !m_target->geometry()) return; - Qt3DExtras::QMorphTarget *base; - Qt3DExtras::QMorphTarget *target; + Qt3DAnimation::QMorphTarget *base; + Qt3DAnimation::QMorphTarget *target; int target0, target1; float interpolator; getAttributesInPosition(position, &target0, &target1, &interpolator); @@ -170,20 +170,20 @@ QString QVertexBlendAnimation::targetName() const return d->m_targetName; } -void QVertexBlendAnimation::setMorphTargets(const QVector<Qt3DExtras::QMorphTarget *> &targets) +void QVertexBlendAnimation::setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets) { Q_D(QVertexBlendAnimation); d->m_morphTargets = targets; } -void QVertexBlendAnimation::addMorphTarget(Qt3DExtras::QMorphTarget *target) +void QVertexBlendAnimation::addMorphTarget(Qt3DAnimation::QMorphTarget *target) { Q_D(QVertexBlendAnimation); if (!d->m_morphTargets.contains(target)) d->m_morphTargets.push_back(target); } -void QVertexBlendAnimation::removeMorphTarget(Qt3DExtras::QMorphTarget *target) +void QVertexBlendAnimation::removeMorphTarget(Qt3DAnimation::QMorphTarget *target) { Q_D(QVertexBlendAnimation); d->m_morphTargets.removeAll(target); @@ -208,7 +208,7 @@ void QVertexBlendAnimation::setTarget(Qt3DRender::QGeometryRenderer *target) } } -QVector<Qt3DExtras::QMorphTarget *> QVertexBlendAnimation::morphTargetList() +QVector<Qt3DAnimation::QMorphTarget *> QVertexBlendAnimation::morphTargetList() { Q_D(QVertexBlendAnimation); return d->m_morphTargets; @@ -229,6 +229,6 @@ void QVertexBlendAnimation::updateAnimation(float position) d->updateAnimation(position); } -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE diff --git a/src/extras/animations/qvertexblendanimation.h b/src/animation/frontend/qvertexblendanimation.h index ebd313e83..a7da2bcda 100644 --- a/src/extras/animations/qvertexblendanimation.h +++ b/src/animation/frontend/qvertexblendanimation.h @@ -34,22 +34,22 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QVERTEXBLENDANIMATION_H -#define QT3DEXTRAS_QVERTEXBLENDANIMATION_H +#ifndef QT3DANIMATION_QVERTEXBLENDANIMATION_H +#define QT3DANIMATION_QVERTEXBLENDANIMATION_H #include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DExtras/qabstractanimation.h> -#include <Qt3DExtras/qmorphtarget.h> +#include <Qt3DAnimation/qabstractanimation.h> +#include <Qt3DAnimation/qmorphtarget.h> -#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DAnimation/qt3danimation_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QVertexBlendAnimationPrivate; -class QT3DEXTRASSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimation +class QT3DANIMATIONSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) @@ -65,11 +65,11 @@ public: Qt3DRender::QGeometryRenderer *target() const; QString targetName() const; - void setMorphTargets(const QVector<Qt3DExtras::QMorphTarget *> &targets); - void addMorphTarget(Qt3DExtras::QMorphTarget *target); - void removeMorphTarget(Qt3DExtras::QMorphTarget *target); + void setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets); + void addMorphTarget(Qt3DAnimation::QMorphTarget *target); + void removeMorphTarget(Qt3DAnimation::QMorphTarget *target); - QVector<Qt3DExtras::QMorphTarget *> morphTargetList(); + QVector<Qt3DAnimation::QMorphTarget *> morphTargetList(); public Q_SLOTS: void setTargetPositions(const QVector<float> &targetPositions); @@ -89,8 +89,8 @@ private: Q_DECLARE_PRIVATE(QVertexBlendAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QVERTEXBLENDANIMATION_H +#endif // QT3DANIMATION_QVERTEXBLENDANIMATION_H diff --git a/src/extras/animations/qvertexblendanimation_p.h b/src/animation/frontend/qvertexblendanimation_p.h index 812953e04..8f2609fc8 100644 --- a/src/extras/animations/qvertexblendanimation_p.h +++ b/src/animation/frontend/qvertexblendanimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QVERTEXBLENDANIMATION_P_H -#define QT3DEXTRAS_QVERTEXBLENDANIMATION_P_H +#ifndef QT3DANIMATION_QVERTEXBLENDANIMATION_P_H +#define QT3DANIMATION_QVERTEXBLENDANIMATION_P_H // // W A R N I N G @@ -49,14 +49,14 @@ // -#include <Qt3DExtras/qvertexblendanimation.h> +#include <Qt3DAnimation/qvertexblendanimation.h> #include <private/qobject_p.h> #include <private/qabstractanimation_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { class QVertexBlendAnimationPrivate : public QAbstractAnimationPrivate { @@ -67,7 +67,7 @@ public: void updateAnimation(float position); QVector<float> m_targetPositions; - QVector<Qt3DExtras::QMorphTarget *> m_morphTargets; + QVector<Qt3DAnimation::QMorphTarget *> m_morphTargets; float m_interpolator; Qt3DRender::QGeometryRenderer *m_target; QString m_targetName; @@ -79,8 +79,8 @@ public: Q_DECLARE_PUBLIC(QVertexBlendAnimation) }; -} // Qt3DExtras +} // Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QVertexBlendANIMATION_P_H +#endif // QT3DANIMATION_QVertexBlendANIMATION_P_H diff --git a/src/extras/animations/animations.pri b/src/extras/animations/animations.pri deleted file mode 100644 index 71d6099fc..000000000 --- a/src/extras/animations/animations.pri +++ /dev/null @@ -1,26 +0,0 @@ -HEADERS += \ - $$PWD/qanimationcontroller.h \ - $$PWD/qanimationcontroller_p.h \ - $$PWD/qanimationgroup.h \ - $$PWD/qanimationgroup_p.h \ - $$PWD/qkeyframeanimation.h \ - $$PWD/qkeyframeanimation_p.h \ - $$PWD/qmorphinganimation.h \ - $$PWD/qmorphinganimation_p.h \ - $$PWD/qabstractanimation.h \ - $$PWD/qabstractanimation_p.h \ - $$PWD/qmorphtarget.h \ - $$PWD/qmorphtarget_p.h \ - $$PWD/qvertexblendanimation.h \ - $$PWD/qvertexblendanimation_p.h - -SOURCES += \ - $$PWD/qanimationcontroller.cpp \ - $$PWD/qanimationgroup.cpp \ - $$PWD/qkeyframeanimation.cpp \ - $$PWD/qmorphinganimation.cpp \ - $$PWD/qabstractanimation.cpp \ - $$PWD/qmorphtarget.cpp \ - $$PWD/qvertexblendanimation.cpp - -INCLUDEPATH += $$PWD diff --git a/src/extras/extras.pro b/src/extras/extras.pro index 51c9f8cd4..22c9fcb93 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -9,7 +9,6 @@ DEFINES += QT_NO_FOREACH load(qt_module) -include (animations/animations.pri) include (geometries/geometries.pri) include (3dtext/3dtext.pri) include (defaults/defaults.pri) diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index da8393f0c..28abef2b8 100644 --- a/src/plugins/sceneparsers/assimp/assimp.pro +++ b/src/plugins/sceneparsers/assimp/assimp.pro @@ -1,5 +1,5 @@ TARGET = assimpsceneimport -QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras +QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras 3danimation include(../../../3rdparty/assimp/assimp_dependency.pri) diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index 66c219fe9..02773877e 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -55,8 +55,8 @@ #include <Qt3DExtras/qdiffusemapmaterial.h> #include <Qt3DExtras/qdiffusespecularmapmaterial.h> #include <Qt3DExtras/qphongmaterial.h> -#include <Qt3DExtras/qkeyframeanimation.h> -#include <Qt3DExtras/qmorphinganimation.h> +#include <Qt3DAnimation/qkeyframeanimation.h> +#include <Qt3DAnimation/qmorphinganimation.h> #include <QFileInfo> #include <QColor> #include <qmath.h> @@ -420,7 +420,7 @@ Qt3DCore::QEntity *AssimpImporter::scene(const QString &id) if (m_scene->m_animations.size() > 0) { qWarning() << "No target found for " << m_scene->m_animations.size() << " animations!"; - for (Qt3DExtras::QKeyframeAnimation *anim : m_scene->m_animations) + for (Qt3DAnimation::QKeyframeAnimation *anim : m_scene->m_animations) delete anim; m_scene->m_animations.clear(); } @@ -472,24 +472,24 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node) if (m_scene->m_materials.contains(materialIndex)) material = m_scene->m_materials[materialIndex]; - QList<Qt3DExtras::QMorphingAnimation *> morphingAnimations - = mesh->findChildren<Qt3DExtras::QMorphingAnimation *>(); + QList<Qt3DAnimation::QMorphingAnimation *> morphingAnimations + = mesh->findChildren<Qt3DAnimation::QMorphingAnimation *>(); if (morphingAnimations.size() > 0) { material = new Qt3DExtras::QMorphPhongMaterial(entityNode); - QVector<Qt3DExtras::QMorphingAnimation *> animations; - findAnimationsForNode<Qt3DExtras::QMorphingAnimation>(m_scene->m_morphAnimations, + QVector<Qt3DAnimation::QMorphingAnimation *> animations; + findAnimationsForNode<Qt3DAnimation::QMorphingAnimation>(m_scene->m_morphAnimations, animations, aiStringToQString(node->mName)); const auto morphTargetList = morphingAnimations.at(0)->morphTargetList(); - for (Qt3DExtras::QMorphingAnimation *anim : animations) { + for (Qt3DAnimation::QMorphingAnimation *anim : animations) { anim->setParent(entityNode); anim->setTarget(mesh); anim->setMorphTargets(morphTargetList); } for (int j = 0; j < animations.size(); ++j) { - QObject::connect(animations[j], &Qt3DExtras::QMorphingAnimation::interpolatorChanged, + QObject::connect(animations[j], &Qt3DAnimation::QMorphingAnimation::interpolatorChanged, (Qt3DExtras::QMorphPhongMaterial *)material, &Qt3DExtras::QMorphPhongMaterial::setInterpolator); } @@ -530,12 +530,12 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node) transform->setMatrix(qTransformMatrix); entityNode->addComponent(transform); - QVector<Qt3DExtras::QKeyframeAnimation *> animations; - findAnimationsForNode<Qt3DExtras::QKeyframeAnimation>(m_scene->m_animations, + QVector<Qt3DAnimation::QKeyframeAnimation *> animations; + findAnimationsForNode<Qt3DAnimation::QKeyframeAnimation>(m_scene->m_animations, animations, aiStringToQString(node->mName)); - for (Qt3DExtras::QKeyframeAnimation *anim : animations) { + for (Qt3DAnimation::QKeyframeAnimation *anim : animations) { anim->setTarget(transform); anim->setParent(entityNode); } @@ -792,10 +792,10 @@ void AssimpImporter::loadMesh(uint meshIndex) if (animesh->mNumVertices != mesh->mNumVertices) return; - Qt3DExtras::QMorphingAnimation *morphingAnimation - = new Qt3DExtras::QMorphingAnimation(geometryRenderer); + Qt3DAnimation::QMorphingAnimation *morphingAnimation + = new Qt3DAnimation::QMorphingAnimation(geometryRenderer); QVector<QString> names; - QVector<Qt3DExtras::QMorphTarget *> targets; + QVector<Qt3DAnimation::QMorphTarget *> targets; uint voff = 0; uint noff = 0; uint tanoff = 0; @@ -835,7 +835,7 @@ void AssimpImporter::loadMesh(uint meshIndex) for (uint i = 0; i < mesh->mNumAnimMeshes; i++) { aiAnimMesh *animesh = mesh->mAnimMeshes[i]; - Qt3DExtras::QMorphTarget *target = new Qt3DExtras::QMorphTarget(geometryRenderer); + Qt3DAnimation::QMorphTarget *target = new Qt3DAnimation::QMorphTarget(geometryRenderer); targets.push_back(target); QVector<QAttribute *> attributes; QByteArray targetBufferArray; @@ -1029,7 +1029,7 @@ void AssimpImporter::loadAnimation(uint animationIndex) aiNodeAnim *nodeAnim = assimpAnim->mChannels[i]; aiNode *targetNode = m_scene->m_aiScene->mRootNode->FindNode(nodeAnim->mNodeName); - Qt3DExtras::QKeyframeAnimation *kfa = new Qt3DExtras::QKeyframeAnimation(); + Qt3DAnimation::QKeyframeAnimation *kfa = new Qt3DAnimation::QKeyframeAnimation(); QVector<float> positions; QVector<Qt3DCore::QTransform*> transforms; if ((nodeAnim->mNumPositionKeys > 1) @@ -1102,7 +1102,7 @@ void AssimpImporter::loadAnimation(uint animationIndex) aiNode *targetNode = m_scene->m_aiScene->mRootNode->FindNode(morphAnim->mName); aiMesh *mesh = m_scene->m_aiScene->mMeshes[targetNode->mMeshes[0]]; - Qt3DExtras::QMorphingAnimation *morphingAnimation = new Qt3DExtras::QMorphingAnimation; + Qt3DAnimation::QMorphingAnimation *morphingAnimation = new Qt3DAnimation::QMorphingAnimation; QVector<float> positions; positions.resize(morphAnim->mNumKeys); // set so that weights array is allocated to correct size in morphingAnimation @@ -1125,8 +1125,8 @@ void AssimpImporter::loadAnimation(uint animationIndex) morphingAnimation->setAnimationName(QString(assimpAnim->mName.C_Str())); morphingAnimation->setTargetName(QString(targetNode->mName.C_Str())); morphingAnimation->setMethod((mesh->mMethod == aiMorphingMethod_MORPH_NORMALIZED) - ? Qt3DExtras::QMorphingAnimation::Normalized - : Qt3DExtras::QMorphingAnimation::Relative); + ? Qt3DAnimation::QMorphingAnimation::Normalized + : Qt3DAnimation::QMorphingAnimation::Relative); m_scene->m_morphAnimations.push_back(morphingAnimation); } } diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h index 0d2c0c9e5..aa7258840 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.h +++ b/src/plugins/sceneparsers/assimp/assimpimporter.h @@ -72,7 +72,7 @@ namespace Qt3DCore { class QCamera; } -namespace Qt3DExtras { +namespace Qt3DAnimation { class QKeyframeAnimation; class QMorphingAnimation; } @@ -144,8 +144,8 @@ private: QMap<QString, QAbstractTexture *> m_materialTextures; QMap<aiNode*, Qt3DCore::QEntity*> m_cameras; QHash<aiTextureType, QString> m_textureToParameterName; - QVector<Qt3DExtras::QKeyframeAnimation *> m_animations; - QVector<Qt3DExtras::QMorphingAnimation *> m_morphAnimations; + QVector<Qt3DAnimation::QKeyframeAnimation *> m_animations; + QVector<Qt3DAnimation::QMorphingAnimation *> m_morphAnimations; // QMap<aiNode*, Light*> m_lights; }; diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index 85c2afee9..bd54f73e8 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -45,9 +45,22 @@ #include <Qt3DAnimation/qchannelmapping.h> #include <Qt3DAnimation/qlerpblend.h> #include <Qt3DAnimation/qadditiveblend.h> + +#include <Qt3DAnimation/qkeyframeanimation.h> +#include <Qt3DAnimation/qanimationcontroller.h> +#include <Qt3DAnimation/qabstractanimation.h> +#include <Qt3DAnimation/qmorphinganimation.h> +#include <Qt3DAnimation/qanimationgroup.h> +#include <Qt3DAnimation/qmorphtarget.h> + #include <Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h> #include <Qt3DQuickAnimation/private/quick3dchannelmapper_p.h> #include <Qt3DQuickAnimation/private/quick3dabstractclipblendnode_p.h> +#include <Qt3DQuickAnimation/private/quick3dkeyframeanimation_p.h> +#include <Qt3DQuickAnimation/private/quick3danimationgroup_p.h> +#include <Qt3DQuickAnimation/private/quick3danimationcontroller_p.h> +#include <Qt3DQuickAnimation/private/quick3dmorphtarget_p.h> +#include <Qt3DQuickAnimation/private/quick3dmorphinganimation_p.h> QT_BEGIN_NAMESPACE @@ -67,6 +80,13 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 2, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract")); qmlRegisterType<Qt3DAnimation::QLerpBlend>(uri, 2, 2, "LerpBlend"); qmlRegisterType<Qt3DAnimation::QAdditiveBlend>(uri, 2, 2, "AdditiveBlend"); + + qmlRegisterUncreatableType<Qt3DAnimation::QAbstractAnimation>(uri, 2, 2, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract")); + qmlRegisterExtendedType<Qt3DAnimation::QKeyframeAnimation, Qt3DAnimation::Quick::QQuick3DKeyframeAnimation>(uri, 2, 2, "KeyframeAnimation"); + qmlRegisterExtendedType<Qt3DAnimation::QAnimationGroup, Qt3DAnimation::Quick::QQuick3DAnimationGroup>(uri, 2, 2, "AnimationGroup"); + qmlRegisterExtendedType<Qt3DAnimation::QAnimationController, Qt3DAnimation::Quick::QQuick3DAnimationController>(uri, 2, 2, "AnimationController"); + qmlRegisterExtendedType<Qt3DAnimation::QMorphingAnimation, Qt3DAnimation::Quick::QQuick3DMorphingAnimation>(uri, 2, 2, "MorphingAnimation"); + qmlRegisterExtendedType<Qt3DAnimation::QMorphTarget, Qt3DAnimation::Quick::QQuick3DMorphTarget>(uri, 2, 2, "MorphTarget"); } QT_END_NAMESPACE diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index f8cfc5be9..823670e8d 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -72,18 +72,6 @@ #include <Qt3DExtras/qdistancefieldglyphcache.h> #include <Qt3DExtras/qdistancefieldtext.h> #include <Qt3DQuickExtras/private/quick3dlevelofdetailloader_p.h> -#include <Qt3DExtras/qkeyframeanimation.h> -#include <Qt3DExtras/qanimationcontroller.h> -#include <Qt3DExtras/qabstractanimation.h> -#include <Qt3DExtras/qmorphinganimation.h> -#include <Qt3DExtras/qanimationgroup.h> -#include <Qt3DExtras/qmorphtarget.h> - -#include <Qt3DQuickExtras/private/quick3dkeyframeanimation_p.h> -#include <Qt3DQuickExtras/private/quick3danimationgroup_p.h> -#include <Qt3DQuickExtras/private/quick3danimationcontroller_p.h> -#include <Qt3DQuickExtras/private/quick3dmorphtarget_p.h> -#include <Qt3DQuickExtras/private/quick3dmorphinganimation_p.h> #include <QtQml/qqml.h> @@ -136,13 +124,6 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DExtras::QDistanceFieldGlyphCache>(uri, 2, 2, "DistanceFieldGlyphCache"); qmlRegisterType<Qt3DExtras::QDistanceFieldText>(uri, 2, 2, "DistanceFieldText"); - - qmlRegisterUncreatableType<Qt3DExtras::QAbstractAnimation>(uri, 2, 2, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract")); - qmlRegisterExtendedType<Qt3DExtras::QKeyframeAnimation, Qt3DExtras::Quick::QQuick3DKeyframeAnimation>(uri, 2, 2, "KeyframeAnimation"); - qmlRegisterExtendedType<Qt3DExtras::QAnimationGroup, Qt3DExtras::Quick::QQuick3DAnimationGroup>(uri, 2, 2, "AnimationGroup"); - qmlRegisterExtendedType<Qt3DExtras::QAnimationController, Qt3DExtras::Quick::QQuick3DAnimationController>(uri, 2, 2, "AnimationController"); - qmlRegisterExtendedType<Qt3DExtras::QMorphingAnimation, Qt3DExtras::Quick::QQuick3DMorphingAnimation>(uri, 2, 2, "MorphingAnimation"); - qmlRegisterExtendedType<Qt3DExtras::QMorphTarget, Qt3DExtras::Quick::QQuick3DMorphTarget>(uri, 2, 2, "MorphTarget"); } diff --git a/src/quick3d/quick3danimation/items/items.pri b/src/quick3d/quick3danimation/items/items.pri index 0c3511902..1c88df570 100644 --- a/src/quick3d/quick3danimation/items/items.pri +++ b/src/quick3d/quick3danimation/items/items.pri @@ -1,9 +1,19 @@ SOURCES += \ $$PWD/quick3dchannelmapper.cpp \ - $$PWD/quick3dabstractclipblendnode.cpp + $$PWD/quick3dabstractclipblendnode.cpp \ + $$PWD/quick3danimationcontroller.cpp \ + $$PWD/quick3danimationgroup.cpp \ + $$PWD/quick3dkeyframeanimation.cpp \ + $$PWD/quick3dmorphinganimation.cpp \ + $$PWD/quick3dmorphtarget.cpp HEADERS += \ $$PWD/quick3dchannelmapper_p.h \ - $$PWD/quick3dabstractclipblendnode_p.h + $$PWD/quick3dabstractclipblendnode_p.h \ + $$PWD/quick3danimationcontroller_p.h \ + $$PWD/quick3danimationgroup_p.h \ + $$PWD/quick3dkeyframeanimation_p.h \ + $$PWD/quick3dmorphinganimation_p.h \ + $$PWD/quick3dmorphtarget_p.h INCLUDEPATH += $$PWD diff --git a/src/quick3d/quick3dextras/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp index 4aceb0d55..dc6183989 100644 --- a/src/quick3d/quick3dextras/items/quick3danimationcontroller.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { QQuick3DAnimationController::QQuick3DAnimationController(QObject *parent) @@ -90,6 +90,6 @@ void QQuick3DAnimationController::clearAnimationGroups(QQmlListProperty<QAnimati } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3danimationcontroller_p.h b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h index 82ad29e2c..a3033e537 100644 --- a/src/quick3d/quick3dextras/items/quick3danimationcontroller_p.h +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QUICK_QUICK3DANIMATIONCONTROLLER_P_H -#define QT3DEXTRAS_QUICK_QUICK3DANIMATIONCONTROLLER_P_H +#ifndef QT3DANIMATION_QUICK_QUICK3DANIMATIONCONTROLLER_P_H +#define QT3DANIMATION_QUICK_QUICK3DANIMATIONCONTROLLER_P_H // // W A R N I N G @@ -48,41 +48,41 @@ // We mean it. // -#include <Qt3DQuickExtras/qt3dquickextras_global.h> -#include <QQmlListProperty> -#include <Qt3DExtras/QAnimationController> +#include <private/qt3dquickanimation_global_p.h> +#include <QtQml/QQmlListProperty> +#include <Qt3DAnimation/QAnimationController> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT QQuick3DAnimationController : public QObject +class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationController : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DExtras::QAnimationGroup> animationGroups READ animationGroups) + Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAnimationGroup> animationGroups READ animationGroups) public: explicit QQuick3DAnimationController(QObject *parent = nullptr); - inline Qt3DExtras::QAnimationController *parentAnimationController() const + inline Qt3DAnimation::QAnimationController *parentAnimationController() const { - return qobject_cast<Qt3DExtras::QAnimationController *>(parent()); + return qobject_cast<Qt3DAnimation::QAnimationController *>(parent()); } - QQmlListProperty<Qt3DExtras::QAnimationGroup> animationGroups(); + QQmlListProperty<Qt3DAnimation::QAnimationGroup> animationGroups(); private: - static void appendAnimationGroup(QQmlListProperty<Qt3DExtras::QAnimationGroup> *list, Qt3DExtras::QAnimationGroup *bar); - static QAnimationGroup *animationGroupAt(QQmlListProperty<Qt3DExtras::QAnimationGroup> *list, int index); - static int animationGroupCount(QQmlListProperty<Qt3DExtras::QAnimationGroup> *list); - static void clearAnimationGroups(QQmlListProperty<Qt3DExtras::QAnimationGroup> *list); + static void appendAnimationGroup(QQmlListProperty<Qt3DAnimation::QAnimationGroup> *list, Qt3DAnimation::QAnimationGroup *bar); + static QAnimationGroup *animationGroupAt(QQmlListProperty<Qt3DAnimation::QAnimationGroup> *list, int index); + static int animationGroupCount(QQmlListProperty<Qt3DAnimation::QAnimationGroup> *list); + static void clearAnimationGroups(QQmlListProperty<Qt3DAnimation::QAnimationGroup> *list); }; } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp index 3e3813227..f10450280 100644 --- a/src/quick3d/quick3dextras/items/quick3danimationgroup.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp @@ -36,11 +36,11 @@ #include "quick3danimationgroup_p.h" -#include <Qt3DExtras/qabstractanimation.h> +#include <Qt3DAnimation/qabstractanimation.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { QQuick3DAnimationGroup::QQuick3DAnimationGroup(QObject *parent) @@ -48,9 +48,9 @@ QQuick3DAnimationGroup::QQuick3DAnimationGroup(QObject *parent) { } -QQmlListProperty<Qt3DExtras::QAbstractAnimation> QQuick3DAnimationGroup::animations() +QQmlListProperty<Qt3DAnimation::QAbstractAnimation> QQuick3DAnimationGroup::animations() { - return QQmlListProperty<Qt3DExtras::QAbstractAnimation>(this, 0, + return QQmlListProperty<Qt3DAnimation::QAbstractAnimation>(this, 0, &QQuick3DAnimationGroup::appendAnimation, &QQuick3DAnimationGroup::animationCount, &QQuick3DAnimationGroup::animationAt, @@ -58,15 +58,15 @@ QQmlListProperty<Qt3DExtras::QAbstractAnimation> QQuick3DAnimationGroup::animati } -void QQuick3DAnimationGroup::appendAnimation(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list, - Qt3DExtras::QAbstractAnimation *animation) +void QQuick3DAnimationGroup::appendAnimation(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list, + Qt3DAnimation::QAbstractAnimation *animation) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); if (animationGroup) animationGroup->parentAnimationGroup()->addAnimation(animation); } -int QQuick3DAnimationGroup::animationCount(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list) +int QQuick3DAnimationGroup::animationCount(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); if (animationGroup) @@ -74,26 +74,26 @@ int QQuick3DAnimationGroup::animationCount(QQmlListProperty<Qt3DExtras::QAbstrac return 0; } -Qt3DExtras::QAbstractAnimation *QQuick3DAnimationGroup::animationAt(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list, int index) +Qt3DAnimation::QAbstractAnimation *QQuick3DAnimationGroup::animationAt(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list, int index) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); if (animationGroup) { - return qobject_cast<Qt3DExtras::QAbstractAnimation *>( + return qobject_cast<Qt3DAnimation::QAbstractAnimation *>( animationGroup->parentAnimationGroup()->animationList().at(index)); } return nullptr; } -void QQuick3DAnimationGroup::clearAnimation(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list) +void QQuick3DAnimationGroup::clearAnimation(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); if (animationGroup) { - QVector<Qt3DExtras::QAbstractAnimation *> emptyList; + QVector<Qt3DAnimation::QAbstractAnimation *> emptyList; animationGroup->parentAnimationGroup()->setAnimations(emptyList); } } } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3danimationgroup_p.h b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h index c7140c946..aef202480 100644 --- a/src/quick3d/quick3dextras/items/quick3danimationgroup_p.h +++ b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QUICK_QUICK3DANIMATIONGROUP_P_H -#define QT3DEXTRAS_QUICK_QUICK3DANIMATIONGROUP_P_H +#ifndef QT3DANIMATION_QUICK_QUICK3DANIMATIONGROUP_P_H +#define QT3DANIMATION_QUICK_QUICK3DANIMATIONGROUP_P_H // // W A R N I N G @@ -49,42 +49,42 @@ // #include <QtQml/qqmllist.h> -#include <Qt3DExtras/qabstractanimation.h> -#include <Qt3DExtras/qanimationgroup.h> +#include <Qt3DAnimation/qabstractanimation.h> +#include <Qt3DAnimation/qanimationgroup.h> -#include <Qt3DQuickExtras/qt3dquickextras_global.h> +#include <private/qt3dquickanimation_global_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT QQuick3DAnimationGroup : public QObject +class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationGroup : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DExtras::QAbstractAnimation> animations READ animations) + Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> animations READ animations) public: explicit QQuick3DAnimationGroup(QObject *parent = nullptr); - inline Qt3DExtras::QAnimationGroup *parentAnimationGroup() const + inline Qt3DAnimation::QAnimationGroup *parentAnimationGroup() const { - return qobject_cast<Qt3DExtras::QAnimationGroup *>(parent()); + return qobject_cast<Qt3DAnimation::QAnimationGroup *>(parent()); } - QQmlListProperty<Qt3DExtras::QAbstractAnimation> animations(); + QQmlListProperty<Qt3DAnimation::QAbstractAnimation> animations(); private: - static void appendAnimation(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list, Qt3DExtras::QAbstractAnimation *animation); - static Qt3DExtras::QAbstractAnimation *animationAt(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list, int index); - static int animationCount(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list); - static void clearAnimation(QQmlListProperty<Qt3DExtras::QAbstractAnimation> *list); + static void appendAnimation(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list, Qt3DAnimation::QAbstractAnimation *animation); + static Qt3DAnimation::QAbstractAnimation *animationAt(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list, int index); + static int animationCount(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list); + static void clearAnimation(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> *list); }; } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp index cfd9ca7d2..f7cf133fe 100644 --- a/src/quick3d/quick3dextras/items/quick3dkeyframeanimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { QQuick3DKeyframeAnimation::QQuick3DKeyframeAnimation(QObject *parent) @@ -96,6 +96,6 @@ void QQuick3DKeyframeAnimation::clearKeyframes(QQmlListProperty<Qt3DCore::QTrans } } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3dkeyframeanimation_p.h b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h index e8309de9e..944cdbe67 100644 --- a/src/quick3d/quick3dextras/items/quick3dkeyframeanimation_p.h +++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QUICK_QUICK3DKEYFRAMEANIMATION_P_H -#define QT3DEXTRAS_QUICK_QUICK3DKEYFRAMEANIMATION_P_H +#ifndef QT3DANIMATION_QUICK_QUICK3DKEYFRAMEANIMATION_P_H +#define QT3DANIMATION_QUICK_QUICK3DKEYFRAMEANIMATION_P_H // // W A R N I N G @@ -50,16 +50,16 @@ #include <QtQml/qqmllist.h> -#include <Qt3DExtras/qkeyframeanimation.h> +#include <Qt3DAnimation/qkeyframeanimation.h> -#include <Qt3DQuickExtras/qt3dquickextras_global.h> +#include <private/qt3dquickanimation_global_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT QQuick3DKeyframeAnimation : public QObject +class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DKeyframeAnimation : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QTransform> keyframes READ keyframes) @@ -85,8 +85,8 @@ private: }; } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QUICK_QUICK3DKEYFRAMEANIMATION_P_H +#endif // QT3DANIMATION_QUICK_QUICK3DKEYFRAMEANIMATION_P_H diff --git a/src/quick3d/quick3dextras/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp index 61636f06d..997e2e215 100644 --- a/src/quick3d/quick3dextras/items/quick3dmorphinganimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { QQuick3DMorphingAnimation::QQuick3DMorphingAnimation(QObject *parent) @@ -46,24 +46,24 @@ QQuick3DMorphingAnimation::QQuick3DMorphingAnimation(QObject *parent) { } -QQmlListProperty<Qt3DExtras::QMorphTarget> QQuick3DMorphingAnimation::morphTargets() +QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DMorphingAnimation::morphTargets() { - return QQmlListProperty<Qt3DExtras::QMorphTarget>(this, 0, + return QQmlListProperty<Qt3DAnimation::QMorphTarget>(this, 0, &QQuick3DMorphingAnimation::appendMorphTarget, &QQuick3DMorphingAnimation::morphTargetCount, &QQuick3DMorphingAnimation::morphTargetAt, &QQuick3DMorphingAnimation::clearMorphTargets); } -void QQuick3DMorphingAnimation::appendMorphTarget(QQmlListProperty<Qt3DExtras::QMorphTarget> *list, - Qt3DExtras::QMorphTarget *morphTarget) +void QQuick3DMorphingAnimation::appendMorphTarget(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list, + Qt3DAnimation::QMorphTarget *morphTarget) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) animation->parentMorphingAnimation()->addMorphTarget(morphTarget); } -int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DExtras::QMorphTarget> *list) +int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) @@ -71,27 +71,27 @@ int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DExtras::QMo return 0; } -Qt3DExtras::QMorphTarget *QQuick3DMorphingAnimation::morphTargetAt(QQmlListProperty<Qt3DExtras::QMorphTarget> *list, +Qt3DAnimation::QMorphTarget *QQuick3DMorphingAnimation::morphTargetAt(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list, int index) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) { - return qobject_cast<Qt3DExtras::QMorphTarget *>( + return qobject_cast<Qt3DAnimation::QMorphTarget *>( animation->parentMorphingAnimation()->morphTargetList().at(index)); } return nullptr; } -void QQuick3DMorphingAnimation::clearMorphTargets(QQmlListProperty<Qt3DExtras::QMorphTarget> *list) +void QQuick3DMorphingAnimation::clearMorphTargets(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) { - QVector<Qt3DExtras::QMorphTarget *> emptyList; + QVector<Qt3DAnimation::QMorphTarget *> emptyList; animation->parentMorphingAnimation()->setMorphTargets(emptyList); } } } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3dmorphinganimation_p.h b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h index 5f052fd04..31d008a89 100644 --- a/src/quick3d/quick3dextras/items/quick3dmorphinganimation_p.h +++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QUICK_QUICK3DMORPHINGANIMATION_P_H -#define QT3DEXTRAS_QUICK_QUICK3DMORPHINGANIMATION_P_H +#ifndef QT3DANIMATION_QUICK_QUICK3DMORPHINGANIMATION_P_H +#define QT3DANIMATION_QUICK_QUICK3DMORPHINGANIMATION_P_H // // W A R N I N G @@ -50,19 +50,19 @@ #include <QtQml/qqmllist.h> -#include <Qt3DExtras/qmorphinganimation.h> +#include <Qt3DAnimation/qmorphinganimation.h> -#include <Qt3DQuickExtras/qt3dquickextras_global.h> +#include <private/qt3dquickanimation_global_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT QQuick3DMorphingAnimation : public QObject +class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphingAnimation : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3DExtras::QMorphTarget> morphTargets READ morphTargets) + Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QMorphTarget> morphTargets READ morphTargets) public: QQuick3DMorphingAnimation(QObject *parent = nullptr); @@ -72,21 +72,21 @@ public: return qobject_cast<QMorphingAnimation *>(parent()); } - QQmlListProperty<Qt3DExtras::QMorphTarget> morphTargets(); + QQmlListProperty<Qt3DAnimation::QMorphTarget> morphTargets(); private: - static void appendMorphTarget(QQmlListProperty<Qt3DExtras::QMorphTarget> *list, - Qt3DExtras::QMorphTarget *morphTarget); - static Qt3DExtras::QMorphTarget *morphTargetAt(QQmlListProperty<Qt3DExtras::QMorphTarget> *list, + static void appendMorphTarget(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list, + Qt3DAnimation::QMorphTarget *morphTarget); + static Qt3DAnimation::QMorphTarget *morphTargetAt(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list, int index); - static int morphTargetCount(QQmlListProperty<Qt3DExtras::QMorphTarget> *list); - static void clearMorphTargets(QQmlListProperty<Qt3DExtras::QMorphTarget> *list); + static int morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list); + static void clearMorphTargets(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list); }; } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QUICK_QUICK3DMORPHINGANIMATION_P_H +#endif // QT3DANIMATION_QUICK_QUICK3DMORPHINGANIMATION_P_H diff --git a/src/quick3d/quick3dextras/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp index 8c1b9f0c1..81144e186 100644 --- a/src/quick3d/quick3dextras/items/quick3dmorphtarget.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { QQuick3DMorphTarget::QQuick3DMorphTarget(QObject *parent) @@ -88,6 +88,6 @@ void QQuick3DMorphTarget::clearAttributes(QQmlListProperty<Qt3DRender::QAttribut } } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/items/quick3dmorphtarget_p.h b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h index e5c664370..03b52dfeb 100644 --- a/src/quick3d/quick3dextras/items/quick3dmorphtarget_p.h +++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DEXTRAS_QUICK_QUICK3DMORPHTARGET_P_H -#define QT3DEXTRAS_QUICK_QUICK3DMORPHTARGET_P_H +#ifndef QT3DANIMATION_QUICK_QUICK3DMORPHTARGET_P_H +#define QT3DANIMATION_QUICK_QUICK3DMORPHTARGET_P_H // // W A R N I N G @@ -48,16 +48,16 @@ // We mean it. // -#include <Qt3DQuickExtras/qt3dquickextras_global.h> +#include <private/qt3dquickanimation_global_p.h> #include <QQmlListProperty> -#include <Qt3DExtras/QMorphTarget> +#include <Qt3DAnimation/QMorphTarget> QT_BEGIN_NAMESPACE -namespace Qt3DExtras { +namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT QQuick3DMorphTarget : public QObject +class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphTarget : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributes) @@ -78,8 +78,8 @@ private: }; } // namespace Quick -} // namespace Qt3DExtras +} // namespace Qt3DAnimation QT_END_NAMESPACE -#endif // QT3DEXTRAS_QUICK_QUICK3DMORPHTARGET_P_H +#endif // QT3DANIMATION_QUICK_QUICK3DMORPHTARGET_P_H diff --git a/src/quick3d/quick3dextras/items/items.pri b/src/quick3d/quick3dextras/items/items.pri index f7ca73a58..b6f5d1877 100644 --- a/src/quick3d/quick3dextras/items/items.pri +++ b/src/quick3d/quick3dextras/items/items.pri @@ -1,18 +1,8 @@ HEADERS += \ $$PWD/quick3dlevelofdetailloader_p.h \ - $$PWD/quick3dlevelofdetailloader_p_p.h \ - $$PWD/quick3danimationcontroller_p.h \ - $$PWD/quick3danimationgroup_p.h \ - $$PWD/quick3dkeyframeanimation_p.h \ - $$PWD/quick3dmorphinganimation_p.h \ - $$PWD/quick3dmorphtarget_p.h + $$PWD/quick3dlevelofdetailloader_p_p.h SOURCES += \ - $$PWD/quick3dlevelofdetailloader.cpp \ - $$PWD/quick3danimationcontroller.cpp \ - $$PWD/quick3danimationgroup.cpp \ - $$PWD/quick3dkeyframeanimation.cpp \ - $$PWD/quick3dmorphinganimation.cpp \ - $$PWD/quick3dmorphtarget.cpp + $$PWD/quick3dlevelofdetailloader.cpp INCLUDEPATH += $$PWD |