Make sample meshes geometry renderers again

Introduce new geometry view class for each.

Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

17 files changed, 91 insertions, 156 deletions

diff --git a/examples/qt3d/3d-text/main.cpp b/examples/qt3d/3d-text/main.cpp
index e7da8af45..a9e1fc277 100644
--- a/examples/qt3d/3d-text/main.cpp
+++ b/examples/qt3d/3d-text/main.cpp
@@ -72,11 +72,8 @@ int main(int argc, char *argv[])
         planeTransform->setTranslation(QVector3D(0, 0, 0));
         planeMaterial->setDiffuse(QColor(150, 150, 150));
 
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(planeMesh);
-
         plane->addComponent(planeMaterial);
-        plane->addComponent(renderer);
+        plane->addComponent(planeMesh);
         plane->addComponent(planeTransform);
     }
 
diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml
index 1301a510a..89e5c3664 100644
--- a/examples/qt3d/anaglyph-rendering/main.qml
+++ b/examples/qt3d/anaglyph-rendering/main.qml
@@ -92,13 +92,11 @@ Entity {
 
     // Cylinder
     Entity {
-        property GeometryRenderer cylinder: GeometryRenderer {
-            view: CylinderMesh {
-                radius: 1
-                length: 3
-                rings: 100
-                slices: 20
-            }
+        property CylinderMesh cylinder: CylinderMesh {
+            radius: 1
+            length: 3
+            rings: 100
+            slices: 20
         }
         property Transform transform: Transform {
             id: cylinderTransform
@@ -198,13 +196,11 @@ Entity {
         readonly property real det: 1.0 / model
         delegate: Entity {
             components: [
-                GeometryRenderer {
-                    view: TorusMesh {
-                        radius: 35
-                        minorRadius: 5
-                        rings: 100
-                        slices: 20
-                    }
+                TorusMesh {
+                    radius: 35
+                    minorRadius: 5
+                    rings: 100
+                    slices: 20
                 },
                 Transform {
                     id: transform
diff --git a/examples/qt3d/audio-visualizer-qml/Visualizer.qml b/examples/qt3d/audio-visualizer-qml/Visualizer.qml
index e6ba6891b..42373f950 100644
--- a/examples/qt3d/audio-visualizer-qml/Visualizer.qml
+++ b/examples/qt3d/audio-visualizer-qml/Visualizer.qml
@@ -157,13 +157,11 @@ Entity {
 
     //![1]
     // Bars
-    GeometryRenderer {
+    CuboidMesh {
         id: barMesh
-        view: CuboidMesh {
-            xExtent: 0.1
-            yExtent: 0.1
-            zExtent: 0.1
-        }
+        xExtent: 0.1
+        yExtent: 0.1
+        zExtent: 0.1
     }
 
     NodeInstantiator {
@@ -191,12 +189,10 @@ Entity {
         Entity {
             id: titlePlane
 
-            GeometryRenderer {
+            PlaneMesh {
                 id: titlePlaneMesh
-                view: PlaneMesh {
-                    width: 550
-                    height: 100
-                }
+                width: 550
+                height: 100
             }
 
             Transform {
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index fa268afa6..4946f1a48 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -82,9 +82,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
         // Torus
         //! [3]
         m_torusEntity = new Qt3DCore::QEntity(m_rootEntity);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(m_torus);
-        m_torusEntity->addComponent(renderer);
+        m_torusEntity->addComponent(m_torus);
         m_torusEntity->addComponent(torusMaterial);
         m_torusEntity->addComponent(torusTransform);
         //! [3]
@@ -110,9 +108,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     // Cone
     {
         m_coneEntity = new Qt3DCore::QEntity(m_rootEntity);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(cone);
-        m_coneEntity->addComponent(renderer);
+        m_coneEntity->addComponent(cone);
         m_coneEntity->addComponent(coneMaterial);
         m_coneEntity->addComponent(coneTransform);
     }
@@ -136,9 +132,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     // Cylinder
     {
         m_cylinderEntity = new Qt3DCore::QEntity(m_rootEntity);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(cylinder);
-        m_cylinderEntity->addComponent(renderer);
+        m_cylinderEntity->addComponent(cylinder);
         m_cylinderEntity->addComponent(cylinderMaterial);
         m_cylinderEntity->addComponent(cylinderTransform);
     }
@@ -157,9 +151,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     //Cuboid
     {
         m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(cuboid);
-        m_cuboidEntity->addComponent(renderer);
+        m_cuboidEntity->addComponent(cuboid);
         m_cuboidEntity->addComponent(cuboidMaterial);
         m_cuboidEntity->addComponent(cuboidTransform);
     }
@@ -181,9 +173,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     // Plane
     {
         m_planeEntity = new Qt3DCore::QEntity(m_rootEntity);
-        auto renderer = new Qt3DRender::QGeometryRenderer;
-        renderer->setView(planeMesh);
-        m_planeEntity->addComponent(renderer);
+        m_planeEntity->addComponent(planeMesh);
         m_planeEntity->addComponent(planeMaterial);
         m_planeEntity->addComponent(planeTransform);
     }
@@ -203,12 +193,9 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     Qt3DExtras::QPhongMaterial *sphereMaterial = new Qt3DExtras::QPhongMaterial();
     sphereMaterial->setDiffuse(QColor(QRgb(0xa69929)));
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(sphereMesh);
-
     // Sphere
     m_sphereEntity = new Qt3DCore::QEntity(m_rootEntity);
-    m_sphereEntity->addComponent(renderer);
+    m_sphereEntity->addComponent(sphereMesh);
     m_sphereEntity->addComponent(sphereMaterial);
     m_sphereEntity->addComponent(sphereTransform);
 }
diff --git a/examples/qt3d/lights/PlaneEntity.qml b/examples/qt3d/lights/PlaneEntity.qml
index 1e84543f6..268c59add 100644
--- a/examples/qt3d/lights/PlaneEntity.qml
+++ b/examples/qt3d/lights/PlaneEntity.qml
@@ -61,17 +61,14 @@ Entity {
     property alias resolution: mesh.meshResolution
     property Material material
 
-    components: [ transform, renderer, root.material ]
+    components: [ transform, mesh, root.material ]
 
     Transform { id: transform }
 
-    GeometryRenderer {
-        id: renderer
-        view: PlaneMesh {
-            id: mesh
-            width: 1.0
-            height: 1.0
-            meshResolution: Qt.size(2, 2)
-        }
+    PlaneMesh {
+        id: mesh
+        width: 1.0
+        height: 1.0
+        meshResolution: Qt.size(2, 2)
     }
 }
diff --git a/examples/qt3d/lights/main.qml b/examples/qt3d/lights/main.qml
index c647788fe..fc7cca42c 100644
--- a/examples/qt3d/lights/main.qml
+++ b/examples/qt3d/lights/main.qml
@@ -95,10 +95,8 @@ Entity
     Entity {
         id: redLight
         components: [
-            GeometryRenderer {
-                view: SphereMesh {
-                    radius: 2
-                }
+            SphereMesh {
+                radius: 2
             },
             Transform {
                 translation: Qt.vector3d(2.0, 8.0, -2.0)
@@ -120,10 +118,8 @@ Entity
     Entity {
         id: greenLight
         components: [
-            GeometryRenderer {
-                view: SphereMesh {
-                    radius: 2
-                }
+            SphereMesh {
+                radius: 2
             },
             Transform {
                 translation: Qt.vector3d(0.0, 3.0, 4.0)
@@ -145,10 +141,8 @@ Entity
     Entity {
         id: spotLight
         components: [
-            GeometryRenderer {
-                view: SphereMesh {
-                    radius: 2
-                }
+            SphereMesh {
+                radius: 2
             },
             Transform {
                 translation: Qt.vector3d(-20.0, 40.0, 0.0)
diff --git a/examples/qt3d/phong-cubes/CubeEntity.qml b/examples/qt3d/phong-cubes/CubeEntity.qml
index 2c3939662..558f53327 100644
--- a/examples/qt3d/phong-cubes/CubeEntity.qml
+++ b/examples/qt3d/phong-cubes/CubeEntity.qml
@@ -60,13 +60,11 @@ Entity {
 
     components: [mesh, material, transform]
 
-    GeometryRenderer {
+    CuboidMesh {
         id: mesh
-        view: CuboidMesh {
-            xExtent: 0.5
-            yExtent: xExtent
-            zExtent: xExtent
-        }
+        xExtent: 0.5
+        yExtent: xExtent
+        zExtent: xExtent
     }
 
     Transform {
diff --git a/examples/qt3d/planets-qml/Planet.qml b/examples/qt3d/planets-qml/Planet.qml
index bbec74444..231cd7bac 100644
--- a/examples/qt3d/planets-qml/Planet.qml
+++ b/examples/qt3d/planets-qml/Planet.qml
@@ -51,7 +51,7 @@
 import Qt3D.Render 2.0
 import Qt3D.Extras 2.0
 
-GeometryRenderer {
+SphereMesh {
     property real r: 0
     property real x: 0
     property real y: 0
@@ -59,10 +59,8 @@ GeometryRenderer {
     property real roll: 0
     property real tilt: 0
 
-    view: SphereMesh {
-        radius: 1.0
-        generateTangents: true
-        rings: 64
-        slices: 64
-    }
+    radius: 1.0
+    generateTangents: true
+    rings: 64
+    slices: 64
 }
diff --git a/examples/qt3d/qardboard/main.qml b/examples/qt3d/qardboard/main.qml
index 906b43232..a3be91ac6 100644
--- a/examples/qt3d/qardboard/main.qml
+++ b/examples/qt3d/qardboard/main.qml
@@ -122,13 +122,11 @@ QardboardRootEntity {
 
     // Cylinder
     Entity {
-        property GeometryRenderer cylinder: GeometryRenderer {
-            view: CylinderMesh {
-                radius: 1
-                length: 3
-                rings: 100
-                slices: 20
-            }
+        property GeometryRenderer cylinder: CylinderMesh {
+            radius: 1
+            length: 3
+            rings: 100
+            slices: 20
         }
         property Transform transform: Transform {
             id: cylinderTransform
@@ -182,13 +180,11 @@ QardboardRootEntity {
         readonly property real det: 1.0 / model
         delegate: Entity {
             components: [
-                GeometryRenderer {
-                    view: TorusMesh {
-                        radius: 35
-                        minorRadius: 5
-                        rings: 100
-                        slices: 20
-                    }
+                TorusMesh {
+                    radius: 35
+                    minorRadius: 5
+                    rings: 100
+                    slices: 20
                 },
                 Transform {
                     id: transform
diff --git a/examples/qt3d/scene2d/main.qml b/examples/qt3d/scene2d/main.qml
index 5ce70ba63..37727b952 100644
--- a/examples/qt3d/scene2d/main.qml
+++ b/examples/qt3d/scene2d/main.qml
@@ -135,9 +135,8 @@ Entity {
             rotation: fromAxisAndAngle(Qt.vector3d(0,1,0), cube.rotationAngle)
         }
 
-        GeometryRenderer {
+        CuboidMesh {
             id: cubeMesh
-            view: CuboidMesh { }
         }
 
         ObjectPicker {
diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml
index 962317a6b..02e1148e2 100644
--- a/examples/qt3d/scene3d/AnimatedEntity.qml
+++ b/examples/qt3d/scene3d/AnimatedEntity.qml
@@ -93,14 +93,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -114,11 +112,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/examples/qt3d/scene3dview/AnimatedEntity.qml b/examples/qt3d/scene3dview/AnimatedEntity.qml
index 774928f74..db27f3584 100644
--- a/examples/qt3d/scene3dview/AnimatedEntity.qml
+++ b/examples/qt3d/scene3dview/AnimatedEntity.qml
@@ -90,14 +90,12 @@ Entity {
         diffuse: sceneColor
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
     Transform {
@@ -111,11 +109,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml
index 072e3663a..d78f5b07a 100644
--- a/examples/qt3d/shadow-map-qml/GroundPlane.qml
+++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml
@@ -56,13 +56,11 @@ Entity {
     id: root
     property Material material
 
-    GeometryRenderer {
+    PlaneMesh {
         id: groundMesh
-        view: PlaneMesh {
-            width: 50
-            height: width
-            meshResolution: Qt.size(2, 2)
-        }
+        width: 50
+        height: width
+        meshResolution: Qt.size(2, 2)
     }
 
     Transform {
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 80da0552a..4e689b4ac 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -91,9 +91,7 @@ Qt3DCore::QEntity *createScene()
     torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
     torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-    auto renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(torusMesh);
-    torusEntity->addComponent(renderer);
+    torusEntity->addComponent(torusMesh);
     torusEntity->addComponent(torusTransform);
     torusEntity->addComponent(material);
 
@@ -117,10 +115,7 @@ Qt3DCore::QEntity *createScene()
     sphereRotateTransformAnimation->setLoopCount(-1);
     sphereRotateTransformAnimation->start();
 
-    renderer = new Qt3DRender::QGeometryRenderer;
-    renderer->setView(sphereMesh);
-
-    sphereEntity->addComponent(renderer);
+    sphereEntity->addComponent(sphereMesh);
     sphereEntity->addComponent(sphereTransform);
     sphereEntity->addComponent(material);
 
diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml
index 60b9a0990..01910cffb 100644
--- a/examples/qt3d/simple-qml/main.qml
+++ b/examples/qt3d/simple-qml/main.qml
@@ -89,14 +89,12 @@ Entity {
         id: material
     }
 
-    GeometryRenderer {
+    TorusMesh {
         id: torusMesh
-        view: TorusMesh {
-            radius: 5
-            minorRadius: 1
-            rings: 100
-            slices: 20
-        }
+        radius: 5
+        minorRadius: 1
+        rings: 100
+        slices: 20
     }
 
 
@@ -111,11 +109,9 @@ Entity {
         components: [ torusMesh, material, torusTransform ]
     }
 
-    GeometryRenderer {
+    SphereMesh {
         id: sphereMesh
-        view: SphereMesh {
-            radius: 3
-        }
+        radius: 3
     }
 
     Transform {
diff --git a/examples/qt3d/simplecustommaterial/PlaneModel.qml b/examples/qt3d/simplecustommaterial/PlaneModel.qml
index bc95f8600..b5271fe0c 100644
--- a/examples/qt3d/simplecustommaterial/PlaneModel.qml
+++ b/examples/qt3d/simplecustommaterial/PlaneModel.qml
@@ -67,12 +67,10 @@ Entity {
         rotationX: 45
     }
 
-    GeometryRenderer {
+    PlaneMesh {
         id: mesh
-        view: PlaneMesh {
-            width: 1.0
-            height: 1.0
-            meshResolution: Qt.size(2, 2)
-        }
+        width: 1.0
+        height: 1.0
+        meshResolution: Qt.size(2, 2)
     }
 }
diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml
index 8614fee5b..2f297906d 100644
--- a/examples/qt3d/wave/Wave.qml
+++ b/examples/qt3d/wave/Wave.qml
@@ -81,12 +81,10 @@ Entity {
         diffuse: Qt.rgba( root.intensity, root.intensity, root.intensity, 1.0 ) // Set how bright the wave is
     }
 
-    GeometryRenderer {
+    PlaneMesh {
         id: mesh
-        view: PlaneMesh {
-            width: 25.0
-            height: 5.0
-            meshResolution: Qt.size( 125, 50 )
-        }
+        width: 25.0
+        height: 5.0
+        meshResolution: Qt.size( 125, 50 )
     }
 }