aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/particles')
-rw-r--r--tests/auto/particles/qquickgravity/tst_qquickgravity.cpp10
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);