Skip to content

Commit

Permalink
Add Affector Benchmark
Browse files Browse the repository at this point in the history 
Just for generic affector.

Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ceaaa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
  • Loading branch information
Alan Alpert authored and Qt by Nokia committed Oct 17, 2011
1 parent af3b3cd commit bd0f948
Show file tree
Hide file tree
Showing 5 changed files with 331 additions and 1 deletion.
10 changes: 10 additions & 0 deletions tests/benchmarks/particles/affectors/affectors.pro
View file
@@ -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
74 changes: 74 additions & 0 deletions tests/benchmarks/particles/affectors/data/basic.qml
View file
@@ -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{
}
}
}
81 changes: 81 additions & 0 deletions tests/benchmarks/particles/affectors/data/filtered.qml
View file
@@ -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?
}
}
}
164 changes: 164 additions & 0 deletions tests/benchmarks/particles/affectors/tst_affectors.cpp
View file
@@ -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 <qtest.h>
#include <QtTest/QtTest>
#include "../../../auto/particles/shared/particlestestsshared.h"
#include <private/qsgparticlesystem_p.h>

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<int> ("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<int> ("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<QSGParticleSystem*>("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<QSGParticleSystem*>("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"
3 changes: 2 additions & 1 deletion tests/benchmarks/particles/particles.pro
View file
@@ -1,4 +1,5 @@
TEMPLATE = subdirs

SUBDIRS += \
emission
emission \
affectors

0 comments on commit bd0f948

Please sign in to comment.