From bd0f948a40da1fa04f1035b2278856e2b8649ab1 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 17 Oct 2011 14:17:41 +1000 Subject: Add Affector Benchmark Just for generic affector. Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ceaaa Reviewed-by: Martin Jones --- tests/benchmarks/particles/affectors/affectors.pro | 10 ++ .../benchmarks/particles/affectors/data/basic.qml | 74 ++++++++++ .../particles/affectors/data/filtered.qml | 81 ++++++++++ .../particles/affectors/tst_affectors.cpp | 164 +++++++++++++++++++++ tests/benchmarks/particles/particles.pro | 3 +- 5 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 tests/benchmarks/particles/affectors/affectors.pro create mode 100644 tests/benchmarks/particles/affectors/data/basic.qml create mode 100644 tests/benchmarks/particles/affectors/data/filtered.qml create mode 100644 tests/benchmarks/particles/affectors/tst_affectors.cpp (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro new file mode 100644 index 0000000000..4d1926da22 --- /dev/null +++ b/tests/benchmarks/particles/affectors/affectors.pro @@ -0,0 +1,10 @@ +CONFIG += testcase +TARGET = tst_affectors +SOURCES += tst_affectors.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/benchmarks/particles/affectors/data/basic.qml b/tests/benchmarks/particles/affectors/data/basic.qml new file mode 100644 index 0000000000..a10e2002d5 --- /dev/null +++ b/tests/benchmarks/particles/affectors/data/basic.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 + running: false //Benchmark will manage it + + ImageParticle { + source: "../../shared/star.png" + } + + Emitter{ + //0,0 position + id: emitter + enabled: false + size: 32 + emitRate: 1000 + lifeSpan: Emitter.InfiniteLife + maximumEmitted: 1000 + Component.onCompleted: emitter.burst(1000); + } + + Affector{ + } + } +} diff --git a/tests/benchmarks/particles/affectors/data/filtered.qml b/tests/benchmarks/particles/affectors/data/filtered.qml new file mode 100644 index 0000000000..1b88140044 --- /dev/null +++ b/tests/benchmarks/particles/affectors/data/filtered.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** 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 + running: false //Benchmark will manage it + + ImageParticle { + groups: ["A"] + source: "../../shared/star.png" + } + + Emitter{ + //central position + id: emitter + x: 160 + y: 160 + group: "A" + size: 32 + emitRate: 1000 + lifeSpan: Emitter.InfiniteLife + maximumEmitted: 1000 + enabled: false + Component.onCompleted: emitter.burst(1000); + } + + Affector{ + groups: ["A"] + anchors.fill: parent + //whenCollidingWith: ["A"] //Test separately? + } + } +} diff --git a/tests/benchmarks/particles/affectors/tst_affectors.cpp b/tests/benchmarks/particles/affectors/tst_affectors.cpp new file mode 100644 index 0000000000..f85f877c51 --- /dev/null +++ b/tests/benchmarks/particles/affectors/tst_affectors.cpp @@ -0,0 +1,164 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include +#include +#include "../../../auto/particles/shared/particlestestsshared.h" +#include + +class tst_affectors : public QObject +{ + Q_OBJECT +public: + tst_affectors(); + +private slots: + void test_basic(); + void test_basic_data(); + void test_filtered(); + void test_filtered_data(); +}; + +tst_affectors::tst_affectors() +{ +} + +void tst_affectors::test_basic_data() +{ + QTest::addColumn ("dt"); + QTest::newRow("16ms") << 16; + QTest::newRow("32ms") << 32; + QTest::newRow("100ms") << 100; + QTest::newRow("500ms") << 500; +} + +void tst_affectors::test_filtered_data() +{ + QTest::addColumn ("dt"); + QTest::newRow("16ms") << 16; + QTest::newRow("32ms") << 32; + QTest::newRow("100ms") << 100; + QTest::newRow("500ms") << 500; +} + +void tst_affectors::test_basic() +{ + QFETCH(int, dt); + QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml"); + QSGParticleSystem* system = view->rootObject()->findChild("system"); + //Pretend we're running, but we manually advance the simulation + system->m_running = true; + system->m_animation = 0; + system->reset(); + + int curTime = 1; + system->updateCurrentTime(curTime);//Fixed point and get init out of the way - including emission + + QBENCHMARK { + curTime += dt; + system->updateCurrentTime(curTime); + } + + int stillAlive = 0; + QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible. + foreach (QSGParticleData *d, system->groupData[0]->data) { + if (d->t == -1) + continue; //Particle data unused + + if (d->stillAlive()) + stillAlive++; + QCOMPARE(d->x, 0.f); + QCOMPARE(d->y, 0.f); + QCOMPARE(d->vx, 0.f); + QCOMPARE(d->vy, 0.f); + QCOMPARE(d->ax, 0.f); + QCOMPARE(d->ay, 0.f); + QCOMPARE(d->size, 32.f); + QCOMPARE(d->endSize, 32.f); + QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0))); + } + QVERIFY(extremelyFuzzyCompare(stillAlive, 1000, 10));//Small simulation variance is permissible. + delete view; +} + +void tst_affectors::test_filtered() +{ + QFETCH(int, dt); + QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/filtered.qml"); + QSGParticleSystem* system = view->rootObject()->findChild("system"); + //Pretend we're running, but we manually advance the simulation + system->m_running = true; + system->m_animation = 0; + system->reset(); + + int curTime = 1; + system->updateCurrentTime(curTime);//Fixed point and get init out of the way - including emission + + QBENCHMARK { + curTime += dt; + system->updateCurrentTime(curTime); + } + + int stillAlive = 0; + QVERIFY(extremelyFuzzyCompare(system->groupData[1]->size(), 1000, 10));//Small simulation variance is permissible. + foreach (QSGParticleData *d, system->groupData[1]->data) { + if (d->t == -1) + continue; //Particle data unused + + if (d->stillAlive()) + stillAlive++; + QCOMPARE(d->x, 160.f); + QCOMPARE(d->y, 160.f); + QCOMPARE(d->vx, 0.f); + QCOMPARE(d->vy, 0.f); + QCOMPARE(d->ax, 0.f); + QCOMPARE(d->ay, 0.f); + QCOMPARE(d->size, 32.f); + QCOMPARE(d->endSize, 32.f); + QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0))); + } + QVERIFY(extremelyFuzzyCompare(stillAlive, 1000, 10));//Small simulation variance is permissible. + delete view; +} + +QTEST_MAIN(tst_affectors); + +#include "tst_affectors.moc" diff --git a/tests/benchmarks/particles/particles.pro b/tests/benchmarks/particles/particles.pro index a614bcf344..535bedd1f9 100644 --- a/tests/benchmarks/particles/particles.pro +++ b/tests/benchmarks/particles/particles.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ - emission + emission \ + affectors -- cgit v1.2.3