Adapt manual test to exercise new animation data API

Change-Id: I977ae430e33b2c4ded91e6aa2af0d55f1672918e
Reviewed-by: Mike Krus <mike.krus@kdab.com>

5 files changed, 180 insertions, 3 deletions

diff --git a/tests/manual/animation-keyframe-programmatic/animation-keyframe-programmatic.pro b/tests/manual/animation-keyframe-programmatic/animation-keyframe-programmatic.pro
index 04db4207e..e38990808 100644
--- a/tests/manual/animation-keyframe-programmatic/animation-keyframe-programmatic.pro
+++ b/tests/manual/animation-keyframe-programmatic/animation-keyframe-programmatic.pro
@@ -1,5 +1,12 @@
 TEMPLATE = app
 QT += 3dquickextras 3dquickanimation
-SOURCES += main.cpp
+
+SOURCES += \
+    main.cpp \
+    animationfactory.cpp
+
+HEADERS += \
+    animationfactory.h
+
 RESOURCES += main.qrc
 OTHER_FILES += main.qml DefaultSceneEntity.qml
diff --git a/tests/manual/animation-keyframe-programmatic/animationfactory.cpp b/tests/manual/animation-keyframe-programmatic/animationfactory.cpp
new file mode 100644
index 000000000..e3b1c6165
--- /dev/null
+++ b/tests/manual/animation-keyframe-programmatic/animationfactory.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "animationfactory.h"
+
+using namespace Qt3DAnimation;
+
+AnimationFactory::AnimationFactory(QObject *parent)
+    : QObject(parent)
+{
+    updateClipData();
+}
+
+void AnimationFactory::updateClipData()
+{
+    m_clipData.clearChannels();
+
+    // Add a channel for a Location animation
+    QChannel location(QLatin1String("Location"));
+
+    QChannelComponent locationX(QLatin1String("Location X"));
+    locationX.appendKeyFrame(QKeyFrame({0.0f, 0.0f}, {-1.0f, 0.0f}, {1.0f, 0.0f}));
+    locationX.appendKeyFrame(QKeyFrame({2.45f, 5.0f}, {1.45f, 5.0f}, {3.45f, 5.0f}));
+
+    QChannelComponent locationY(QLatin1String("Location Y"));
+    locationY.appendKeyFrame(QKeyFrame({0.0f, 0.0f}, {-1.0f, 0.0f}, {1.0f, 0.0f}));
+    locationY.appendKeyFrame(QKeyFrame({2.45f, 0.0f}, {1.45f, 0.0f}, {3.45f, 0.0f}));
+
+    QChannelComponent locationZ(QLatin1String("Location Z"));
+    locationZ.appendKeyFrame(QKeyFrame({0.0f, 0.0f}, {-1.0f, 0.0f}, {1.0f, 0.0f}));
+    locationZ.appendKeyFrame(QKeyFrame({2.45f, 0.0f}, {1.45f, 0.0f}, {3.45f, 0.0f}));
+
+    location.appendChannelComponent(locationX);
+    location.appendChannelComponent(locationY);
+    location.appendChannelComponent(locationZ);
+
+    m_clipData.appendChannel(location);
+}
diff --git a/tests/manual/animation-keyframe-programmatic/animationfactory.h b/tests/manual/animation-keyframe-programmatic/animationfactory.h
new file mode 100644
index 000000000..b73db0b68
--- /dev/null
+++ b/tests/manual/animation-keyframe-programmatic/animationfactory.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ANIMATIONFACTORY_H
+#define ANIMATIONFACTORY_H
+
+#include <QObject>
+#include <Qt3DAnimation/qanimationclipdata.h>
+
+class AnimationFactory : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Qt3DAnimation::QAnimationClipData clipData READ clipData NOTIFY clipDataChanged)
+
+public:
+    explicit AnimationFactory(QObject *parent = 0);
+
+    Qt3DAnimation::QAnimationClipData clipData() const
+    {
+        return m_clipData;
+    }
+
+signals:
+    void clipDataChanged(Qt3DAnimation::QAnimationClipData clipData);
+
+private:
+    void updateClipData();
+
+    Qt3DAnimation::QAnimationClipData m_clipData;
+};
+
+#endif // ANIMATIONFACTORY_H
diff --git a/tests/manual/animation-keyframe-programmatic/main.cpp b/tests/manual/animation-keyframe-programmatic/main.cpp
index fce9ecc5f..eb3a22df1 100644
--- a/tests/manual/animation-keyframe-programmatic/main.cpp
+++ b/tests/manual/animation-keyframe-programmatic/main.cpp
@@ -55,11 +55,17 @@
 #include <QQmlEngine>
 #include <QQmlContext>
 
+#include "animationfactory.h"
+
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
+
+    AnimationFactory animationFactory;
+
     Qt3DExtras::Quick::Qt3DQuickWindow view;
     view.registerAspect(new Qt3DAnimation::QAnimationAspect());
+    view.engine()->qmlEngine()->rootContext()->setContextProperty("_animationFactory", &animationFactory);
     view.setSource(QUrl("qrc:/main.qml"));
     view.show();
     return app.exec();
diff --git a/tests/manual/animation-keyframe-programmatic/main.qml b/tests/manual/animation-keyframe-programmatic/main.qml
index 79fb75fbd..c34e44d51 100644
--- a/tests/manual/animation-keyframe-programmatic/main.qml
+++ b/tests/manual/animation-keyframe-programmatic/main.qml
@@ -82,8 +82,8 @@ DefaultSceneEntity {
                 loops: 3
                 onRunningChanged: console.log("running = " + running)
 
-                clip: AnimationClipLoader {
-                    source: "cubeanimation.json"
+                clip: AnimationClip {
+                    clipData: _animationFactory.clipData
                     onDurationChanged: console.log("duration = " + duration)
                 }