diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-07-30 12:03:46 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-07-30 13:51:37 +0100 |
| commit | 174cd487b4644a69853de9007b90cba989afe344 (patch) | |
| tree | 03e331f2b0a51ec2c6518d352c4b7a759edebbed /tests/manual/dynamic-model-loader-qml | |
| parent | eb728b5501f0ffb61ca4916ff5975c496ab98970 (diff) | |
Make sample meshes geometry renderers again
Introduce new geometry view class for each.
Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/manual/dynamic-model-loader-qml')
| -rw-r--r-- | tests/manual/dynamic-model-loader-qml/CuboidEntity.qml | 10 | ||||
| -rw-r--r-- | tests/manual/dynamic-model-loader-qml/SphereEntity.qml | 6 | ||||
| -rw-r--r-- | tests/manual/dynamic-model-loader-qml/main.qml | 15 |
3 files changed, 12 insertions, 19 deletions
diff --git a/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml b/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml index a21c50237..d9b33c511 100644 --- a/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml +++ b/tests/manual/dynamic-model-loader-qml/CuboidEntity.qml @@ -56,13 +56,11 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - GeometryRenderer { + CuboidMesh { id: mesh - view: CuboidMesh { - yzMeshResolution: Qt.size(2, 2) - xzMeshResolution: Qt.size(2, 2) - xyMeshResolution: Qt.size(2, 2) - } + yzMeshResolution: Qt.size(2, 2) + xzMeshResolution: Qt.size(2, 2) + xyMeshResolution: Qt.size(2, 2) } GoochMaterial { diff --git a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml b/tests/manual/dynamic-model-loader-qml/SphereEntity.qml index 14100f31f..8e11de99e 100644 --- a/tests/manual/dynamic-model-loader-qml/SphereEntity.qml +++ b/tests/manual/dynamic-model-loader-qml/SphereEntity.qml @@ -56,11 +56,9 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, material, transform ] - GeometryRenderer { + SphereMesh { id: mesh - view: SphereMesh { - radius: 3 - } + radius: 3 } Transform { diff --git a/tests/manual/dynamic-model-loader-qml/main.qml b/tests/manual/dynamic-model-loader-qml/main.qml index a403d2829..dc6b929cf 100644 --- a/tests/manual/dynamic-model-loader-qml/main.qml +++ b/tests/manual/dynamic-model-loader-qml/main.qml @@ -128,9 +128,8 @@ Entity { QQ2.Component { id: cylEntityCmp Entity { - GeometryRenderer { + CylinderMesh { id: cylMesh - view: CylinderMesh { } } PhongMaterial { id: phong @@ -143,14 +142,12 @@ Entity { QQ2.Component { id: torusEntityCmp Entity { - GeometryRenderer { + TorusMesh { id: torusMesh - view: TorusMesh { - radius: 5 - minorRadius: 1 - rings: 100 - slices: 20 - } + radius: 5 + minorRadius: 1 + rings: 100 + slices: 20 } Transform { |