diff options
Diffstat (limited to 'tests/auto/render/levelofdetail/tst_levelofdetail.cpp')
| -rw-r--r-- | tests/auto/render/levelofdetail/tst_levelofdetail.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp index ab0e8c4b8..148c54e58 100644 --- a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp +++ b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <qbackendnodetester.h> #include <Qt3DRender/QLevelOfDetail> -#include <Qt3DRender/QBoundingSphere> +#include <Qt3DRender/QLevelOfDetailBoundingSphere> #include <Qt3DRender/private/levelofdetail_p.h> #include <Qt3DRender/private/qlevelofdetail_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> @@ -57,8 +57,8 @@ private Q_SLOTS: QCOMPARE(renderLod.currentIndex(), lod.currentIndex()); QCOMPARE(renderLod.thresholdType(), lod.thresholdType()); QCOMPARE(renderLod.thresholds(), lod.thresholds()); - QCOMPARE(renderLod.center(), lod.volumeOverride()->center()); - QCOMPARE(renderLod.radius(), lod.volumeOverride()->radius()); + QCOMPARE(renderLod.center(), lod.volumeOverride().center()); + QCOMPARE(renderLod.radius(), lod.volumeOverride().radius()); } void checkInitialAndCleanedUpState() @@ -70,7 +70,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderLod.camera(), Qt3DCore::QNodeId{}); QCOMPARE(renderLod.currentIndex(), 0); - QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::DistanceToCamera); + QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::DistanceToCameraThreshold); QVERIFY(renderLod.thresholds().empty()); QCOMPARE(renderLod.radius(), 1.f); QCOMPARE(renderLod.center(), QVector3D{}); @@ -78,7 +78,7 @@ private Q_SLOTS: // GIVEN Qt3DRender::QLevelOfDetail lod; - lod.setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize); + lod.setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold); // WHEN renderLod.setRenderer(&renderer); @@ -96,18 +96,18 @@ private Q_SLOTS: renderLod.setRenderer(&renderer); // THEN - QVERIFY(renderLod.thresholdType() != Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize); + QVERIFY(renderLod.thresholdType() != Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold); QVERIFY(renderLod.camera().isNull()); { // WHEN Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize)); + updateChange->setValue(static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold)); updateChange->setPropertyName("thresholdType"); renderLod.sceneChangeEvent(updateChange); // THEN - QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize); + QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold); QVERIFY(renderer.dirtyBits() != 0); } @@ -129,8 +129,9 @@ private Q_SLOTS: { // WHEN Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(QVector3D(1., 2., 3.)); - updateChange->setPropertyName("center"); + Qt3DRender::QLevelOfDetailBoundingSphere sphere(QVector3D(1.0f, 2.0f, 3.0f), 1.0f); + updateChange->setValue(QVariant::fromValue(sphere)); + updateChange->setPropertyName("volumeOverride"); renderLod.sceneChangeEvent(updateChange); // THEN |