diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-04-03 13:48:31 +0200 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-04-04 12:29:24 +0000 |
commit | 276be935bfeccde733bacd4267abeb978f6efda5 (patch) | |
tree | a189970d6450795804f4cff480eaf835aaa1b4be | |
parent | 7b096b1de9691ddef8445102cc9f71b90aa31cee (diff) |
Remove unused codev5.13.0-beta3v5.13.0-beta2
Change-Id: I292b8b373e0f34dfc51f2a77f082fda920893e64
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: James Turner <james.turner@kdab.com>
-rw-r--r-- | src/render/jobs/pickboundingvolumeutils.cpp | 28 | ||||
-rw-r--r-- | src/render/jobs/pickboundingvolumeutils_p.h | 13 | ||||
-rw-r--r-- | tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp | 30 |
3 files changed, 0 insertions, 71 deletions
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp index 23e495ecb..598fd9d8c 100644 --- a/src/render/jobs/pickboundingvolumeutils.cpp +++ b/src/render/jobs/pickboundingvolumeutils.cpp @@ -135,34 +135,6 @@ bool ViewportCameraAreaGatherer::isUnique(const QVector<ViewportCameraAreaDetail return true; } -QVector<Entity *> gatherEntities(Entity *entity, QVector<Entity *> entities) -{ - if (entity != nullptr && entity->isEnabled()) { - entities.push_back(entity); - // Traverse children - const auto children = entity->children(); - for (Entity *child : children) - entities = gatherEntities(child, std::move(entities)); - } - return entities; -} - -EntityGatherer::EntityGatherer(Entity *root) - : m_root(root) - , m_needsRefresh(true) -{ -} - -QVector<Entity *> EntityGatherer::entities() const -{ - if (m_needsRefresh) { - m_entities.clear(); - m_entities = gatherEntities(m_root, std::move(m_entities)); - m_needsRefresh = false; - } - return m_entities; -} - class TriangleCollisionVisitor : public TrianglesVisitor { public: diff --git a/src/render/jobs/pickboundingvolumeutils_p.h b/src/render/jobs/pickboundingvolumeutils_p.h index 3fc4517c3..923a49317 100644 --- a/src/render/jobs/pickboundingvolumeutils_p.h +++ b/src/render/jobs/pickboundingvolumeutils_p.h @@ -100,19 +100,6 @@ private: bool isUnique(const QVector<ViewportCameraAreaDetails> &vcaList, const ViewportCameraAreaDetails &vca) const; }; -class Q_AUTOTEST_EXPORT EntityGatherer -{ -public: - explicit EntityGatherer(Entity *root); - - QVector<Entity *> entities() const; - -private: - Entity *m_root; - mutable QVector<Entity *> m_entities; - mutable bool m_needsRefresh; -}; - typedef QVector<RayCasting::QCollisionQueryResult::Hit> HitList; class Q_AUTOTEST_EXPORT HierarchicalEntityPicker diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 5e51c8aa7..e14c5e3e6 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -244,36 +244,6 @@ private Q_SLOTS: QCOMPARE(vca.viewport, QRectF(0.0f, 0.0f, 1.0f, 1.0f)); } - void entityGatherer() - { - // GIVEN - QmlSceneReader sceneReader(QUrl("qrc:/testscene_dragenabled.qml")); - QScopedPointer<Qt3DCore::QNode> root(qobject_cast<Qt3DCore::QNode *>(sceneReader.root())); - QVERIFY(root); - QScopedPointer<Qt3DRender::TestAspect> test(new Qt3DRender::TestAspect(root.data())); - - // THEN - QList<Qt3DCore::QEntity *> frontendEntities; - frontendEntities << qobject_cast<Qt3DCore::QEntity *>(root.data()) << root->findChildren<Qt3DCore::QEntity *>(); - QCOMPARE(frontendEntities.size(), 4); - - // WHEN - Qt3DRender::Render::PickingUtils::EntityGatherer gatherer(test->nodeManagers()->lookupResource<Qt3DRender::Render::Entity, Qt3DRender::Render::EntityManager>(root->id())); - QVector<Qt3DRender::Render::Entity *> entities = gatherer.entities(); - - // THEN - QCOMPARE(frontendEntities.size(), entities.size()); - - std::sort(frontendEntities.begin(), frontendEntities.end(), - [] (Qt3DCore::QEntity *a, Qt3DCore::QEntity *b) { return a->id() > b->id(); }); - - std::sort(entities.begin(), entities.end(), - [] (Qt3DRender::Render::Entity *a, Qt3DRender::Render::Entity *b) { return a->peerId() > b->peerId(); }); - - for (int i = 0, e = frontendEntities.size(); i < e; ++i) - QCOMPARE(frontendEntities.at(i)->id(), entities.at(i)->peerId()); - } - void checkCurrentPickerChange_data() { generateAllPickingSettingsCombinations(); |