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/lod | |
| 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/lod')
| -rw-r--r-- | tests/manual/lod/ConeEntity.qml | 10 | ||||
| -rw-r--r-- | tests/manual/lod/CuboidEntity.qml | 10 | ||||
| -rw-r--r-- | tests/manual/lod/CylinderEntity.qml | 8 | ||||
| -rw-r--r-- | tests/manual/lod/SphereEntity.qml | 6 | ||||
| -rw-r--r-- | tests/manual/lod/main.qml | 16 |
5 files changed, 20 insertions, 30 deletions
diff --git a/tests/manual/lod/ConeEntity.qml b/tests/manual/lod/ConeEntity.qml index d80834bcf..bfe6703b6 100644 --- a/tests/manual/lod/ConeEntity.qml +++ b/tests/manual/lod/ConeEntity.qml @@ -56,12 +56,10 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - GeometryRenderer { - view: ConeMesh { - id: mesh - bottomRadius: 1.5 - length: 3 - } + ConeMesh { + id: mesh + bottomRadius: 1.5 + length: 3 } PhongMaterial { diff --git a/tests/manual/lod/CuboidEntity.qml b/tests/manual/lod/CuboidEntity.qml index 2b8acbabf..875d98b32 100644 --- a/tests/manual/lod/CuboidEntity.qml +++ b/tests/manual/lod/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) } PhongMaterial { diff --git a/tests/manual/lod/CylinderEntity.qml b/tests/manual/lod/CylinderEntity.qml index 3066f7b75..f89bd3eeb 100644 --- a/tests/manual/lod/CylinderEntity.qml +++ b/tests/manual/lod/CylinderEntity.qml @@ -56,12 +56,10 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - } + radius: 1 + length: 3 } PhongMaterial { diff --git a/tests/manual/lod/SphereEntity.qml b/tests/manual/lod/SphereEntity.qml index 7e3df2cc3..3671921b8 100644 --- a/tests/manual/lod/SphereEntity.qml +++ b/tests/manual/lod/SphereEntity.qml @@ -56,11 +56,9 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, material, transform ] - GeometryRenderer { + SphereMesh { id: mesh - SphereMesh { - radius: 1 - } + radius: 1 } PhongMaterial { diff --git a/tests/manual/lod/main.qml b/tests/manual/lod/main.qml index 98cbc7aaa..80547dcff 100644 --- a/tests/manual/lod/main.qml +++ b/tests/manual/lod/main.qml @@ -104,16 +104,14 @@ Entity { Entity { components: [ - GeometryRenderer { + CylinderMesh { id: mesh - view: CylinderMesh { - radius: 1 - length: 3 - rings: 2 - slices: sliceValues[lod.currentIndex] - - property var sliceValues: [20, 10, 6, 4] - } + radius: 1 + length: 3 + rings: 2 + slices: sliceValues[lod.currentIndex] + + property var sliceValues: [20, 10, 6, 4] }, Transform { scale: 1.5 |