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-cpp/main.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 32f19c194..6b45dd1d0 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -59,9 +59,9 @@
 #include <Qt3DInput/QInputAspect>
 
 #include <Qt3DRender/QRenderAspect>
+#include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DExtras/QForwardRenderer>
 #include <Qt3DExtras/QPhongMaterial>
-#include <Qt3DExtras/QCylinderMesh>
 #include <Qt3DExtras/QSphereMesh>
 #include <Qt3DExtras/QTorusMesh>
 
@@ -91,7 +91,9 @@ Qt3DCore::QEntity *createScene()
     torusTransform->setScale3D(QVector3D(1.5, 1, 0.5));
     torusTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f));
 
-    torusEntity->addComponent(torusMesh);
+    auto renderer = new Qt3DRender::QGeometryRenderer;
+    renderer->setView(torusMesh);
+    torusEntity->addComponent(renderer);
     torusEntity->addComponent(torusTransform);
     torusEntity->addComponent(material);
 
@@ -114,7 +116,10 @@ Qt3DCore::QEntity *createScene()
     sphereRotateTransformAnimation->setLoopCount(-1);
     sphereRotateTransformAnimation->start();
 
-    sphereEntity->addComponent(sphereMesh);
+    renderer = new Qt3DRender::QGeometryRenderer;
+    renderer->setView(sphereMesh);
+
+    sphereEntity->addComponent(renderer);
     sphereEntity->addComponent(sphereTransform);
     sphereEntity->addComponent(material);
 
-- 
cgit v1.2.3