diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2020-05-28 14:21:52 +0200 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2020-06-02 11:15:44 +0200 |
commit | ff293f3afc0a9fe892124af4a10d29f2410569e4 (patch) | |
tree | f4200a4be4fab1252184d9db58bd874f76da3063 /tests/auto/particles | |
parent | 0d0f6ab80349963f3aaa387992b0edfadddb62a4 (diff) |
Remove CustomParticle
The implementation is intertwined with the direct GL path and not
really portable to RHI.
Fixes: QTBUG-78574
Change-Id: I6ac8707544c19a24661f07e0e6d2fc405e49cbff
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/particles')
7 files changed, 0 insertions, 279 deletions
diff --git a/tests/auto/particles/CMakeLists.txt b/tests/auto/particles/CMakeLists.txt index b712210c0a..a8bbefc836 100644 --- a/tests/auto/particles/CMakeLists.txt +++ b/tests/auto/particles/CMakeLists.txt @@ -5,7 +5,6 @@ if(QT_FEATURE_private_tests) add_subdirectory(qquickangleddirection) add_subdirectory(qquickcumulativedirection) add_subdirectory(qquickcustomaffector) - add_subdirectory(qquickcustomparticle) add_subdirectory(qquickellipseextruder) add_subdirectory(qquickgroupgoal) add_subdirectory(qquickfriction) diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro index 6ee1290dbb..0285023c94 100644 --- a/tests/auto/particles/particles.pro +++ b/tests/auto/particles/particles.pro @@ -5,7 +5,6 @@ PRIVATETESTS += \ qquickangleddirection \ qquickcumulativedirection \ qquickcustomaffector \ - qquickcustomparticle \ qquickellipseextruder \ qquickgroupgoal \ qquickfriction \ diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt deleted file mode 100644 index c4760a9475..0000000000 --- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from qquickcustomparticle.pro. - -##################################################################### -## tst_qquickcustomparticle Test: -##################################################################### - -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - data/*) -list(APPEND test_data ${test_data_glob}) - -qt_add_test(tst_qquickcustomparticle - SOURCES - ../../shared/util.cpp ../../shared/util.h - tst_qquickcustomparticle.cpp - INCLUDE_DIRECTORIES - ../../shared - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickParticlesPrivate - Qt::QuickPrivate - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qquickcustomparticle CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" -) - -qt_extend_target(tst_qquickcustomparticle CONDITION NOT ANDROID AND NOT IOS - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" -) diff --git a/tests/auto/particles/qquickcustomparticle/data/basic.qml b/tests/auto/particles/qquickcustomparticle/data/basic.qml deleted file mode 100644 index 101b1dda7b..0000000000 --- a/tests/auto/particles/qquickcustomparticle/data/basic.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $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 - - CustomParticle { - property variant source: ShaderEffectSource { - hideSource: true - sourceItem: Image { - source: "../../shared/star.png" - } - } - } - - Emitter{ - //0,0 position - size: 32 - emitRate: 1000 - lifeSpan: 500 - } - } -} diff --git a/tests/auto/particles/qquickcustomparticle/data/deleteSourceItem.qml b/tests/auto/particles/qquickcustomparticle/data/deleteSourceItem.qml deleted file mode 100644 index 03ff8844f6..0000000000 --- a/tests/auto/particles/qquickcustomparticle/data/deleteSourceItem.qml +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $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 - - CustomParticle { - id: cp - property variant source - } - - Emitter{ - //0,0 position - size: 32 - emitRate: 1000 - lifeSpan: 500 - } - } - - ShaderEffectSource { - id: doomedses - hideSource: true - sourceItem: Image { - id: doomed - source: "../../shared/star.png" - } - } - - function setDeletedSourceItem() { - doomed.destroy(); - cp.source = doomedses; - } -} diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro deleted file mode 100644 index d02b45457a..0000000000 --- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickcustomparticle -SOURCES += tst_qquickcustomparticle.cpp -macx:CONFIG -= app_bundle - -include (../../shared/util.pri) -TESTDATA = data/* - -QT += core-private gui-private qml-private quick-private quickparticles-private testlib - diff --git a/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp deleted file mode 100644 index 60c6a37899..0000000000 --- a/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtTest/QtTest> -#include "../shared/particlestestsshared.h" -#include <private/qquickparticlesystem_p.h> -#include <private/qabstractanimation_p.h> - -#include "../../shared/util.h" - -class tst_qquickcustomparticle : public QQmlDataTest -{ - Q_OBJECT -public: - tst_qquickcustomparticle() {} - -private slots: - void initTestCase(); - void test_basic(); - void test_deleteSourceItem(); -}; - -void tst_qquickcustomparticle::initTestCase() -{ - QQmlDataTest::initTestCase(); - QUnifiedTimer::instance()->setConsistentTiming(true); -} - -void tst_qquickcustomparticle::test_basic() -{ - QQuickView* view = createView(testFileUrl("basic.qml"), 600); - QVERIFY(view); - QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); - ensureAnimTime(600, system->m_animation); - - bool oneNonZero = false; - QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); - for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) { - if (d->t == -1) - continue; //Particle data unused - - 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->lifeSpan, 0.5f); - QCOMPARE(d->size, 32.f); - QCOMPARE(d->endSize, 32.f); - QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0))); - QVERIFY(d->r >= 0.0 && d->r <= 1.0); - if (d->r != 0.0 ) - oneNonZero = true; - } - delete view; - QVERIFY(oneNonZero);//Zero is a valid value, but it also needs to be set to a random number -} - -void tst_qquickcustomparticle::test_deleteSourceItem() -{ - // purely to ensure that deleting the sourceItem of a shader doesn't cause a crash - QQuickView* view = createView(testFileUrl("deleteSourceItem.qml"), 600); - QVERIFY(view); - QObject *obj = view->rootObject(); - QVERIFY(obj); - QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system"); - ensureAnimTime(200, system->m_animation); - QMetaObject::invokeMethod(obj, "setDeletedSourceItem"); - ensureAnimTime(200, system->m_animation); - delete view; -} - -QTEST_MAIN(tst_qquickcustomparticle); - -#include "tst_qquickcustomparticle.moc" |