diff options
Diffstat (limited to 'tests/auto/render')
21 files changed, 72 insertions, 102 deletions
diff --git a/tests/auto/render/boundingsphere/cube.qml b/tests/auto/render/boundingsphere/cube.qml index eb437404a..11d6d4db1 100644 --- a/tests/auto/render/boundingsphere/cube.qml +++ b/tests/auto/render/boundingsphere/cube.qml @@ -61,7 +61,7 @@ Entity { Entity { components: [ - GeometryRenderer { id: testMesh; objectName: "testMesh"; view: CuboidMesh { } }, + CuboidMesh { id: testMesh; objectName: "testMesh" }, PhongMaterial { id: material } ] } diff --git a/tests/auto/render/boundingsphere/sphere.qml b/tests/auto/render/boundingsphere/sphere.qml index c4b78824d..1f0e2245a 100644 --- a/tests/auto/render/boundingsphere/sphere.qml +++ b/tests/auto/render/boundingsphere/sphere.qml @@ -61,7 +61,7 @@ Entity { Entity { components: [ - GeometryRenderer { id: testMesh; objectName: "testMesh"; view: SphereMesh { } }, + SphereMesh { id: testMesh; objectName: "testMesh" }, PhongMaterial { id: material } ] } diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp index 813157251..a167fc140 100644 --- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp +++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp @@ -327,9 +327,7 @@ void tst_gltfPlugins::createTestScene() mesh->setYZMeshResolution(QSize(2, 2)); mesh->setYZMeshResolution(QSize(2, 3)); mesh->setYZMeshResolution(QSize(3, 2)); - Qt3DRender::QGeometryRenderer *renderer = new Qt3DRender::QGeometryRenderer; - renderer->setView(mesh); - createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), renderer, material, transform); + createAndAddEntity(QStringLiteral("Cube with DiffuseMap"), mesh, material, transform); } // Cone with PhongAlpha { @@ -353,9 +351,7 @@ void tst_gltfPlugins::createTestScene() mesh->setTopRadius(0.5f); mesh->setBottomRadius(1.5f); mesh->setLength(0.9f); - auto renderer = new Qt3DRender::QGeometryRenderer; - renderer->setView(mesh); - createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), renderer, material, transform); + createAndAddEntity(QStringLiteral("Cone with PhongAlpha"), mesh, material, transform); } // Cylinder with Phong { @@ -372,9 +368,7 @@ void tst_gltfPlugins::createTestScene() mesh->setRings(3); mesh->setLength(1.2f); mesh->setSlices(16); - auto renderer = new Qt3DRender::QGeometryRenderer; - renderer->setView(mesh); - createAndAddEntity(QStringLiteral("Cylinder with Phong"), renderer, material, transform); + createAndAddEntity(QStringLiteral("Cylinder with Phong"), mesh, material, transform); } // Plane with DiffuseSpecularMap { @@ -399,10 +393,8 @@ 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"), - renderer, material, transform); + mesh, material, transform); } // Sphere with NormalDiffuseMap { @@ -430,10 +422,8 @@ 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"), - renderer, material, transform); + mesh, material, transform); } // Sphere with NormalDiffuseMapAlpha { @@ -461,10 +451,8 @@ 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"), - renderer, material, transform); + mesh, material, transform); } // Sphere with NormalDiffuseSpecularMap { @@ -495,10 +483,8 @@ 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"), - renderer, material, transform); + mesh, material, transform); } // Torus with Gooch { @@ -520,9 +506,7 @@ void tst_gltfPlugins::createTestScene() mesh->setMinorRadius(0.5f); mesh->setRings(16); mesh->setSlices(16); - auto renderer = new Qt3DRender::QGeometryRenderer; - renderer->setView(mesh); - createAndAddEntity(QStringLiteral("Torus with Gooch"), renderer, material, transform); + createAndAddEntity(QStringLiteral("Torus with Gooch"), mesh, material, transform); } // Custom cube with per-vertex colors { @@ -533,7 +517,7 @@ void tst_gltfPlugins::createTestScene() Qt3DRender::QGeometryRenderer *boxMesh = createCustomCube(); Qt3DCore::QBuffer *colorDataBuffer = - new Qt3DCore::QBuffer(boxMesh->view()->geometry()); + new Qt3DCore::QBuffer(boxMesh->geometry()); QByteArray colorBufferData; colorBufferData.resize(8 * 4 * sizeof(float)); @@ -547,7 +531,7 @@ void tst_gltfPlugins::createTestScene() colorDataBuffer->setData(colorBufferData); - addColorAttributeToGeometry(boxMesh->view()->geometry(), colorDataBuffer, 8); + addColorAttributeToGeometry(boxMesh->geometry(), colorDataBuffer, 8); createAndAddEntity(QStringLiteral("Custom cube with per-vertex colors"), boxMesh, material, transform); @@ -568,10 +552,8 @@ 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"), - renderer, material, transform, parentEntity); + mesh, material, transform, parentEntity); } // Cube with custom material { @@ -590,7 +572,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->view()->geometry()); + new Qt3DCore::QBuffer(boxMesh->geometry()); QByteArray offsetBufferData; offsetBufferData.resize(8 * 3 * sizeof(float)); @@ -613,7 +595,7 @@ void tst_gltfPlugins::createTestScene() customAttribute->setCount(8); customAttribute->setName(QStringLiteral("vertexOffset")); - boxMesh->view()->geometry()->addAttribute(customAttribute); + boxMesh->geometry()->addAttribute(customAttribute); createAndAddEntity(QStringLiteral("Custom cube with on-top material"), boxMesh, material, transform); @@ -751,8 +733,12 @@ 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->view()->geometry(); - auto geometry2 = mesh2->view()->geometry(); + auto geometry1 = mesh1->geometry(); + if (!geometry1 && mesh1->view()) + geometry1 = mesh1->view()->geometry(); + auto geometry2 = mesh2->geometry(); + if (!geometry2 && mesh2->view()) + geometry2 = mesh2->view()->geometry(); // Check that attributes match. compareAttributes( findAttribute(Qt3DCore::QAttribute::defaultPositionAttributeName(), @@ -980,8 +966,8 @@ QUrl tst_gltfPlugins::getTextureUrl(Qt3DRender::QAbstractTexture *tex) Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube() { - Qt3DCore::QGeometryView *boxView = new Qt3DCore::QGeometryView(); - Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxView); + Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer; + Qt3DCore::QGeometry *boxGeometry = new Qt3DCore::QGeometry(boxMesh); Qt3DCore::QBuffer *boxDataBuffer = new Qt3DCore::QBuffer(boxGeometry); Qt3DCore::QBuffer *indexDataBuffer = @@ -1024,15 +1010,13 @@ Qt3DRender::QGeometryRenderer *tst_gltfPlugins::createCustomCube() addPositionAttributeToGeometry(boxGeometry, boxDataBuffer, 8); addIndexAttributeToGeometry(boxGeometry, indexDataBuffer, 36); - boxView->setInstanceCount(1); - boxView->setIndexOffset(0); - boxView->setFirstInstance(0); - boxView->setVertexCount(36); - boxView->setPrimitiveType(Qt3DCore::QGeometryView::Triangles); - boxView->setGeometry(boxGeometry); + boxMesh->setInstanceCount(1); + boxMesh->setIndexOffset(0); + boxMesh->setFirstInstance(0); + boxMesh->setVertexCount(36); + boxMesh->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles); + boxMesh->setGeometry(boxGeometry); - Qt3DRender::QGeometryRenderer *boxMesh = new Qt3DRender::QGeometryRenderer; - boxMesh->setView(boxView); return boxMesh; } @@ -1218,6 +1202,7 @@ void tst_gltfPlugins::exportAndImport() Qt3DCore::QEntity *importedEntity = findChildEntity(importedScene, name); QVERIFY(importedEntity != nullptr); if (importedEntity) { + qDebug() << importedEntity->objectName(); compareComponents(transformComponent(exportedEntity), transformComponent(importedEntity)); compareComponents(lightComponent(exportedEntity), diff --git a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml index 9e56d7641..87e7a8aac 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } Entity { diff --git a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml index 29094d8e3..7376b53e5 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_childentity.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Parent Entity diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml index a2cbd7117..9b7f973a9 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragdisabled.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml index 73f1108b4..747b7e858 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabled.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml index cdacf849d..f80726068 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledhoverenabled.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml index d54470119..4280b8555 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_dragenabledoverlapping.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml index 37140494d..f0b88acba 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_improperframegraph.qml @@ -79,7 +79,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml index bb360c1bc..86471f8b2 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_nopicking.qml @@ -99,7 +99,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml index ce171de9e..759544bb9 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_parententity.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Parent Entity @@ -104,11 +104,9 @@ Entity { Entity { components: [ - GeometryRenderer { - view: PlaneMesh { - width: 100 - height: 100 - } + 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 860fc2400..a24289835 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_pickersdisabled.qml @@ -96,7 +96,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml index be83fc75f..7cacb3d2d 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_priorityoverlapping.qml @@ -100,7 +100,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } PhongMaterial { id: material } // Entity 1 diff --git a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml index 0b9c20a94..daafc0edd 100644 --- a/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml +++ b/tests/auto/render/pickboundingvolumejob/testscene_viewports.qml @@ -127,7 +127,7 @@ Entity { } ] - GeometryRenderer { id: cubeMesh; view: CuboidMesh { } } + CuboidMesh { id: cubeMesh } 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 f89463776..9fe15c334 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -71,18 +71,15 @@ public: , clickedCalled(0) { mesh->setRadius(radius); - QSphereGeometry *g = static_cast<QSphereGeometry *>(mesh->geometry()); + QSphereGeometry *g = static_cast<QSphereGeometry *>(mesh->view()->geometry()); QAttribute *positionAttr = static_cast<QAttribute *>(g->attributes().first()); Qt3DCore::QBuffer *vertexBuffer = static_cast<Qt3DCore::QBuffer *>(positionAttr->buffer()); Q_UNUSED(vertexBuffer); transform->setTranslation(position); - auto renderer = new Qt3DRender::QGeometryRenderer; - renderer->setView(mesh); - addComponent(picker); - addComponent(renderer); + addComponent(mesh); 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 198148560..47221aec8 100644 --- a/tests/auto/render/raycastingjob/testscene_screenraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_screenraycasting.qml @@ -112,14 +112,12 @@ Entity { onReleased: { caster.trigger(Qt.point(mouse.x, mouse.y)); } } - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 100 - slices: 20 - } + 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 aea697fba..cdb6b9234 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycasting.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycasting.qml @@ -105,14 +105,12 @@ Entity { } ] - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 10 - slices: 10 - } + 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 a8db4e5c0..efcc31e8f 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingalllayers.qml @@ -107,14 +107,12 @@ Entity { } ] - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 10 - slices: 10 - } + 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 ff6c413cb..5c6170ae6 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -107,14 +107,12 @@ Entity { } ] - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 10 - slices: 10 - } + 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 54d2586f7..99ca26d6f 100644 --- a/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml +++ b/tests/auto/render/raycastingjob/testscene_worldraycastingparentlayer.qml @@ -107,14 +107,12 @@ Entity { } ] - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 10 - slices: 10 - } + radius: 1 + length: 3 + rings: 10 + slices: 10 } PhongMaterial { id: material } |