diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-07-29 11:27:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-29 12:24:58 +0000 |
| commit | b058ea83a749181c629d46355e1ca84b268d494a (patch) | |
| tree | d573ebe91e48f093e03cd8f38b3994b0d7562a95 /tests/auto/render | |
| parent | 3a3ee8a1c52b96d106fdc7a5fa8128eeeb2f8e58 (diff) | |
Fix BV tests following changes in BV propagation
Change-Id: Ifa53378c930b071231dab3d293e8bb1ed4c71b46
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit dc695bf1485fb1620fb258d57d87916b94d7c95a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/render')
3 files changed, 27 insertions, 18 deletions
diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp index 93612fe05..db1fe3e99 100644 --- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp +++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp @@ -181,14 +181,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test) Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr); calcCBVolume.setRoot(test->root()); + + Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create(); + calcRBVolume->setManagers(test->nodeManagers()); + calcRBVolume->setFrontEndNodeManager(test); + calcRBVolume->setRoot(test->sceneRoot()); + + calcCBVolume.addWatcher(calcRBVolume); + calcCBVolume.run(); calcCBVolume.postFrame(nullptr); - - Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume; - calcRBVolume.setManagers(test->nodeManagers()); - calcRBVolume.setFrontEndNodeManager(test); - calcRBVolume.setRoot(test->sceneRoot()); - calcRBVolume.run(); + calcRBVolume->run(); Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume; updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager()); diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 0f942510c..98bf268bb 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -211,14 +211,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test) Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr); calcCBVolume.setRoot(test->root()); + + Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create(); + calcRBVolume->setManagers(test->nodeManagers()); + calcRBVolume->setFrontEndNodeManager(test); + calcRBVolume->setRoot(test->sceneRoot()); + + calcCBVolume.addWatcher(calcRBVolume); + calcCBVolume.run(); calcCBVolume.postFrame(nullptr); - - Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume; - calcRBVolume.setManagers(test->nodeManagers()); - calcRBVolume.setFrontEndNodeManager(test); - calcRBVolume.setRoot(test->sceneRoot()); - calcRBVolume.run(); + calcRBVolume->run(); Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume; updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager()); diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index 37c2d20d7..71b6427a1 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -209,14 +209,17 @@ void runRequiredJobs(Qt3DRender::TestAspect *test) Qt3DCore::CalculateBoundingVolumeJob calcCBVolume(nullptr); calcCBVolume.setRoot(test->root()); + + Qt3DRender::Render::CalculateBoundingVolumeJobPtr calcRBVolume = Qt3DRender::Render::CalculateBoundingVolumeJobPtr::create(); + calcRBVolume->setManagers(test->nodeManagers()); + calcRBVolume->setFrontEndNodeManager(test); + calcRBVolume->setRoot(test->sceneRoot()); + + calcCBVolume.addWatcher(calcRBVolume); + calcCBVolume.run(); calcCBVolume.postFrame(nullptr); - - Qt3DRender::Render::CalculateBoundingVolumeJob calcRBVolume; - calcRBVolume.setManagers(test->nodeManagers()); - calcRBVolume.setFrontEndNodeManager(test); - calcRBVolume.setRoot(test->sceneRoot()); - calcRBVolume.run(); + calcRBVolume->run(); Qt3DRender::Render::UpdateWorldBoundingVolumeJob updateWorldBVolume; updateWorldBVolume.setManager(test->nodeManagers()->renderNodesManager()); |