From 5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Tue, 11 Feb 2020 14:14:30 +0000
Subject: 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>
---
 examples/qt3d/simple-qml/main.qml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'examples/qt3d/simple-qml')

diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml
index 9f4149202..60b9a0990 100644
--- a/examples/qt3d/simple-qml/main.qml
+++ b/examples/qt3d/simple-qml/main.qml
@@ -89,14 +89,17 @@ Entity {
         id: material
     }
 
-    TorusMesh {
+    GeometryRenderer {
         id: torusMesh
-        radius: 5
-        minorRadius: 1
-        rings: 100
-        slices: 20
+        view: TorusMesh {
+            radius: 5
+            minorRadius: 1
+            rings: 100
+            slices: 20
+        }
     }
 
+
     Transform {
         id: torusTransform
         scale3D: Qt.vector3d(1.5, 1, 0.5)
@@ -108,9 +111,11 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    SphereMesh {
+    GeometryRenderer {
         id: sphereMesh
-        radius: 3
+        view: SphereMesh {
+            radius: 3
+        }
     }
 
     Transform {
-- 
cgit v1.2.3