From 5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 Mon Sep 17 00:00:00 2001 From: Mike Krus 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 --- tests/manual/mesh-morphing/main.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tests/manual/mesh-morphing') diff --git a/tests/manual/mesh-morphing/main.cpp b/tests/manual/mesh-morphing/main.cpp index a2c9dfc17..5534943da 100644 --- a/tests/manual/mesh-morphing/main.cpp +++ b/tests/manual/mesh-morphing/main.cpp @@ -124,8 +124,11 @@ int main(int argc, char **argv) times.push_back(8.0f); times.push_back(12.0f); + auto renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(mesh); + animation->setTargetPositions(times); - animation->setTarget(mesh); + animation->setTarget(renderer); animation->setMorphTargets(morphTargets); // Material @@ -137,7 +140,7 @@ int main(int argc, char **argv) // Cylinder Qt3DCore::QEntity *morphingEntity = new Qt3DCore::QEntity(rootEntity); - morphingEntity->addComponent(mesh); + morphingEntity->addComponent(renderer); morphingEntity->addComponent(transform); morphingEntity->addComponent(material); @@ -158,8 +161,11 @@ int main(int argc, char **argv) cylinderMaterial->setDiffuse(Qt::red); // Cylinder + renderer = new Qt3DRender::QGeometryRenderer; + renderer->setView(cylinderMesh); + Qt3DCore::QEntity *cylinder = new Qt3DCore::QEntity(rootEntity); - cylinder->addComponent(cylinderMesh); + cylinder->addComponent(renderer); cylinder->addComponent(cylinderTransform); cylinder->addComponent(cylinderMaterial); -- cgit v1.2.3