summaryrefslogtreecommitdiffstats
path: root/tests/manual/dragging
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-02-11 14:14:30 +0000
committerMike Krus <mike.krus@kdab.com>2020-02-27 12:10:08 +0000
commit5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 (patch)
tree9a502509da33a48dade8f7cbd0af1e7d3444b2f3 /tests/manual/dragging
parent703090204ef41bced5634bbb332551dea1dd7b37 (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/dragging')
-rw-r--r--tests/manual/dragging/main.qml20
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/manual/dragging/main.qml b/tests/manual/dragging/main.qml
index 844b5066d..c02fa594b 100644
--- a/tests/manual/dragging/main.qml
+++ b/tests/manual/dragging/main.qml
@@ -96,9 +96,11 @@ Entity {
id: mainEntity
objectName: "mainEntity"
- ConeMesh {
+ GeometryRenderer {
id: coneMesh
- length: 4
+ view: ConeMesh {
+ length: 4
+ }
}
PhongMaterial {
@@ -122,12 +124,14 @@ Entity {
objectName: "draggerEntity"
property vector3d position: Qt.vector3d(0, 0, 0)
- CylinderMesh {
+ GeometryRenderer {
id: mesh
- radius: .5
- length: 3
- rings: 2
- slices: 20
+ view: CylinderMesh {
+ radius: .5
+ length: 3
+ rings: 2
+ slices: 20
+ }
}
Transform {
@@ -166,7 +170,7 @@ Entity {
id: obstructionEntity
components: [
- CuboidMesh { },
+ GeometryRenderer { view: CuboidMesh { } },
PhongMaterial { diffuse: "blue" },
Transform {
scale: 2