diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-10-20 18:03:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-03 06:27:47 +0100 |
| commit | 728a32d0e231cee3842e32511a3de6909f5d3181 (patch) | |
| tree | b3f9a26dbad2ec717776bd65b77604a25822d13a /tests/auto/particles | |
| parent | a06ec0c299a267149d9440ddb935272b0165e464 (diff) | |
Fix Gravity
Now simulates acceleration instead of setting it, and properties are
renamed to be consistent with AngleDirection
Change-Id: I648aa9122c49b46aa7b7d7796bc25d5bd56bfffe
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/particles')
| -rw-r--r-- | tests/auto/particles/qquickgravity/tst_qquickgravity.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp index a80c5c52ab..bc8cca8522 100644 --- a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp +++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp @@ -66,12 +66,14 @@ void tst_qquickgravity::test_basic() ensureAnimTime(600, system->m_animation); QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); + float mag = 707.10678f; foreach (QQuickParticleData *d, system->groupData[0]->data) { - if (d->t == -1) - continue; //Particle data unused + if (d->t == -1 || !d->stillAlive()) + continue; //Particle data unused or dead - QCOMPARE(d->ax, 707.10678f); - QCOMPARE(d->ay, 707.10678f); + float t = ((qreal)system->timeInt/1000.0) - d->t; + QVERIFY(extremelyFuzzyCompare(d->vx, t*mag, 20.0f)); + QVERIFY(extremelyFuzzyCompare(d->vy, t*mag, 20.0f)); QCOMPARE(d->lifeSpan, 0.5f); QCOMPARE(d->size, 32.f); QCOMPARE(d->endSize, 32.f); |