Fold Move into Affector

Since 'Move' was just a generic physics property affector, it makes
sense to fold it into the generic affector as an easier way of
implementing the common case of custom affector (and much faster, since
it doesn't hit JS).

For completeness in the Move behavior, 'once' now applies the effect of
affectors over a second in that one time, so as to avoid exposing the
simulation tick. This allows once to have actual meaning for continous
affectors.

Gravity is also going to be kept around as a convenience (although it
will change slightly), so just removing its deprecation warning.

Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324b
Reviewed-by: Martin Jones <martin.jones@nokia.com>

2 files changed, 101 insertions, 0 deletions

diff --git a/tests/auto/particles/qsgcustomaffector/data/move.qml b/tests/auto/particles/qsgcustomaffector/data/move.qml
new file mode 100644
index 0000000000..f3d651c502
--- /dev/null
+++ b/tests/auto/particles/qsgcustomaffector/data/move.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle {
+    color: "black"
+    width: 320
+    height: 320
+
+    ParticleSystem {
+        id: sys
+        objectName: "system"
+        anchors.fill: parent
+
+        ImageParticle {
+            source: "../../shared/star.png"
+        }
+
+        Emitter{
+            //0,0 position
+            size: 32
+            emitRate: 1000
+            lifeSpan: 500
+        }
+
+        Affector {
+            once: false
+            relative: false
+            position: PointDirection { x: 50; y: 50; }
+            speed: PointDirection { x: 50; y: 50; }
+            acceleration: PointDirection { x: 50; y: 50; }
+        }
+    }
+}
diff --git a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp
index d49f6cb908..91aa971eb7 100644
--- a/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp
+++ b/tests/auto/particles/qsgcustomaffector/tst_qsgcustomaffector.cpp
@@ -52,6 +52,7 @@ public:
 
 private slots:
     void test_basic();
+    void test_move();
 };
 
 tst_qsgcustomaffector::tst_qsgcustomaffector()
@@ -83,6 +84,32 @@ void tst_qsgcustomaffector::test_basic()
     }
 }
 
+void tst_qsgcustomaffector::test_move()
+{
+    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/move.qml", 600);
+    QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system");
+    ensureAnimTime(600, system->m_animation);
+
+    QCOMPARE(system->groupData[0]->size(), 500);
+    foreach (QSGParticleData *d, system->groupData[0]->data) {
+        if (d->t == -1)
+            continue; //Particle data unused
+        if (!d->stillAlive())
+            continue; //parameters no longer get set once you die
+
+        QVERIFY(myFuzzyCompare(d->curX(), 50.0));
+        QVERIFY(myFuzzyCompare(d->curY(), 50.0));
+        QVERIFY(myFuzzyCompare(d->curVX(), 50.0));
+        QVERIFY(myFuzzyCompare(d->curVY(), 50.0));
+        QVERIFY(myFuzzyCompare(d->curAX(), 50.0));
+        QVERIFY(myFuzzyCompare(d->curAY(), 50.0));
+        QCOMPARE(d->lifeSpan, 0.5f);
+        QCOMPARE(d->size, 32.f);
+        QCOMPARE(d->endSize, 32.f);
+        QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0)));
+    }
+}
+
 QTEST_MAIN(tst_qsgcustomaffector);
 
 #include "tst_qsgcustomaffector.moc"