diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-03-08 10:13:15 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-03-08 09:37:21 +0000 |
| commit | 350a74ec69b535df07ad7ca45415090749c75293 (patch) | |
| tree | 911d3c17b0af4f733f5449c6796014cfc9ac0d04 /tests/auto/particles | |
| parent | 922e9d6b0c7ae1acdae4986e8000ad9a693b7469 (diff) | |
Particles: Shrink QQuickParticleData by 2 pointers.
Samegame creates about 23,000 particles, so this reduces the memory by
~180kb on 32bit, so ~360kb on 64bit.
Change-Id: I0581524ab232b474c5d43abeabd7ebf6174e740f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'tests/auto/particles')
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp index 50d28f8e77..fb15af4dd1 100644 --- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp +++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp @@ -63,7 +63,7 @@ void tst_qquickcustomaffector::test_basic() if (d->t == -1) continue; //Particle data unused //in CI the whole simulation often happens at once, so dead particles end up missing out - if (!d->stillAlive()) + if (!d->stillAlive(system)) continue; //parameters no longer get set once you die QCOMPARE(d->x, 100.f); @@ -95,13 +95,13 @@ void tst_qquickcustomaffector::test_move() foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1) continue; //Particle data unused - if (!d->stillAlive()) + if (!d->stillAlive(system)) 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->curX(system), 50.0)); + QVERIFY(myFuzzyCompare(d->curY(system), 50.0)); + QVERIFY(myFuzzyCompare(d->curVX(system), 50.0)); + QVERIFY(myFuzzyCompare(d->curVY(system), 50.0)); QVERIFY(myFuzzyCompare(d->curAX(), 50.0)); QVERIFY(myFuzzyCompare(d->curAY(), 50.0)); QCOMPARE(d->lifeSpan, 0.5f); diff --git a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp index 05e450dd92..8ef075dc9b 100644 --- a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp +++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp @@ -59,7 +59,7 @@ void tst_qquickgravity::test_basic() QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); float mag = 707.10678f; foreach (QQuickParticleData *d, system->groupData[0]->data) { - if (d->t == -1 || !d->stillAlive()) + if (d->t == -1 || !d->stillAlive(system)) continue; //Particle data unused or dead float t = ((qreal)system->timeInt/1000.0) - d->t; diff --git a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp index 31b6f6f1c8..4a3c5cdc74 100644 --- a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp +++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp @@ -62,7 +62,7 @@ void tst_qquickparticlesystem::test_basic() if (d->t == -1) continue; //Particle data unused - if (d->stillAlive()) + if (d->stillAlive(system)) stillAlive++; QCOMPARE(d->x, 0.f); QCOMPARE(d->y, 0.f); |