summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-07-20 09:10:08 +0200
committerSean Harmer <sean.harmer@kdab.com>2015-07-28 09:49:19 +0000
commit90623e3ccbeba4f498b3ce5c1b6c88f1122df434 (patch)
tree2e7a5b59b3d6830d0f0d70f1c1cec5cb6f355a9e /tests
parent3fe37f854dcaa2d92e8936ccddd07800fb4d04d3 (diff)
Functors: remove dynamic_cast
Introduce a QAbstractFunctor class which QAbstractMeshFunctor and QTextureDataFunctor subclass Make all QAbstractFunctor subclasses implement an id() function (using QT3D_FUNCTOR(Class)). Use this id to compare to other QAbstractMeshFunctor and eventually static_cast into right type if possible using the functor_cast member function. Change-Id: Iface956e6cd818cbef204d8fa7bf2bc23c6ffa3f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/meshfunctors/meshfunctors.pro9
-rw-r--r--tests/auto/render/meshfunctors/tst_meshfunctors.cpp131
-rw-r--r--tests/auto/render/render.pro3
3 files changed, 142 insertions, 1 deletions
diff --git a/tests/auto/render/meshfunctors/meshfunctors.pro b/tests/auto/render/meshfunctors/meshfunctors.pro
new file mode 100644
index 000000000..008969cd0
--- /dev/null
+++ b/tests/auto/render/meshfunctors/meshfunctors.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+TARGET = tst_renderviews
+
+QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
+
+CONFIG += testcase
+
+SOURCES += tst_meshfunctors.cpp
diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
new file mode 100644
index 000000000..702449a9f
--- /dev/null
+++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later 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 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <Qt3DRenderer/QAbstractMesh>
+
+class MeshFunctorA : public Qt3D::QAbstractMeshFunctor
+{
+public:
+ MeshFunctorA()
+ {}
+
+ ~MeshFunctorA()
+ {}
+
+ Qt3D::QMeshDataPtr operator ()() Q_DECL_OVERRIDE
+ {
+ return Qt3D::QMeshDataPtr();
+ }
+
+ bool operator ==(const Qt3D::QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE
+ {
+ return functor_cast<MeshFunctorA>(&other);
+ }
+
+ QT3D_FUNCTOR(MeshFunctorA)
+};
+
+class MeshFunctorB : public Qt3D::QAbstractMeshFunctor
+{
+public:
+ MeshFunctorB()
+ {}
+
+ ~MeshFunctorB()
+ {}
+
+ Qt3D::QMeshDataPtr operator ()() Q_DECL_OVERRIDE
+ {
+ return Qt3D::QMeshDataPtr();
+ }
+
+ bool operator ==(const Qt3D::QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE
+ {
+ return functor_cast<MeshFunctorB>(&other);
+ }
+
+ QT3D_FUNCTOR(MeshFunctorB)
+};
+
+class MeshFunctorASub : public MeshFunctorA
+{
+public:
+ MeshFunctorASub()
+ {}
+
+ ~MeshFunctorASub()
+ {}
+
+ bool operator ==(const Qt3D::QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE
+ {
+ return functor_cast<MeshFunctorASub>(&other);
+ }
+
+ QT3D_FUNCTOR(MeshFunctorASub)
+};
+
+
+class tst_MeshFunctors : public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void functorComparison()
+ {
+ // GIVEN
+ QScopedPointer<MeshFunctorA> functorA(new MeshFunctorA);
+ QScopedPointer<MeshFunctorB> functorB(new MeshFunctorB);
+ QScopedPointer<MeshFunctorASub> functorASub(new MeshFunctorASub);
+
+ // THEN
+ QVERIFY(!(*functorA == *functorB));
+ QVERIFY(!(*functorA == *functorASub));
+
+ QVERIFY(!(*functorB == *functorA));
+ QVERIFY(!(*functorB == *functorASub));
+
+ QVERIFY(!(*functorASub == *functorA));
+ QVERIFY(!(*functorASub == *functorB));
+
+ QVERIFY(*functorA == *functorA);
+ QVERIFY(*functorB == *functorB);
+ QVERIFY(*functorASub == *functorASub);
+ }
+};
+
+QTEST_APPLESS_MAIN(tst_MeshFunctors)
+
+#include "tst_meshfunctors.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 2da3d77f5..65317484c 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -11,5 +11,6 @@ contains(QT_CONFIG, private_tests) {
renderviews \
rendermaterial \
rendermesh \
- vsyncframeadvanceservice
+ vsyncframeadvanceservice \
+ meshfunctors
}