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>

1 files changed, 11 insertions, 8 deletions

diff --git a/tests/manual/bigscene-instanced-qml/main.qml b/tests/manual/bigscene-instanced-qml/main.qml
index ea804963a..65273b1ab 100644
--- a/tests/manual/bigscene-instanced-qml/main.qml
+++ b/tests/manual/bigscene-instanced-qml/main.qml
@@ -112,17 +112,20 @@ Entity {
         parameters: Parameter { name: "instanceCount"; value: cylinderMeshInstanced.instanceCount }
     }
 
-    CylinderMesh {
-        id: cylinderMeshInstanced
-        instanceCount: 2000
-        rings: 50
-        slices: 30
-        radius: 2.5
-        length: 5.0
+    GeometryRenderer {
+        id: cylinderMeshRenderer
+        view: CylinderMesh {
+            id: cylinderMeshInstanced
+            instanceCount: 2000
+            rings: 50
+            slices: 30
+            radius: 2.5
+            length: 5.0
+        }
     }
 
     Entity {
         id: torusEntity
-        components: [ cylinderMeshInstanced, instancedPhongMaterial ]
+        components: [ cylinderMeshRenderer, instancedPhongMaterial ]
     }
 }