summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp')
-rw-r--r--tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 291a767d4..186b2e9a8 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -49,29 +49,29 @@
class TestArbiter;
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
{
public:
TestPostman(TestArbiter *arbiter)
: m_arbiter(arbiter)
{}
- void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+ void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
{}
- void setScene(Qt3D::QScene *) Q_DECL_FINAL
+ void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
{}
- void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+ void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
private:
TestArbiter *m_arbiter;
};
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
{
public:
- TestArbiter(Qt3D::QNode *node)
+ TestArbiter(Qt3DCore::QNode *node)
: m_postman(new TestPostman(this))
, m_node(node)
{
@@ -80,44 +80,44 @@ public:
~TestArbiter()
{
- Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+ Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
}
- void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+ void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
{
events.push_back(e);
}
- void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+ void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
{
events.push_back(e);
}
- void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+ void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
{
- events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+ events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
}
- Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+ Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
{
return m_postman;
}
- QVector<Qt3D::QSceneChangePtr> events;
+ QVector<Qt3DCore::QSceneChangePtr> events;
private:
TestPostman *m_postman;
- Qt3D::QNode *m_node;
+ Qt3DCore::QNode *m_node;
- void assignArbiter(Qt3D::QNode *node)
+ void assignArbiter(Qt3DCore::QNode *node)
{
- Qt3D::QNodePrivate::get(node)->setArbiter(this);
- Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+ Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+ Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
assignArbiter(n);
}
};
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
{
m_arbiter->sceneChangeEventWithLock(e);
}
@@ -150,7 +150,7 @@ private:
// We need to call QNode::clone which is protected
// So we sublcass QNode instead of QObject
-class tst_QGeometryRenderer: public Qt3D::QNode
+class tst_QGeometryRenderer: public Qt3DCore::QNode
{
Q_OBJECT
public:
@@ -237,10 +237,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "instanceCount");
QCOMPARE(change->value().value<int>(), 256);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -250,10 +250,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "primitiveCount");
QCOMPARE(change->value().value<int>(), 1340);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -263,10 +263,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "baseVertex");
QCOMPARE(change->value().value<int>(), 883);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -276,10 +276,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "baseInstance");
QCOMPARE(change->value().value<int>(), 1200);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -289,10 +289,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "restartIndex");
QCOMPARE(change->value().value<int>(), 65535);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -302,10 +302,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "primitiveRestart");
QCOMPARE(change->value().value<bool>(), true);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -315,10 +315,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "primitiveType");
QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QGeometryRenderer::Patches));
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -329,10 +329,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "geometryFunctor");
QCOMPARE(change->value().value<Qt3DRender::QGeometryFunctorPtr>(), functor);
- QCOMPARE(change->type(), Qt3D::NodeUpdated);
+ QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
@@ -343,10 +343,10 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 1);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "geometry");
- QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom.id());
- QCOMPARE(change->type(), Qt3D::NodeAdded);
+ QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id());
+ QCOMPARE(change->type(), Qt3DCore::NodeAdded);
arbiter.events.clear();
@@ -357,21 +357,21 @@ private Q_SLOTS:
// THEN
QCOMPARE(arbiter.events.size(), 2);
- change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "geometry");
- QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom.id());
- QCOMPARE(change->type(), Qt3D::NodeRemoved);
+ QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id());
+ QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
- change = arbiter.events.last().staticCast<Qt3D::QScenePropertyChange>();
+ change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
QCOMPARE(change->propertyName(), "geometry");
- QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom2.id());
- QCOMPARE(change->type(), Qt3D::NodeAdded);
+ QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom2.id());
+ QCOMPARE(change->type(), Qt3DCore::NodeAdded);
arbiter.events.clear();
}
protected:
- Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+ Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
{
return Q_NULLPTR;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 08:44:31 +0000