diff options
Diffstat (limited to 'tests/auto')
24 files changed, 112 insertions, 75 deletions
diff --git a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp index 00e4890c8..c765947ae 100644 --- a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp +++ b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp @@ -63,6 +63,7 @@ #include <Qt3DRender/QCameraLens> #include <Qt3DRender/QRenderAspect> #include <Qt3DRender/QRenderSettings> +#include <Qt3DRender/QGeometryRenderer> #include <Qt3DExtras/QForwardRenderer> #include <Qt3DExtras/Qt3DWindow> @@ -113,7 +114,9 @@ Qt3DCore::QEntity *createScene(QWindow *w) torusTransform->setScale3D(QVector3D(1.5, 1, 0.5)); torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f)); - torusEntity->addComponent(torusMesh); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(torusMesh); + torusEntity->addComponent(renderer); torusEntity->addComponent(torusTransform); torusEntity->addComponent(material); @@ -124,7 +127,10 @@ Qt3DCore::QEntity *createScene(QWindow *w) Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform; - sphereEntity->addComponent(sphereMesh); + renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(sphereMesh); + + sphereEntity->addComponent(renderer); sphereEntity->addComponent(sphereTransform); sphereEntity->addComponent(material); diff --git a/tests/auto/render/boundingsphere/cube.qml b/tests/auto/render/boundingsphere/cube.qml index 11d6d4db1..eb437404a 100644 --- a/tests/auto/render/boundingsphere/cube.qml +++ b/tests/auto/render/boundingsphere/cube.qml @@ -61,7 +61,7 @@ Entity { Entity { components: [ - CuboidMesh { id: testMesh; objectName: "testMesh" }, + GeometryRenderer { id: testMesh; objectName: "testMesh"; view: CuboidMesh { } }, PhongMaterial { id: material } ] } diff --git a/tests/auto/render/boundingsphere/sphere.qml b/tests/auto/render/boundingsphere/sphere.qml index 1f0e2245a..c4b78824d 100644 --- a/tests/auto/render/boundingsphere/sphere.qml +++ b/tests/auto/render/boundingsphere/sphere.qml @@ -61,7 +61,7 @@ Entity { Entity { components: [ - SphereMesh { id: testMesh; objectName: "testMesh" }, + GeometryRenderer { id: testMesh; objectName: "testMesh"; view: SphereMesh { } }, PhongMaterial { id: material } ] } diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp index c929c5cb5..2e3b498a6 100644 --- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp +++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp @@ -57,12 +57,6 @@ #include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DRender/private/sphere_p.h> -#include <Qt3DExtras/qspheremesh.h> -#include <Qt3DExtras/qcylindermesh.h> -#include <Qt3DExtras/qtorusmesh.h> -#include <Qt3DExtras/qcuboidmesh.h> -#include <Qt3DExtras/qplanemesh.h> - #include <qbackendnodetester.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp index 26dddf12f..fbf24b22e 100644 --- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp +++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp @@ -67,6 +67,7 @@ #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qcolormask.h> #include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <Qt3DExtras/qconemesh.h> #include <Qt3DExtras/qcuboidmesh.h> @@ -326,7 +327,9 @@ void tst_gltfPlugins::createTestScene() mesh->setYZMeshResolution(QSize(2, 2)); mesh->setYZMeshResolution(QSize(2, 3)); mesh->setYZMeshResolution(QSize(3, 2)); - createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), mesh, material, transform); + Qt3DRender::QGeometryRenderer *renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), renderer, material, transform); } // Cone with PhongAlpha { @@ -350,7 +353,9 @@ void tst_gltfPlugins::createTestScene() mesh->setTopRadius(0.5f); mesh->setBottomRadius(1.5f); mesh->setLength(0.9f); - createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), mesh, material, transform); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), renderer, material, transform); } // Cylinder with Phong { @@ -367,7 +372,9 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(3); mesh->setLength(1.2f); mesh->setSlices(16); - createAndAddEntity(QStringLiteral("Cylinder with Phong"), mesh, material, transform); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + createAndAddEntity(QStringLiteral("Cylinder with Phong"), renderer, material, transform); } // Plane with DiffuseSpecularMap { @@ -392,8 +399,10 @@ void tst_gltfPlugins::createTestScene() mesh->setMeshResolution(QSize(3, 3)); mesh->setHeight(1.5f); mesh->setWidth(1.2f); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); createAndAddEntity(QStringLiteral("Plane with DiffuseSpecularMap"), - mesh, material, transform); + renderer, material, transform); } // Sphere with NormalDiffuseMap { @@ -421,8 +430,10 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(16); mesh->setSlices(16); mesh->setGenerateTangents(true); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseMap"), - mesh, material, transform); + renderer, material, transform); } // Sphere with NormalDiffuseMapAlpha { @@ -450,8 +461,10 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(16); mesh->setSlices(16); mesh->setGenerateTangents(true); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseMapAlpha"), - mesh, material, transform); + renderer, material, transform); } // Sphere with NormalDiffuseSpecularMap { @@ -482,8 +495,10 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(16); mesh->setSlices(16); mesh->setGenerateTangents(true); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); createAndAddEntity(QStringLiteral("Sphere with NormalDiffuseSpecularMap"), - mesh, material, transform); + renderer, material, transform); } // Torus with Gooch { @@ -505,7 +520,9 @@ void tst_gltfPlugins::createTestScene() mesh->setMinorRadius(0.5f); mesh->setRings(16); mesh->setSlices(16); - createAndAddEntity(QStringLiteral("Torus with Gooch"), mesh, material, transform); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + createAndAddEntity(QStringLiteral("Torus with Gooch"), renderer, material, transform); } // Custom cube with per-vertex colors { @@ -516,7 +533,7 @@ void tst_gltfPlugins::createTestScene() Qt3DRender::QGeometryRenderer *boxMesh = createCustomCube(); Qt3DCore::QBuffer *colorDataBuffer = - new Qt3DCore::QBuffer(boxMesh->geometry()); + new Qt3DCore::QBuffer(boxMesh->view()->geometry()); QByteArray colorBufferData; colorBufferData.resize(8 * 4 * sizeof(float)); @@ -530,7 +547,7 @@ void tst_gltfPlugins::createTestScene() colorDataBuffer->setData(colorBufferData); - addColorAttributeToGeometry(boxMesh->geometry(), colorDataBuffer, 8); + addColorAttributeToGeometry(boxMesh->view()->geometry(), colorDataBuffer, 8); createAndAddEntity(QStringLiteral("Custom cube with per-vertex colors"), boxMesh, material, transform); @@ -551,8 +568,10 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(3); mesh->setLength(1.5f); mesh->setSlices(16); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); createAndAddEntity(QStringLiteral("Child with Phong"), - mesh, material, transform, parentEntity); + renderer, material, transform, parentEntity); } // Cube with custom material { @@ -571,7 +590,7 @@ void tst_gltfPlugins::createTestScene() transform->setRotation(Qt3DCore::QTransform::fromAxisAndAngle(1.0f, 2.0f, 3.0f, 90.0f)); Qt3DRender::QGeometryRenderer *boxMesh = createCustomCube(); Qt3DCore::QBuffer *offsetBuffer = - new Qt3DCore::QBuffer(boxMesh->geometry()); + new Qt3DCore::QBuffer(boxMesh->view()->geometry()); QByteArray offsetBufferData; offsetBufferData.resize(8 * 3 * sizeof(float)); @@ -594,7 +613,7 @@ void tst_gltfPlugins::createTestScene() customAttribute->setCount(8); customAttribute->setName(QStringLiteral("vertexOffset")); - boxMesh->geometry()->addAttribute(customAttribute); + boxMesh->view()->geometry()->addAttribute(customAttribute); createAndAddEntity(QStringLiteral("Custom cube with on-top material"), boxMesh, material, transform); @@ -732,8 +751,8 @@ void tst_gltfPlugins::compareComponents(Qt3DCore::QComponent *c1, Qt3DCore::QCom if (auto mesh1 = qobject_cast<Qt3DRender::QGeometryRenderer *>(c1)) { auto mesh2 = qobject_cast<Qt3DRender::QGeometryRenderer *>(c2); QVERIFY(mesh2 != nullptr); - auto geometry1 = mesh1->geometry(); - auto geometry2 = mesh2->geometry(); + auto geometry1 = mesh1->view()->geometry(); + auto geometry2 = mesh2->view()->geometry(); // Check that attributes match. compareAttributes( findAttribute(Qt3DCore::QAttribute::defaultPositionAttributeName(), @@ -961,8 +980,8 @@ QUrl tst_gltfPlugins::getTextureUrl(Qt3DRender::QAbstractTexture *tex) Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube() { - Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer; - Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxMesh); + Qt3DCore::QGeometryView *boxView = new Qt3DCore::QGeometryView(); + Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxView); Qt3DCore::QBuffer *boxDataBuffer = new Qt3DCore::QBuffer(boxGeometry); Qt3DCore::QBuffer *indexDataBuffer = @@ -1005,13 +1024,15 @@ Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube() addPositionAttributeToGeometry(boxGeometry, boxDataBuffer, 8); addIndexAttributeToGeometry(boxGeometry, indexDataBuffer, 36); - boxMesh->setInstanceCount(1); - boxMesh->setIndexOffset(0); - boxMesh->setFirstInstance(0); - boxMesh->setVertexCount(36); - boxMesh->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); - boxMesh->setGeometry(boxGeometry); + boxView->setInstanceCount(1); + boxView->setIndexOffset(0); + boxView->setFirstInstance(0); + boxView->setVertexCount(36); + boxView->setPrimitiveType(Qt3DCore::QGeometryView::Triangles); + boxView->setGeometry(boxGeometry); + Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer; + boxMesh->setView(boxView); return boxMesh; } diff --git a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml index 87e7a8aac..9e56d7641 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } Entity { diff --git a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml index 7376b53e5..29094d8e3 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Parent Entity diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml index 9b7f973a9..a2cbd7117 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml index 747b7e858..73f1108b4 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml index f80726068..cdacf849d 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml index 4280b8555..d54470119 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml index f0b88acba..37140494d 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml @@ -79,7 +79,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml index 86471f8b2..bb360c1bc 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml @@ -99,7 +99,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml index 759544bb9..ce171de9e 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Parent Entity @@ -104,9 +104,11 @@ Entity { Entity { components: [ - PlaneMesh { - width: 100 - height: 100 + GeometryRenderer { + view: PlaneMesh { + width: 100 + height: 100 + } }, PhongMaterial { } diff --git a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml index a24289835..860fc2400 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml @@ -96,7 +96,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml index 7cacb3d2d..be83fc75f 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml @@ -100,7 +100,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml index daafc0edd..0b9c20a94 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml @@ -127,7 +127,7 @@ Entity { } ] - CuboidMesh { id: cubeMesh } + GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } Entity { readonly property ObjectPicker objectPicker: ObjectPicker { diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index b38aa3695..20a1b0323 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -34,6 +34,7 @@ #include <Qt3DRender/private/pickboundingvolumejob_p.h> #include <Qt3DRender/private/objectpicker_p.h> #include <Qt3DRender/qobjectpicker.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <Qt3DRender/private/qobjectpicker_p.h> #include <Qt3DExtras/qspheremesh.h> #include <Qt3DCore/qattribute.h> @@ -76,8 +77,11 @@ public: transform->setTranslation(position); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + addComponent(picker); - addComponent(mesh); + addComponent(renderer); addComponent(transform); QObject::connect(picker, &QObjectPicker::pressed, this, &PickableEntity::onPressed); diff --git a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml index 47221aec8..198148560 100644 --- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml @@ -112,12 +112,14 @@ Entity { onReleased: { caster.trigger(Qt.point(mouse.x, mouse.y)); } } - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 100 - slices: 20 + view: CylinderMesh { + radius: 1 + length: 3 + rings: 100 + slices: 20 + } } PhongMaterial { id: material } diff --git a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml index cdb6b9234..aea697fba 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml @@ -105,12 +105,14 @@ Entity { } ] - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 10 - slices: 10 + view: CylinderMesh { + radius: 1 + length: 3 + rings: 10 + slices: 10 + } } PhongMaterial { id: material } diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml index efcc31e8f..a8db4e5c0 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml @@ -107,12 +107,14 @@ Entity { } ] - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 10 - slices: 10 + view: CylinderMesh { + radius: 1 + length: 3 + rings: 10 + slices: 10 + } } PhongMaterial { id: material } diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml index 5c6170ae6..ff6c413cb 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -107,12 +107,14 @@ Entity { } ] - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 10 - slices: 10 + view: CylinderMesh { + radius: 1 + length: 3 + rings: 10 + slices: 10 + } } PhongMaterial { id: material } diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml index 99ca26d6f..54d2586f7 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml @@ -107,12 +107,14 @@ Entity { } ] - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 10 - slices: 10 + view: CylinderMesh { + radius: 1 + length: 3 + rings: 10 + slices: 10 + } } PhongMaterial { id: material } diff --git a/tests/auto/render/updatemeshtrianglelistjob/test_scene.qml b/tests/auto/render/updatemeshtrianglelistjob/test_scene.qml index ecf41f9c0..35292967c 100644 --- a/tests/auto/render/updatemeshtrianglelistjob/test_scene.qml +++ b/tests/auto/render/updatemeshtrianglelistjob/test_scene.qml @@ -97,6 +97,6 @@ Entity { ] Entity { - components: CuboidMesh { id: cubeMesh } + components: GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } } } |