diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-11 14:14:30 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 12:10:08 +0000 |
| commit | 5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 (patch) | |
| tree | 9a502509da33a48dade8f7cbd0af1e7d3444b2f3 /tests/manual/lod | |
| parent | 703090204ef41bced5634bbb332551dea1dd7b37 (diff) | |
Make default geometries views
In Extras, make QTorusMesh and others a QGeometryView rather than
a QGeometryRenderer. Requires changes to scene graphs here and there
but going forward there simple shapes could be used as proxies for
picking or collision detection, etc.
Change-Id: Id488e064080dfd303e448aba11e6b242236b81d4
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, 30 insertions, 20 deletions
diff --git a/tests/manual/lod/ConeEntity.qml b/tests/manual/lod/ConeEntity.qml index bfe6703b6..d80834bcf 100644 --- a/tests/manual/lod/ConeEntity.qml +++ b/tests/manual/lod/ConeEntity.qml @@ -56,10 +56,12 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - ConeMesh { - id: mesh - bottomRadius: 1.5 - length: 3 + GeometryRenderer { + view: ConeMesh { + id: mesh + bottomRadius: 1.5 + length: 3 + } } PhongMaterial { diff --git a/tests/manual/lod/CuboidEntity.qml b/tests/manual/lod/CuboidEntity.qml index 875d98b32..2b8acbabf 100644 --- a/tests/manual/lod/CuboidEntity.qml +++ b/tests/manual/lod/CuboidEntity.qml @@ -56,11 +56,13 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - CuboidMesh { + GeometryRenderer { id: mesh - yzMeshResolution: Qt.size(2, 2) - xzMeshResolution: Qt.size(2, 2) - xyMeshResolution: Qt.size(2, 2) + view: CuboidMesh { + 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 f89bd3eeb..3066f7b75 100644 --- a/tests/manual/lod/CylinderEntity.qml +++ b/tests/manual/lod/CylinderEntity.qml @@ -56,10 +56,12 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 + view: CylinderMesh { + radius: 1 + length: 3 + } } PhongMaterial { diff --git a/tests/manual/lod/SphereEntity.qml b/tests/manual/lod/SphereEntity.qml index 3671921b8..7e3df2cc3 100644 --- a/tests/manual/lod/SphereEntity.qml +++ b/tests/manual/lod/SphereEntity.qml @@ -56,9 +56,11 @@ import Qt3D.Extras 2.0 Entity { components: [ mesh, material, transform ] - SphereMesh { + GeometryRenderer { id: mesh - radius: 1 + SphereMesh { + radius: 1 + } } PhongMaterial { diff --git a/tests/manual/lod/main.qml b/tests/manual/lod/main.qml index 80547dcff..98cbc7aaa 100644 --- a/tests/manual/lod/main.qml +++ b/tests/manual/lod/main.qml @@ -104,14 +104,16 @@ Entity { Entity { components: [ - CylinderMesh { + GeometryRenderer { id: mesh - radius: 1 - length: 3 - rings: 2 - slices: sliceValues[lod.currentIndex] - - property var sliceValues: [20, 10, 6, 4] + view: CylinderMesh { + radius: 1 + length: 3 + rings: 2 + slices: sliceValues[lod.currentIndex] + + property var sliceValues: [20, 10, 6, 4] + } }, Transform { scale: 1.5 |