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>
---
 tests/manual/bigscene-cpp/main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests/manual/bigscene-cpp/main.cpp')

diff --git a/tests/manual/bigscene-cpp/main.cpp b/tests/manual/bigscene-cpp/main.cpp
index ef296e04d..5e61758db 100644
--- a/tests/manual/bigscene-cpp/main.cpp
+++ b/tests/manual/bigscene-cpp/main.cpp
@@ -63,6 +63,7 @@
 #include <Qt3DRender/QParameter>
 #include <Qt3DExtras/QCylinderMesh>
 #include <Qt3DRender/QRenderAspect>
+#include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DRender/QCameraSelector>
 #include <Qt3DExtras/QPhongMaterial>
 #include <Qt3DExtras/QForwardRenderer>
@@ -88,6 +89,9 @@ int main(int ac, char **av)
     mesh->setRadius(2.5f);
     mesh->setLength(5.0f);
 
+    auto renderer = new Qt3DRender::QGeometryRenderer;
+    renderer->setView(mesh);
+
     // Material
     auto phongMaterial = new Qt3DExtras::QPhongMaterial(root);
     auto effect = phongMaterial->effect();
@@ -110,7 +114,7 @@ int main(int ac, char **av)
     // Scene
     for (int i = 0; i < max; i++) {
         Entity *e = new Entity(effect, root);
-        e->addComponent(mesh);
+        e->addComponent(renderer);
         const double angle = M_PI * 2.0 * double(i) * det * 10.;
 
         e->setDiffuseColor(QColor(int(qFabs(qCos(angle)) * 255.0), 204, 75));
-- 
cgit v1.2.3