summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-08-06 14:36:42 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-08-07 19:42:30 +0000
commitac359858c6dc71cd1f09fb4fb6ff11c945190cb5 (patch)
treeec3cb7144b4289ec3601d208c8c4e06e96b39cda /tests
parentff868c5430891d166dc2098641f9d1e48246fced (diff)
RenderMesh removed, replaced by RenderGeometryRenderer
Change-Id: If049768730a0f3aad3ea2b4f5cda2808f4035726 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/renderentity/tst_renderentity.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/render/renderentity/tst_renderentity.cpp b/tests/auto/render/renderentity/tst_renderentity.cpp
index 0a5460b03..f6ba098d6 100644
--- a/tests/auto/render/renderentity/tst_renderentity.cpp
+++ b/tests/auto/render/renderentity/tst_renderentity.cpp
@@ -45,6 +45,7 @@
#include <Qt3DRenderer/QMaterial>
#include <Qt3DRenderer/QLayer>
#include <Qt3DRenderer/QShaderData>
+#include <Qt3DRenderer/QGeometryRenderer>
typedef Qt3D::QNodeId (*UuidMethod)(Qt3D::Render::RenderEntity *);
typedef QList<Qt3D::QNodeId> (*UuidListMethod)(Qt3D::Render::RenderEntity *);
@@ -56,9 +57,9 @@ void noopDeleter(QNode *) {}
QNodeId transformUuid(RenderEntity *entity) { return entity->componentUuid<RenderTransform>(); }
-QNodeId meshUuid(RenderEntity *entity) { return entity->componentUuid<RenderMesh>(); }
QNodeId cameraLensUuid(RenderEntity *entity) { return entity->componentUuid<RenderCameraLens>(); }
QNodeId materialUuid(RenderEntity *entity) { return entity->componentUuid<RenderMaterial>(); }
+QNodeId geometryRendererUuid(RenderEntity *entity) { return entity->componentUuid<RenderGeometryRenderer>(); }
QList<QNodeId> layersUuid(RenderEntity *entity) { return entity->componentsUuid<RenderLayer>(); }
QList<QNodeId> shadersUuid(RenderEntity *entity) { return entity->componentsUuid<RenderShaderData>(); }
@@ -79,8 +80,8 @@ private slots:
QComponent *component = new Qt3D::QTransform;
QTest::newRow("transform") << component << reinterpret_cast<void*>(transformUuid);
- component = new QMesh;
- QTest::newRow("mesh") << component << reinterpret_cast<void*>(meshUuid);
+ component = new QGeometryRenderer;
+ QTest::newRow("mesh") << component << reinterpret_cast<void*>(geometryRendererUuid);
component = new QCameraLens;
QTest::newRow("camera lens") << component << reinterpret_cast<void*>(cameraLensUuid);