diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-01-22 21:35:32 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 06:29:57 +0000 |
commit | 17706144e9dc6c2dfde580b7821f18c5f6924682 (patch) | |
tree | 5f77929db358607fe63a1d438b7a746a6966cbfb /tests/auto/render/qgeometry | |
parent | 7f625e93620b313466d0223e911c0c3a5b492617 (diff) |
Geometry refactoring
Move QBuffer, QAttribute, QGeometry to Qt3DCore.
Change-Id: I59dfd091eefadcada93350b3aba955f40b304385
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/qgeometry')
-rw-r--r-- | tests/auto/render/qgeometry/tst_qgeometry.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 30092b204..59684567b 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -30,16 +30,16 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRender/qgeometry.h> -#include <Qt3DRender/private/qgeometry_p.h> -#include <Qt3DRender/qattribute.h> -#include <Qt3DRender/qbuffer.h> +#include <Qt3DCore/qgeometry.h> +#include <Qt3DCore/private/qgeometry_p.h> +#include <Qt3DCore/qattribute.h> +#include <Qt3DCore/qbuffer.h> #include <QSignalSpy> #include "testarbiter.h" -class FakeGeometry : public Qt3DRender::QGeometry +class FakeGeometry : public Qt3DCore::QGeometry { Q_OBJECT }; @@ -54,11 +54,11 @@ private Q_SLOTS: { // GIVEN TestArbiter arbiter; - QScopedPointer<Qt3DRender::QGeometry> geometry(new Qt3DRender::QGeometry()); + QScopedPointer<Qt3DCore::QGeometry> geometry(new Qt3DCore::QGeometry()); arbiter.setArbiterOnNode(geometry.data()); // WHEN - Qt3DRender::QAttribute attr; + Qt3DCore::QAttribute attr; geometry->addAttribute(&attr); QCoreApplication::processEvents(); @@ -87,10 +87,10 @@ private Q_SLOTS: void checkAttributeBookkeeping() { // GIVEN - QScopedPointer<Qt3DRender::QGeometry> geometry(new Qt3DRender::QGeometry); + QScopedPointer<Qt3DCore::QGeometry> geometry(new Qt3DCore::QGeometry); { // WHEN - Qt3DRender::QAttribute attribute; + Qt3DCore::QAttribute attribute; geometry->addAttribute(&attribute); // THEN @@ -102,8 +102,8 @@ private Q_SLOTS: { // WHEN - Qt3DRender::QGeometry someOtherGeometry; - QScopedPointer<Qt3DRender::QAttribute> attribute(new Qt3DRender::QAttribute(&someOtherGeometry)); + Qt3DCore::QGeometry someOtherGeometry; + QScopedPointer<Qt3DCore::QAttribute> attribute(new Qt3DCore::QAttribute(&someOtherGeometry)); geometry->addAttribute(attribute.data()); // THEN @@ -134,7 +134,7 @@ private Q_SLOTS: QCOMPARE(geometry->maxExtent(), QVector3D()); // WHEN - auto dNode = static_cast<Qt3DRender::QGeometryPrivate *>(Qt3DCore::QNodePrivate::get(geometry.data())); + auto dNode = static_cast<Qt3DCore::QGeometryPrivate *>(Qt3DCore::QNodePrivate::get(geometry.data())); const QVector3D minExt(-1.0f, -1.0f, -1.0f); const QVector3D maxExt(1.0f, 1.0f, 1.0f); dNode->setExtent(minExt, maxExt); |