summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/picking/picking.pro2
-rw-r--r--tests/auto/render/picking/tst_picking.cpp5
-rw-r--r--tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp2
-rw-r--r--tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro2
-rw-r--r--tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp20
-rw-r--r--tests/auto/render/qmaterial/qmaterial.pro2
-rw-r--r--tests/auto/render/qmaterial/tst_qmaterial.cpp28
-rw-r--r--tests/auto/render/render.pro4
-rw-r--r--tests/benchmarks/render/jobs/jobs.pro2
-rw-r--r--tests/benchmarks/render/jobs/tst_bench_jobs.cpp12
10 files changed, 41 insertions, 38 deletions
diff --git a/tests/auto/render/picking/picking.pro b/tests/auto/render/picking/picking.pro
index 4745033d3..3d7ad7875 100644
--- a/tests/auto/render/picking/picking.pro
+++ b/tests/auto/render/picking/picking.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_picking
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras
CONFIG += testcase
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index cf8c16eba..d177aae6c 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -34,16 +34,17 @@
#include <Qt3DRender/private/pickboundingvolumejob_p.h>
#include <Qt3DRender/private/objectpicker_p.h>
#include <Qt3DRender/qobjectpicker.h>
-#include <Qt3DRender/qspheremesh.h>
+#include <Qt3DExtras/qspheremesh.h>
#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/qbuffer.h>
#include <Qt3DRender/qbufferdatagenerator.h>
-#include <Qt3DRender/qspheregeometry.h>
+#include <Qt3DExtras/qspheregeometry.h>
#include <Qt3DRender/qpickevent.h>
#include <Qt3DCore/qbackendnodepropertychange.h>
using namespace Qt3DCore;
using namespace Qt3DRender;
+using namespace Qt3DExtras;
using namespace Qt3DRender::Render;
class MyObjectPicker : public Qt3DRender::QObjectPicker
diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
index f5c1fc1ae..615df7745 100644
--- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
+++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
@@ -35,6 +35,8 @@
#include "testpostmanarbiter.h"
+#if 0
+
class MyBoundingVolumeDebug : public Qt3DRender::QBoundingVolumeDebug
{
Q_OBJECT
diff --git a/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro b/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro
index fdd8bd6b2..aaf49b892 100644
--- a/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro
+++ b/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_qdefaultmeshes
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras
CONFIG += testcase
diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
index 6069dba9e..9e22bbbfb 100644
--- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
+++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
@@ -35,11 +35,11 @@
#include <Qt3DRender/qbuffer.h>
#include <Qt3DRender/qbufferdatagenerator.h>
-#include <Qt3DRender/qspheremesh.h>
-#include <Qt3DRender/qcylindermesh.h>
-#include <Qt3DRender/qtorusmesh.h>
-#include <Qt3DRender/qcuboidmesh.h>
-#include <Qt3DRender/qplanemesh.h>
+#include <Qt3DExtras/qspheremesh.h>
+#include <Qt3DExtras/qcylindermesh.h>
+#include <Qt3DExtras/qtorusmesh.h>
+#include <Qt3DExtras/qcuboidmesh.h>
+#include <Qt3DExtras/qplanemesh.h>
// We need to call QNode::clone which is protected
// So we sublcass QNode instead of QObject
@@ -57,11 +57,11 @@ private Q_SLOTS:
void checkCloning_data()
{
QTest::addColumn<Qt3DRender::QGeometryRenderer *>("geomRenderer");
- QTest::newRow("QSphereMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QSphereMesh);
- QTest::newRow("QCylinderMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QCylinderMesh);
- QTest::newRow("QTorusMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QTorusMesh);
- QTest::newRow("QCuboidMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QCuboidMesh);
- QTest::newRow("QPlaneMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QPlaneMesh);
+ QTest::newRow("QSphereMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QSphereMesh);
+ QTest::newRow("QCylinderMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QCylinderMesh);
+ QTest::newRow("QTorusMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QTorusMesh);
+ QTest::newRow("QCuboidMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QCuboidMesh);
+ QTest::newRow("QPlaneMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QPlaneMesh);
}
void checkCloning()
diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro
index a9a27b4bf..5aa07f577 100644
--- a/tests/auto/render/qmaterial/qmaterial.pro
+++ b/tests/auto/render/qmaterial/qmaterial.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_qmaterial
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras
CONFIG += testcase
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 104548b2f..acf03ea87 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -36,13 +36,13 @@
#include <Qt3DRender/QParameter>
#include <Qt3DRender/QTechnique>
#include <Qt3DRender/QRenderPass>
-#include <Qt3DRender/QPhongMaterial>
-#include <Qt3DRender/QDiffuseMapMaterial>
-#include <Qt3DRender/QPerVertexColorMaterial>
-#include <Qt3DRender/QNormalDiffuseMapMaterial>
-#include <Qt3DRender/QDiffuseSpecularMapMaterial>
-#include <Qt3DRender/QNormalDiffuseMapAlphaMaterial>
-#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial>
+#include <Qt3DExtras/QPhongMaterial>
+#include <Qt3DExtras/QDiffuseMapMaterial>
+#include <Qt3DExtras/QPerVertexColorMaterial>
+#include <Qt3DExtras/QNormalDiffuseMapMaterial>
+#include <Qt3DExtras/QDiffuseSpecularMapMaterial>
+#include <Qt3DExtras/QNormalDiffuseMapAlphaMaterial>
+#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial>
#include "testpostmanarbiter.h"
@@ -201,19 +201,19 @@ private Q_SLOTS:
QTest::newRow("empty material") << material;
material = new TestMaterial();
QTest::newRow("test material") << material;
- material = new Qt3DRender::QPhongMaterial();
+ material = new Qt3DExtras::QPhongMaterial();
QTest::newRow("QPhongMaterial") << material;
- material = new Qt3DRender::QDiffuseMapMaterial();
+ material = new Qt3DExtras::QDiffuseMapMaterial();
QTest::newRow("QDiffuseMapMaterial") << material;
- material = new Qt3DRender::QDiffuseSpecularMapMaterial();
+ material = new Qt3DExtras::QDiffuseSpecularMapMaterial();
QTest::newRow("QDiffuseMapSpecularMaterial") << material;
- material = new Qt3DRender::QPerVertexColorMaterial();
+ material = new Qt3DExtras::QPerVertexColorMaterial();
QTest::newRow("QPerVertexColorMaterial") << material;
- material = new Qt3DRender::QNormalDiffuseMapMaterial();
+ material = new Qt3DExtras::QNormalDiffuseMapMaterial();
QTest::newRow("QNormalDiffuseMapMaterial") << material;
- material = new Qt3DRender::QNormalDiffuseMapAlphaMaterial();
+ material = new Qt3DExtras::QNormalDiffuseMapAlphaMaterial();
QTest::newRow("QNormalDiffuseMapAlphaMaterial") << material;
- material = new Qt3DRender::QNormalDiffuseSpecularMapMaterial();
+ material = new Qt3DExtras::QNormalDiffuseSpecularMapMaterial();
QTest::newRow("QNormalDiffuseSpecularMapMaterial") << material;
}
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 64bc1ddf0..403eb0f4d 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -39,8 +39,8 @@ contains(QT_CONFIG, private_tests) {
qobjectpicker \
objectpicker \
picking \
- qboundingvolumedebug \
- boundingvolumedebug \
+# qboundingvolumedebug \
+# boundingvolumedebug \
qdefaultmeshes \
trianglesextractor \
triangleboundingvolume \
diff --git a/tests/benchmarks/render/jobs/jobs.pro b/tests/benchmarks/render/jobs/jobs.pro
index 0eb6017e2..bfd0f1317 100644
--- a/tests/benchmarks/render/jobs/jobs.pro
+++ b/tests/benchmarks/render/jobs/jobs.pro
@@ -2,7 +2,7 @@ TARGET = tst_bench_jobs
TEMPLATE = app
-QT += testlib core core-private 3dcore 3dcore-private 3drender 3drender-private 3dquick qml
+QT += testlib core core-private 3dcore 3dcore-private 3drender 3drender-private 3dquick qml 3dextras
SOURCES += tst_bench_jobs.cpp
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
index 362a363a7..46427947c 100644
--- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
+++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
@@ -31,9 +31,9 @@
#include <Qt3DCore/QEntity>
#include <Qt3DCore/QTransform>
#include <Qt3DRender/QMaterial>
-#include <Qt3DRender/QForwardRenderer>
-#include <Qt3DRender/QPhongMaterial>
-#include <Qt3DRender/QCylinderMesh>
+#include <Qt3DExtras/QForwardRenderer>
+#include <Qt3DExtras/QPhongMaterial>
+#include <Qt3DExtras/QCylinderMesh>
#include <Qt3DRender/QRenderSettings>
#include <Qt3DRender/private/managers_p.h>
@@ -165,7 +165,7 @@ Qt3DCore::QEntity *buildBigScene()
// FrameGraph
Qt3DRender::QRenderSettings* renderSettings = new Qt3DRender::QRenderSettings();
- Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
+ Qt3DExtras::QForwardRenderer *forwardRenderer = new Qt3DExtras::QForwardRenderer();
forwardRenderer->setCamera(cameraEntity);
forwardRenderer->setClearColor(Qt::black);
renderSettings->setActiveFrameGraph(forwardRenderer);
@@ -178,8 +178,8 @@ Qt3DCore::QEntity *buildBigScene()
for (int i = 0; i < max; i++) {
Qt3DCore::QEntity *e = new Qt3DCore::QEntity();
Qt3DCore::QTransform *transform = new Qt3DCore::QTransform();
- Qt3DRender::QCylinderMesh *mesh = new Qt3DRender::QCylinderMesh();
- Qt3DRender::QPhongMaterial *material = new Qt3DRender::QPhongMaterial();
+ Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh();
+ Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial();
mesh->setRings(50.0f);
mesh->setSlices(30.0f);
mesh->setRadius(2.5f);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:46:45 +0000