diff options
Diffstat (limited to 'src/render/framegraph')
55 files changed, 178 insertions, 178 deletions
diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 527147842..96377e9e7 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -55,7 +55,7 @@ CameraSelector::CameraSelector() { } -void CameraSelector::updateFromPeer(Qt3D::QNode *peer) +void CameraSelector::updateFromPeer(Qt3DCore::QNode *peer) { QCameraSelector *selector = static_cast<QCameraSelector *>(peer); m_cameraUuid = QNodeId(); @@ -64,7 +64,7 @@ void CameraSelector::updateFromPeer(Qt3D::QNode *peer) setEnabled(selector->isEnabled()); } -void CameraSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void CameraSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h index 283c81be1..e7075334a 100644 --- a/src/render/framegraph/cameraselectornode_p.h +++ b/src/render/framegraph/cameraselectornode_p.h @@ -67,13 +67,13 @@ class CameraSelector : public FrameGraphNode public: CameraSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - Qt3D::QNodeId cameraUuid() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId cameraUuid() const; private: - Qt3D::QNodeId m_cameraUuid; + Qt3DCore::QNodeId m_cameraUuid; }; } // namespace Render diff --git a/src/render/framegraph/clearbuffer.cpp b/src/render/framegraph/clearbuffer.cpp index 47982d5f0..c04da0fd0 100644 --- a/src/render/framegraph/clearbuffer.cpp +++ b/src/render/framegraph/clearbuffer.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,14 +50,14 @@ ClearBuffer::ClearBuffer() { } -void ClearBuffer::updateFromPeer(Qt3D::QNode *peer) +void ClearBuffer::updateFromPeer(Qt3DCore::QNode *peer) { QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer); m_type = clearBuffer->buffers(); setEnabled(clearBuffer->isEnabled()); } -void ClearBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ClearBuffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h index c7a33e0ac..67c4542a2 100644 --- a/src/render/framegraph/clearbuffer_p.h +++ b/src/render/framegraph/clearbuffer_p.h @@ -64,8 +64,8 @@ class ClearBuffer : public FrameGraphNode public: ClearBuffer(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QClearBuffer::BufferType type() const; private: diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp index b001fd675..30859e34b 100644 --- a/src/render/framegraph/framegraphnode.cpp +++ b/src/render/framegraph/framegraphnode.cpp @@ -139,7 +139,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(Renderer *renderer) { } -Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *) const +Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *) const { // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method // to do that @@ -149,13 +149,13 @@ Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, co return Q_NULLPTR; } -Qt3D::QBackendNode *FrameGraphComponentFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(const Qt3DCore::QNodeId &id) const { Q_UNUSED(id); return Q_NULLPTR; } -void FrameGraphComponentFunctor::destroy(const Qt3D::QNodeId &id) const +void FrameGraphComponentFunctor::destroy(const Qt3DCore::QNodeId &id) const { Q_UNUSED(id); } diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index 35875bcab..b58cfdbff 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { -class FrameGraphNode : public Qt3D::QBackendNode +class FrameGraphNode : public Qt3DCore::QBackendNode { public: FrameGraphNode(); @@ -116,7 +116,7 @@ private: }; template<typename Backend, typename Frontend> -class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphNodeFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphNodeFunctor(FrameGraphManager *manager) @@ -124,12 +124,12 @@ public: { } - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE { return createBackendFrameGraphNode(frontend, factory); } - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { FrameGraphNode **node = m_manager->lookupResource(id); if (node != Q_NULLPTR) @@ -137,13 +137,13 @@ public: return Q_NULLPTR; } - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { m_manager->releaseResource(id); } protected: - Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const + Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const { Frontend *f = qobject_cast<Frontend *>(n); if (f != Q_NULLPTR) { @@ -170,13 +170,13 @@ private: FrameGraphManager *m_manager; }; -class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphComponentFunctor(Renderer *renderer); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; private: Renderer *m_renderer; diff --git a/src/render/framegraph/framegraphsubtreeselector.cpp b/src/render/framegraph/framegraphsubtreeselector.cpp index 5fa060d37..4ff874118 100644 --- a/src/render/framegraph/framegraphsubtreeselector.cpp +++ b/src/render/framegraph/framegraphsubtreeselector.cpp @@ -53,13 +53,13 @@ FrameGraphSubtreeSelector::~FrameGraphSubtreeSelector() { } -void FrameGraphSubtreeSelector::updateFromPeer(Qt3D::QNode *peer) +void FrameGraphSubtreeSelector::updateFromPeer(Qt3DCore::QNode *peer) { QFrameGraphSelector *selector = static_cast<QFrameGraphSelector *>(peer); setEnabled(selector->isEnabled()); } -void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &) +void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) { } diff --git a/src/render/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h index f6b8aeb32..72e4ac4a4 100644 --- a/src/render/framegraph/framegraphsubtreeselector_p.h +++ b/src/render/framegraph/framegraphsubtreeselector_p.h @@ -63,8 +63,8 @@ public: FrameGraphSubtreeSelector(); ~FrameGraphSubtreeSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_FINAL; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_FINAL; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL; }; } // namespace Render diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp index e9b825815..29de86e98 100644 --- a/src/render/framegraph/framegraphvisitor.cpp +++ b/src/render/framegraph/framegraphvisitor.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,7 +56,7 @@ FrameGraphVisitor::FrameGraphVisitor() void FrameGraphVisitor::traverse(FrameGraphNode *root, Renderer *renderer, - QVector<Qt3D::QAspectJobPtr> *jobs) + QVector<Qt3DCore::QAspectJobPtr> *jobs) { m_renderer = renderer; m_jobs = jobs; diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h index 3e3273b0f..66d3292b9 100644 --- a/src/render/framegraph/framegraphvisitor_p.h +++ b/src/render/framegraph/framegraphvisitor_p.h @@ -69,13 +69,13 @@ public: void traverse(FrameGraphNode *root, Renderer *renderer, - QVector<Qt3D::QAspectJobPtr> *jobs); + QVector<Qt3DCore::QAspectJobPtr> *jobs); private: void visit(Render::FrameGraphNode *node); Renderer *m_renderer; - QVector<Qt3D::QAspectJobPtr> *m_jobs; + QVector<Qt3DCore::QAspectJobPtr> *m_jobs; int m_renderviewIndex; }; diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index 4c9ee50ad..247d795b2 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,14 +50,14 @@ LayerFilterNode::LayerFilterNode() { } -void LayerFilterNode::updateFromPeer(Qt3D::QNode *peer) +void LayerFilterNode::updateFromPeer(Qt3DCore::QNode *peer) { QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer); m_layers = layerFilter->layers(); setEnabled(layerFilter->isEnabled()); } -void LayerFilterNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h index 1e6649b1d..7d5ba58b0 100644 --- a/src/render/framegraph/layerfilternode_p.h +++ b/src/render/framegraph/layerfilternode_p.h @@ -66,8 +66,8 @@ class LayerFilterNode : public FrameGraphNode public: LayerFilterNode(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QStringList layers() const; void setLayers(const QStringList &list); diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 0822779f8..55b0359c1 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -54,13 +54,13 @@ NoDraw::~NoDraw() { } -void NoDraw::updateFromPeer(Qt3D::QNode *peer) +void NoDraw::updateFromPeer(Qt3DCore::QNode *peer) { QNoDraw *noDraw = static_cast<QNoDraw *>(peer); setEnabled(noDraw->isEnabled()); } -void NoDraw::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void NoDraw::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h index 510327ff9..2289f79bd 100644 --- a/src/render/framegraph/nodraw_p.h +++ b/src/render/framegraph/nodraw_p.h @@ -62,10 +62,10 @@ public: NoDraw(); ~NoDraw(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; }; } // namespace Render diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index d77c493e9..37df26beb 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::CameraSelector + \class Qt3DCore::CameraSelector */ /*! \internal */ @@ -69,10 +69,10 @@ void QCameraSelector::copy(const QNode *ref) const QCameraSelector *other = static_cast<const QCameraSelector*>(ref); if (other->d_func()->m_camera) - setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera))); + setCamera(qobject_cast<Qt3DCore::QEntity *>(QNode::clone(other->d_func()->m_camera))); } -QCameraSelector::QCameraSelector(Qt3D::QNode *parent) +QCameraSelector::QCameraSelector(Qt3DCore::QNode *parent) : QFrameGraphNode(*new QCameraSelectorPrivate, parent) {} @@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector() QNode::cleanup(); } -void QCameraSelector::setCamera(Qt3D::QEntity *camera) +void QCameraSelector::setCamera(Qt3DCore::QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -97,7 +97,7 @@ void QCameraSelector::setCamera(Qt3D::QEntity *camera) } } -Qt3D::QEntity *QCameraSelector::camera() const +Qt3DCore::QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index 546d77a61..4088f6e8b 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -49,21 +49,21 @@ class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(Qt3D::QNode *parent = 0); + explicit QCameraSelector(Qt3DCore::QNode *parent = 0); ~QCameraSelector(); - void setCamera(Qt3D::QEntity *camera); - Qt3D::QEntity *camera() const; + void setCamera(Qt3DCore::QEntity *camera); + Qt3DCore::QEntity *camera() const; Q_SIGNALS: void cameraChanged(); protected: - QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QCameraSelector) diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h index d387b9d86..aec10ae94 100644 --- a/src/render/framegraph/qcameraselector_p.h +++ b/src/render/framegraph/qcameraselector_p.h @@ -63,7 +63,7 @@ public: QCameraSelectorPrivate(); Q_DECLARE_PUBLIC(QCameraSelector) - Qt3D::QEntity *m_camera; + Qt3DCore::QEntity *m_camera; }; diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h index 9b42cb46c..62b645a06 100644 --- a/src/render/framegraph/qclearbuffer.h +++ b/src/render/framegraph/qclearbuffer.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) public: - explicit QClearBuffer(Qt3D::QNode *parent = 0); + explicit QClearBuffer(Qt3DCore::QNode *parent = 0); ~QClearBuffer(); enum BufferType { @@ -72,8 +72,8 @@ Q_SIGNALS: void buffersChanged(); protected: - QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QClearBuffer) diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h index 2a32a95f6..0b720ea72 100644 --- a/src/render/framegraph/qframegraph.h +++ b/src/render/framegraph/qframegraph.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property @@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(Qt3D::QNode *parent = 0); + explicit QFrameGraph(Qt3DCore::QNode *parent = 0); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -66,8 +66,8 @@ Q_SIGNALS: void activeFrameGraphChanged(); protected: - QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrameGraph) diff --git a/src/render/framegraph/qframegraph_p.h b/src/render/framegraph/qframegraph_p.h index ea502c11f..d340c04f7 100644 --- a/src/render/framegraph/qframegraph_p.h +++ b/src/render/framegraph/qframegraph_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QFrameGraph; class QFrameGraphNode; -class QFrameGraphPrivate : public Qt3D::QComponentPrivate +class QFrameGraphPrivate : public Qt3DCore::QComponentPrivate { public: QFrameGraphPrivate(); diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index 1c28d72a0..519843fa7 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent) QFrameGraphNode::~QFrameGraphNode() { - Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); } /*! diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index ce14b9bed..826edd36f 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -47,12 +47,12 @@ namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QFrameGraphNode(Qt3D::QNode *parent = 0); + explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; @@ -61,7 +61,7 @@ public: void setEnabled(bool enabled); protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0); Q_SIGNALS: void enabledChanged(); diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h index 3d1c99a7c..1bcab0c29 100644 --- a/src/render/framegraph/qframegraphnode_p.h +++ b/src/render/framegraph/qframegraphnode_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QFrameGraphNode; -class QFrameGraphNodePrivate : public Qt3D::QNodePrivate +class QFrameGraphNodePrivate : public Qt3DCore::QNodePrivate { public: QFrameGraphNodePrivate(); diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h index 8300be080..64f8bf9fb 100644 --- a/src/render/framegraph/qframegraphselector.h +++ b/src/render/framegraph/qframegraphselector.h @@ -59,14 +59,14 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: - explicit QFrameGraphSelector(Qt3D::QNode *parent = 0); + explicit QFrameGraphSelector(Qt3DCore::QNode *parent = 0); ~QFrameGraphSelector(); QFrameGraphSelectorFunctorPtr selectionFunctor() const; void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QFrameGraphSelector) diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 7e177e322..5d20ca30e 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(Qt3D::QNode *parent = 0); + explicit QLayerFilter(Qt3DCore::QNode *parent = 0); ~QLayerFilter(); void setLayers(const QStringList &layers); @@ -61,8 +61,8 @@ Q_SIGNALS: void layersChanged(); protected: - QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayerFilter) diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp index 294bdba5f..e24b2ca83 100644 --- a/src/render/framegraph/qnodraw.cpp +++ b/src/render/framegraph/qnodraw.cpp @@ -41,12 +41,12 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - * \class Qt3D::QNoDraw::QNoDraw + * \class Qt3DCore::QNoDraw::QNoDraw * - * \brief When a Qt3D::QNoDraw node is present in a FrameGraph branch, this + * \brief When a Qt3DCore::QNoDraw node is present in a FrameGraph branch, this * prevents the renderer from rendering any primitive. * - * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render + * Qt3DCore::QNoDraw should be used when the FrameGraph needs to set up some render * states or clear some buffers without requiring any mesh to be drawn. It has * the same effect as having a Qt3DRender::QRenderPassFilter that matches none of * available Qt3DRender::QRenderPass instances of the scene without the overhead cost diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 361bbfdc4..3daee3212 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(Qt3D::QNode *parent = 0); + explicit QNoDraw(Qt3DCore::QNode *parent = 0); ~QNoDraw(); private: diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index bc72ed652..eb3fec7a1 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index edab54406..15ff9738b 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(Qt3D::QNode *parent = 0); + explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0); ~QRenderPassFilter(); QList<QAnnotation *> includes() const; @@ -67,8 +67,8 @@ public: QList<QParameter *> parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPassFilter) diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index fc87cadc9..58529ae09 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index c05f4584f..a83029f3b 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(Qt3D::QNode *parent = 0); + explicit QRenderTargetSelector(Qt3DCore::QNode *parent = 0); ~QRenderTargetSelector(); void setTarget(QRenderTarget *target); @@ -67,8 +67,8 @@ Q_SIGNALS: void targetChanged(); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTargetSelector) diff --git a/src/render/framegraph/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp index 2c09a552c..f4a5fdf9d 100644 --- a/src/render/framegraph/qsortcriterion.cpp +++ b/src/render/framegraph/qsortcriterion.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::QSortCriterionPrivate + \class Qt3DCore::QSortCriterionPrivate \internal */ QSortCriterionPrivate::QSortCriterionPrivate() diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index d4e12a7a8..41ec43393 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -46,12 +46,12 @@ namespace Qt3DRender { class QSortCriterionPrivate; -class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(Qt3D::QNode *parent = 0); + explicit QSortCriterion(Qt3DCore::QNode *parent = 0); ~QSortCriterion(); enum SortType { @@ -68,8 +68,8 @@ Q_SIGNALS: void sortChanged(); protected: - QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QSortCriterion) diff --git a/src/render/framegraph/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h index 34d51238d..f9f39f747 100644 --- a/src/render/framegraph/qsortcriterion_p.h +++ b/src/render/framegraph/qsortcriterion_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QSortCriterionPrivate : public Qt3D::QNodePrivate +class QSortCriterionPrivate : public Qt3DCore::QNodePrivate { public: QSortCriterionPrivate(); diff --git a/src/render/framegraph/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp index c103fbe47..9253326f2 100644 --- a/src/render/framegraph/qsortmethod.cpp +++ b/src/render/framegraph/qsortmethod.cpp @@ -42,12 +42,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::QSortMethodPrivate + \class Qt3DCore::QSortMethodPrivate \internal */ QSortMethodPrivate::QSortMethodPrivate() diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h index 5eb5ee85e..337eaebf6 100644 --- a/src/render/framegraph/qsortmethod.h +++ b/src/render/framegraph/qsortmethod.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(Qt3D::QNode *parent = 0); + explicit QSortMethod(Qt3DCore::QNode *parent = 0); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,8 +59,8 @@ public: QList<QSortCriterion *> criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QSortMethod(QSortMethodPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSortMethod) diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qstateset.cpp index cd7646d7b..f67f15b8e 100644 --- a/src/render/framegraph/qstateset.cpp +++ b/src/render/framegraph/qstateset.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -52,22 +52,22 @@ QStateSetPrivate::QStateSetPrivate() } /*! - * \class Qt3D::QStateSet + * \class Qt3DCore::QStateSet * \inmodule Qt3DRender * - * \brief The Qt3D::QStateSet FrameGraph node offers a way of specifying a set - * of Qt3D::QRenderState to be applied during the execution of a FrameGraph + * \brief The Qt3DCore::QStateSet FrameGraph node offers a way of specifying a set + * of Qt3DCore::QRenderState to be applied during the execution of a FrameGraph * branch. * - * States set on a Qt3D::QStateSet are set globally, contrary to the per + * States set on a Qt3DCore::QStateSet are set globally, contrary to the per * Material states that can be set on a Qt3DRender::QRenderPass. By default an empty - * Qt3D::QStateSet will result in all render states being disabled when - * executed. Adding a Qt3D::QRenderState state explicitly enables that render + * Qt3DCore::QStateSet will result in all render states being disabled when + * executed. Adding a Qt3DCore::QRenderState state explicitly enables that render * state at runtime. * * \since 5.5 * - * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass + * \sa Qt3DCore::QRenderState, Qt3DRender::QRenderPass */ QStateSet::QStateSet(QNode *parent) @@ -95,9 +95,9 @@ void QStateSet::copy(const QNode *ref) } /*! - * Adds a new Qt3D::QRenderState \a state to the Qt3D::QStateSet instance. + * Adds a new Qt3DCore::QRenderState \a state to the Qt3DCore::QStateSet instance. * - * \note Not setting any Qt3D::QRenderState state on a Qt3D::QStateSet instance + * \note Not setting any Qt3DCore::QRenderState state on a Qt3DCore::QStateSet instance * implies all the render states will be disabled at render time. */ void QStateSet::addRenderState(QRenderState *state) @@ -120,7 +120,7 @@ void QStateSet::addRenderState(QRenderState *state) } /*! - * Removes the Qt3D::QRenderState \a state from the Qt3D::QStateSet instance. + * Removes the Qt3DCore::QRenderState \a state from the Qt3DCore::QStateSet instance. */ void QStateSet::removeRenderState(QRenderState *state) { @@ -135,7 +135,7 @@ void QStateSet::removeRenderState(QRenderState *state) } /*! - * Returns the list of Qt3D::QRenderState that compose the Qt3D::QStateSet instance. + * Returns the list of Qt3DCore::QRenderState that compose the Qt3DCore::QStateSet instance. */ QList<QRenderState *> QStateSet::renderStates() const { diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h index c9d6eb68d..7e4ff1257 100644 --- a/src/render/framegraph/qstateset.h +++ b/src/render/framegraph/qstateset.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode Q_OBJECT public: - explicit QStateSet(Qt3D::QNode *parent = 0); + explicit QStateSet(Qt3DCore::QNode *parent = 0); ~QStateSet(); void addRenderState(QRenderState *state); @@ -59,8 +59,8 @@ public: QList<QRenderState *> renderStates() const; protected: - QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStateSet) diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 6092fb870..e2dd7c081 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 8b8a115f8..b0798a04a 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(Qt3D::QNode *parent = 0); + explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0); ~QTechniqueFilter(); QList<QAnnotation *> criteria() const; @@ -64,8 +64,8 @@ public: QList<QParameter *> parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechniqueFilter) diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 3f427d044..baa6aeb1a 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: - explicit QViewport(Qt3D::QNode *parent = 0); + explicit QViewport(Qt3DCore::QNode *parent = 0); ~QViewport(); QRectF rect() const; @@ -68,8 +68,8 @@ Q_SIGNALS: void clearColorChanged(); protected: - QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QViewport) diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 10c0352d8..920460121 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -52,7 +52,7 @@ RenderPassFilter::RenderPassFilter() { } -void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer) +void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer) { QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer); m_filters.clear(); @@ -64,7 +64,7 @@ void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -QList<Qt3D::QNodeId> RenderPassFilter::filters() const +QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const { return m_filters; } @@ -75,17 +75,17 @@ void RenderPassFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void RenderPassFilter::removeFilter(const Qt3D::QNodeId &criterionId) +void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -QList<Qt3D::QNodeId> RenderPassFilter::parameters() const +QList<Qt3DCore::QNodeId> RenderPassFilter::parameters() const { return m_parameterPack.parameters(); } -void RenderPassFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index 849631394..a413f10bc 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -70,15 +70,15 @@ class RenderPassFilter public: RenderPassFilter(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> filters() const; - QList<Qt3D::QNodeId> parameters() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> filters() const; + QList<Qt3DCore::QNodeId> parameters() const; void appendFilter(QAnnotation *criterion); - void removeFilter(const Qt3D::QNodeId &criterionId); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void removeFilter(const Qt3DCore::QNodeId &criterionId); + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QList<Qt3D::QNodeId> m_filters; + QList<Qt3DCore::QNodeId> m_filters; ParameterPack m_parameterPack; }; diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index ddd565d57..50171e700 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,7 +56,7 @@ RenderTargetSelector::RenderTargetSelector() : { } -void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer) +void RenderTargetSelector::updateFromPeer(Qt3DCore::QNode *peer) { QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer); m_renderTargetUuid = QNodeId(); @@ -66,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer) m_drawBuffers = selector->drawBuffers(); } -void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { @@ -80,7 +80,7 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -Qt3D::QNodeId RenderTargetSelector::renderTargetUuid() const +Qt3DCore::QNodeId RenderTargetSelector::renderTargetUuid() const { return m_renderTargetUuid; } diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h index 33d21d0f5..f6e1605a2 100644 --- a/src/render/framegraph/rendertargetselectornode_p.h +++ b/src/render/framegraph/rendertargetselectornode_p.h @@ -63,13 +63,13 @@ class RenderTargetSelector : public FrameGraphNode public: RenderTargetSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - Qt3D::QNodeId renderTargetUuid() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId renderTargetUuid() const; QList<QRenderAttachment::RenderAttachmentType> drawBuffers() const; private: - Qt3D::QNodeId m_renderTargetUuid; + Qt3DCore::QNodeId m_renderTargetUuid; QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp index 97db75c9f..650d6f80a 100644 --- a/src/render/framegraph/sortcriterion.cpp +++ b/src/render/framegraph/sortcriterion.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -55,7 +55,7 @@ void SortCriterion::cleanup() { } -void SortCriterion::updateFromPeer(Qt3D::QNode *peer) +void SortCriterion::updateFromPeer(Qt3DCore::QNode *peer) { QSortCriterion *criterion = static_cast<QSortCriterion *>(peer); m_type = criterion->sort(); @@ -66,7 +66,7 @@ QSortCriterion::SortType SortCriterion::sortType() const return m_type; } -void SortCriterion::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void SortCriterion::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) { diff --git a/src/render/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h index 14d749bd2..d0e20b603 100644 --- a/src/render/framegraph/sortcriterion_p.h +++ b/src/render/framegraph/sortcriterion_p.h @@ -59,17 +59,17 @@ namespace Render { class SortCriterionManager; -class SortCriterion : public Qt3D::QBackendNode +class SortCriterion : public Qt3DCore::QBackendNode { public: SortCriterion(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QSortCriterion::SortType sortType() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: QSortCriterion::SortType m_type; diff --git a/src/render/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp index 4f67eb08f..d7bcb177b 100644 --- a/src/render/framegraph/sortmethod.cpp +++ b/src/render/framegraph/sortmethod.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,7 +50,7 @@ SortMethod::SortMethod() { } -void SortMethod::updateFromPeer(Qt3D::QNode *peer) +void SortMethod::updateFromPeer(Qt3DCore::QNode *peer) { QSortMethod *sortMethod = static_cast<QSortMethod *>(peer); m_criteria.clear(); @@ -59,7 +59,7 @@ void SortMethod::updateFromPeer(Qt3D::QNode *peer) setEnabled(sortMethod->isEnabled()); } -void SortMethod::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void SortMethod::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) { diff --git a/src/render/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h index 69f73cf17..2222a76ea 100644 --- a/src/render/framegraph/sortmethod_p.h +++ b/src/render/framegraph/sortmethod_p.h @@ -62,13 +62,13 @@ class SortMethod : public FrameGraphNode public: SortMethod(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> criteria() const; + QList<Qt3DCore::QNodeId> criteria() const; private: - QList<Qt3D::QNodeId> m_criteria; + QList<Qt3DCore::QNodeId> m_criteria; }; } // namespace Render diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index cd0d82371..d7832c256 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -57,7 +57,7 @@ StateSetNode::~StateSetNode() { } -void StateSetNode::updateFromPeer(Qt3D::QNode *peer) +void StateSetNode::updateFromPeer(Qt3DCore::QNode *peer) { QStateSet *stateSet = static_cast<QStateSet*>(peer); @@ -71,7 +71,7 @@ QList<RenderState *> StateSetNode::renderStates() const return m_renderStates.values(); } -void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -95,13 +95,13 @@ void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -void StateSetNode::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) +void StateSetNode::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void StateSetNode::removeRenderState(const Qt3D::QNodeId &renderStateId) +void StateSetNode::removeRenderState(const Qt3DCore::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h index 859d67c21..7a9563cc0 100644 --- a/src/render/framegraph/statesetnode_p.h +++ b/src/render/framegraph/statesetnode_p.h @@ -62,17 +62,17 @@ public: StateSetNode(); ~StateSetNode(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QList<RenderState *> renderStates() const; protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); - void removeRenderState(const Qt3D::QNodeId &renderStateId); + void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3DCore::QNodeId &renderStateId); - QHash<Qt3D::QNodeId, RenderState *> m_renderStates; + QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates; }; } // namespace Render diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 547ed077b..9ec764415 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -53,7 +53,7 @@ TechniqueFilter::TechniqueFilter() { } -void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer) +void TechniqueFilter::updateFromPeer(Qt3DCore::QNode *peer) { QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer); m_filters.clear(); @@ -65,12 +65,12 @@ void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer) setEnabled(filter->isEnabled()); } -QList<Qt3D::QNodeId> TechniqueFilter::parameters() const +QList<Qt3DCore::QNodeId> TechniqueFilter::parameters() const { return m_parameterPack.parameters(); } -QList<Qt3D::QNodeId> TechniqueFilter::filters() const +QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const { return m_filters; } @@ -81,12 +81,12 @@ void TechniqueFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void TechniqueFilter::removeFilter(const Qt3D::QNodeId &criterionId) +void TechniqueFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -void TechniqueFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index 4dd8fc0b3..59ffb9572 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -72,18 +72,18 @@ class TechniqueFilter { public: TechniqueFilter(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> parameters() const; - QList<Qt3D::QNodeId> filters() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> filters() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: void appendFilter(QAnnotation *criterion); - void removeFilter(const Qt3D::QNodeId &criterionId); + void removeFilter(const Qt3DCore::QNodeId &criterionId); - QList<Qt3D::QNodeId> m_filters; + QList<Qt3DCore::QNodeId> m_filters; ParameterPack m_parameterPack; }; diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 29751068c..a016d9686 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -54,7 +54,7 @@ ViewportNode::ViewportNode() { } -void ViewportNode::updateFromPeer(Qt3D::QNode *peer) +void ViewportNode::updateFromPeer(Qt3DCore::QNode *peer) { QViewport *viewport = static_cast<QViewport *>(peer); setXMin(viewport->rect().x()); @@ -107,7 +107,7 @@ QColor ViewportNode::clearColor() const return m_clearColor; } -void ViewportNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h index e7af0604e..50ac79efa 100644 --- a/src/render/framegraph/viewportnode_p.h +++ b/src/render/framegraph/viewportnode_p.h @@ -66,7 +66,7 @@ class ViewportNode : public FrameGraphNode public: ViewportNode(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; float xMin() const; void setXMin(float xMin); @@ -82,7 +82,7 @@ public: QColor clearColor() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: float m_xMin; |