diff options
Diffstat (limited to 'src/render/backend')
151 files changed, 1329 insertions, 1314 deletions
diff --git a/src/render/backend/attachmentpack.cpp b/src/render/backend/attachmentpack.cpp index 95bdb3c0c..705240104 100644 --- a/src/render/backend/attachmentpack.cpp +++ b/src/render/backend/attachmentpack.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -74,8 +74,8 @@ Attachment::Attachment() { } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h index 74c5d6430..e30d77705 100644 --- a/src/render/backend/attachmentpack_p.h +++ b/src/render/backend/attachmentpack_p.h @@ -34,16 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_ATTACHMENTPACK_P_H -#define QT3D_RENDER_ATTACHMENTPACK_P_H +#ifndef QT3DRENDER_RENDER_ATTACHMENTPACK_P_H +#define QT3DRENDER_RENDER_ATTACHMENTPACK_P_H #include <Qt3DRenderer/qrenderattachment.h> #include <QVector> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { struct Attachment @@ -52,7 +51,7 @@ struct Attachment QString m_name; int m_mipLevel; int m_layer; - QNodeId m_textureUuid; + Qt3D::QNodeId m_textureUuid; QRenderAttachment::RenderAttachmentType m_type; QRenderAttachment::CubeMapFace m_face; }; @@ -73,10 +72,9 @@ private: QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_ATTACHMENTPACK_P_H +#endif // QT3DRENDER_RENDER_ATTACHMENTPACK_P_H diff --git a/src/render/backend/buffermanager.cpp b/src/render/backend/buffermanager.cpp index bcf25086d..e8411fe02 100644 --- a/src/render/backend/buffermanager.cpp +++ b/src/render/backend/buffermanager.cpp @@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - - +namespace Qt3DRender { namespace Render { BufferManager::BufferManager() @@ -51,21 +49,20 @@ BufferManager::~BufferManager() { } -void BufferManager::addDirtyBuffer(const QNodeId &bufferId) +void BufferManager::addDirtyBuffer(const Qt3D::QNodeId &bufferId) { if (!m_dirtyBuffers.contains(bufferId)) m_dirtyBuffers.push_back(bufferId); } -QVector<QNodeId> BufferManager::dirtyBuffers() +QVector<Qt3D::QNodeId> BufferManager::dirtyBuffers() { - QVector<QNodeId> vector(m_dirtyBuffers); + QVector<Qt3D::QNodeId> vector(m_dirtyBuffers); m_dirtyBuffers.clear(); return vector; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/buffermanager_p.h b/src/render/backend/buffermanager_p.h index c7d397ff2..297050857 100644 --- a/src/render/backend/buffermanager_p.h +++ b/src/render/backend/buffermanager_p.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_BUFFERMANAGER_H -#define QT3D_RENDER_BUFFERMANAGER_H +#ifndef QT3DRENDER_RENDER_BUFFERMANAGER_H +#define QT3DRENDER_RENDER_BUFFERMANAGER_H #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRenderer/private/renderbuffer_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class BufferManager : public QResourceManager< +class BufferManager : public Qt3D::QResourceManager< RenderBuffer, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -58,20 +58,19 @@ public: ~BufferManager(); // Aspect Thread - void addDirtyBuffer(const QNodeId &bufferId); - QVector<QNodeId> dirtyBuffers(); + void addDirtyBuffer(const Qt3D::QNodeId &bufferId); + QVector<Qt3D::QNodeId> dirtyBuffers(); private: - QVector<QNodeId> m_dirtyBuffers; + QVector<Qt3D::QNodeId> m_dirtyBuffers; }; -} // Render +} // namespace Render +} // namespace Qt3DRender -Q_DECLARE_RESOURCE_INFO(Render::RenderBuffer, Q_REQUIRES_CLEANUP); - -} // Qt3D +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderBuffer, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE -#endif // QT3D_RENDER_BUFFERMANAGER_H +#endif // QT3DRENDER_RENDER_BUFFERMANAGER_H diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp index 7d2833b16..527147842 100644 --- a/src/render/backend/framegraph/cameraselectornode.cpp +++ b/src/render/backend/framegraph/cameraselectornode.cpp @@ -45,8 +45,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { CameraSelector::CameraSelector() @@ -54,7 +55,7 @@ CameraSelector::CameraSelector() { } -void CameraSelector::updateFromPeer(QNode *peer) +void CameraSelector::updateFromPeer(Qt3D::QNode *peer) { QCameraSelector *selector = static_cast<QCameraSelector *>(peer); m_cameraUuid = QNodeId(); @@ -63,7 +64,7 @@ void CameraSelector::updateFromPeer(QNode *peer) setEnabled(selector->isEnabled()); } -void CameraSelector::sceneChangeEvent(const QSceneChangePtr &e) +void CameraSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { @@ -80,8 +81,7 @@ QNodeId CameraSelector::cameraUuid() const return m_cameraUuid; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/cameraselectornode_p.h b/src/render/backend/framegraph/cameraselectornode_p.h index 3eb10987c..cfe29f36d 100644 --- a/src/render/backend/framegraph/cameraselectornode_p.h +++ b/src/render/backend/framegraph/cameraselectornode_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_CAMERASELECTOR_H -#define QT3D_RENDER_CAMERASELECTOR_H +#ifndef QT3DRENDER_RENDER_CAMERASELECTOR_H +#define QT3DRENDER_RENDER_CAMERASELECTOR_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QEntity; class QCameraSelector; @@ -56,18 +56,18 @@ class CameraSelector : public FrameGraphNode public: CameraSelector(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - QNodeId cameraUuid() const; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3D::QNodeId cameraUuid() const; private: - QNodeId m_cameraUuid; + Qt3D::QNodeId m_cameraUuid; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_CAMERASELECTOR_H +#endif // QT3DRENDER_RENDER_CAMERASELECTOR_H diff --git a/src/render/backend/framegraph/clearbuffer.cpp b/src/render/backend/framegraph/clearbuffer.cpp index a4286ac14..47982d5f0 100644 --- a/src/render/backend/framegraph/clearbuffer.cpp +++ b/src/render/backend/framegraph/clearbuffer.cpp @@ -39,8 +39,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { ClearBuffer::ClearBuffer() @@ -49,14 +50,14 @@ ClearBuffer::ClearBuffer() { } -void ClearBuffer::updateFromPeer(QNode *peer) +void ClearBuffer::updateFromPeer(Qt3D::QNode *peer) { QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer); m_type = clearBuffer->buffers(); setEnabled(clearBuffer->isEnabled()); } -void ClearBuffer::sceneChangeEvent(const QSceneChangePtr &e) +void ClearBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -72,8 +73,7 @@ QClearBuffer::BufferType ClearBuffer::type() const return m_type; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/clearbuffer_p.h b/src/render/backend/framegraph/clearbuffer_p.h index 2f58a5951..1883e8134 100644 --- a/src/render/backend/framegraph/clearbuffer_p.h +++ b/src/render/backend/framegraph/clearbuffer_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_CLEARBUFFER_P_H -#define QT3D_RENDER_CLEARBUFFER_P_H +#ifndef QT3DRENDER_RENDER_CLEARBUFFER_P_H +#define QT3DRENDER_RENDER_CLEARBUFFER_P_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/qclearbuffer.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -53,18 +53,18 @@ class ClearBuffer : public FrameGraphNode public: ClearBuffer(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; QClearBuffer::BufferType type() const; private: QClearBuffer::BufferType m_type; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_CLEARBUFFER_P_H +#endif // QT3DRENDER_RENDER_CLEARBUFFER_P_H diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp index 8742399ed..b001fd675 100644 --- a/src/render/backend/framegraph/framegraphnode.cpp +++ b/src/render/backend/framegraph/framegraphnode.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { FrameGraphNode::FrameGraphNode() @@ -139,7 +139,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(Renderer *renderer) { } -QBackendNode *FrameGraphComponentFunctor::create(QNode *frontend, const QBackendNodeFactory *) const +Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *) const { // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method // to do that @@ -149,18 +149,18 @@ QBackendNode *FrameGraphComponentFunctor::create(QNode *frontend, const QBackend return Q_NULLPTR; } -QBackendNode *FrameGraphComponentFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *FrameGraphComponentFunctor::get(const Qt3D::QNodeId &id) const { Q_UNUSED(id); return Q_NULLPTR; } -void FrameGraphComponentFunctor::destroy(const QNodeId &id) const +void FrameGraphComponentFunctor::destroy(const Qt3D::QNodeId &id) const { Q_UNUSED(id); } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/backend/framegraph/framegraphnode_p.h index b17401ede..f5683a58e 100644 --- a/src/render/backend/framegraph/framegraphnode_p.h +++ b/src/render/backend/framegraph/framegraphnode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_FRAMEGRAPHNODE_H -#define QT3D_RENDER_FRAMEGRAPHNODE_H +#ifndef QT3DRENDER_RENDER_FRAMEGRAPHNODE_H +#define QT3DRENDER_RENDER_FRAMEGRAPHNODE_H #include <Qt3DCore/qhandle.h> #include <Qt3DCore/qnode.h> @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class FrameGraphNode : public QBackendNode +class FrameGraphNode : public Qt3D::QBackendNode { public: FrameGraphNode(); @@ -105,7 +105,7 @@ private: }; template<typename Backend, typename Frontend> -class FrameGraphNodeFunctor : public QBackendNodeFunctor +class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor { public: explicit FrameGraphNodeFunctor(FrameGraphManager *manager) @@ -113,12 +113,12 @@ public: { } - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE { return createBackendFrameGraphNode(frontend, factory); } - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE { FrameGraphNode **node = m_manager->lookupResource(id); if (node != Q_NULLPTR) @@ -126,13 +126,13 @@ public: return Q_NULLPTR; } - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE + void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE { m_manager->releaseResource(id); } protected: - Backend *createBackendFrameGraphNode(QNode *n, const QBackendNodeFactory *factory) const + Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const { Frontend *f = qobject_cast<Frontend *>(n); if (f != Q_NULLPTR) { @@ -159,21 +159,21 @@ private: FrameGraphManager *m_manager; }; -class FrameGraphComponentFunctor : public QBackendNodeFunctor +class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor { public: explicit FrameGraphComponentFunctor(Renderer *renderer); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + 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; private: Renderer *m_renderer; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_FRAMEGRAPHNODE_H +#endif // QT3DRENDER_RENDER_FRAMEGRAPHNODE_H diff --git a/src/render/backend/framegraph/framegraphsubtreeselector.cpp b/src/render/backend/framegraph/framegraphsubtreeselector.cpp index dae7180b5..5fa060d37 100644 --- a/src/render/backend/framegraph/framegraphsubtreeselector.cpp +++ b/src/render/backend/framegraph/framegraphsubtreeselector.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -53,18 +53,18 @@ FrameGraphSubtreeSelector::~FrameGraphSubtreeSelector() { } -void FrameGraphSubtreeSelector::updateFromPeer(QNode *peer) +void FrameGraphSubtreeSelector::updateFromPeer(Qt3D::QNode *peer) { QFrameGraphSelector *selector = static_cast<QFrameGraphSelector *>(peer); setEnabled(selector->isEnabled()); } -void FrameGraphSubtreeSelector::sceneChangeEvent(const QSceneChangePtr &) +void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &) { } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphsubtreeselector_p.h b/src/render/backend/framegraph/framegraphsubtreeselector_p.h index 9744c2148..8f3cd9ea2 100644 --- a/src/render/backend/framegraph/framegraphsubtreeselector_p.h +++ b/src/render/backend/framegraph/framegraphsubtreeselector_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H -#define QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H +#ifndef QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H +#define QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/qframegraphselector.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -52,14 +52,14 @@ public: FrameGraphSubtreeSelector(); ~FrameGraphSubtreeSelector(); - void updateFromPeer(QNode *peer) Q_DECL_FINAL; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_FINAL; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_FINAL; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H +#endif // QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H diff --git a/src/render/backend/framegraph/framegraphvisitor.cpp b/src/render/backend/framegraph/framegraphvisitor.cpp index bfaf861d3..e9b825815 100644 --- a/src/render/backend/framegraph/framegraphvisitor.cpp +++ b/src/render/backend/framegraph/framegraphvisitor.cpp @@ -41,7 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { FrameGraphVisitor::FrameGraphVisitor() @@ -54,7 +56,7 @@ FrameGraphVisitor::FrameGraphVisitor() void FrameGraphVisitor::traverse(FrameGraphNode *root, Renderer *renderer, - QVector<QAspectJobPtr> *jobs) + QVector<Qt3D::QAspectJobPtr> *jobs) { m_renderer = renderer; m_jobs = jobs; @@ -92,6 +94,6 @@ void FrameGraphVisitor::visit(Render::FrameGraphNode *node) } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphvisitor_p.h b/src/render/backend/framegraph/framegraphvisitor_p.h index 60205b36b..560aa9787 100644 --- a/src/render/backend/framegraph/framegraphvisitor_p.h +++ b/src/render/backend/framegraph/framegraphvisitor_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_FRAMEGRAPHVISITOR_H -#define QT3D_RENDER_FRAMEGRAPHVISITOR_H +#ifndef QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H +#define QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H #include <qglobal.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class FrameGraphNode; @@ -58,19 +58,19 @@ public: void traverse(FrameGraphNode *root, Renderer *renderer, - QVector<QAspectJobPtr> *jobs); + QVector<Qt3D::QAspectJobPtr> *jobs); private: void visit(Render::FrameGraphNode *node); Renderer *m_renderer; - QVector<QAspectJobPtr> *m_jobs; + QVector<Qt3D::QAspectJobPtr> *m_jobs; int m_renderviewIndex; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_FRAMEGRAPHVISITOR_H +#endif // QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H diff --git a/src/render/backend/framegraph/layerfilternode.cpp b/src/render/backend/framegraph/layerfilternode.cpp index 3541a36c1..4c9ee50ad 100644 --- a/src/render/backend/framegraph/layerfilternode.cpp +++ b/src/render/backend/framegraph/layerfilternode.cpp @@ -40,8 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { LayerFilterNode::LayerFilterNode() @@ -49,14 +50,14 @@ LayerFilterNode::LayerFilterNode() { } -void LayerFilterNode::updateFromPeer(QNode *peer) +void LayerFilterNode::updateFromPeer(Qt3D::QNode *peer) { QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer); m_layers = layerFilter->layers(); setEnabled(layerFilter->isEnabled()); } -void LayerFilterNode::sceneChangeEvent(const QSceneChangePtr &e) +void LayerFilterNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -77,8 +78,7 @@ void LayerFilterNode::setLayers(const QStringList &list) m_layers = list; } -} // Render - -} //Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/layerfilternode_p.h b/src/render/backend/framegraph/layerfilternode_p.h index 17d040288..fcbf54c77 100644 --- a/src/render/backend/framegraph/layerfilternode_p.h +++ b/src/render/backend/framegraph/layerfilternode_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LAYERFILTERNODE_H -#define QT3D_RENDER_LAYERFILTERNODE_H +#ifndef QT3DRENDER_RENDER_LAYERFILTERNODE_H +#define QT3DRENDER_RENDER_LAYERFILTERNODE_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <QStringList> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerFilter; @@ -55,8 +55,8 @@ class LayerFilterNode : public FrameGraphNode public: LayerFilterNode(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; QStringList layers() const; void setLayers(const QStringList &list); @@ -64,10 +64,10 @@ private: QStringList m_layers; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_LAYERFILTERNODE_H +#endif // QT3DRENDER_RENDER_LAYERFILTERNODE_H diff --git a/src/render/backend/framegraph/nodraw.cpp b/src/render/backend/framegraph/nodraw.cpp index 018ed4330..0822779f8 100644 --- a/src/render/backend/framegraph/nodraw.cpp +++ b/src/render/backend/framegraph/nodraw.cpp @@ -40,8 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { NoDraw::NoDraw() @@ -53,13 +54,13 @@ NoDraw::~NoDraw() { } -void NoDraw::updateFromPeer(QNode *peer) +void NoDraw::updateFromPeer(Qt3D::QNode *peer) { QNoDraw *noDraw = static_cast<QNoDraw *>(peer); setEnabled(noDraw->isEnabled()); } -void NoDraw::sceneChangeEvent(const QSceneChangePtr &e) +void NoDraw::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -76,8 +77,7 @@ void NoDraw::sceneChangeEvent(const QSceneChangePtr &e) } } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/nodraw_p.h b/src/render/backend/framegraph/nodraw_p.h index 1d9a53a1c..068143252 100644 --- a/src/render/backend/framegraph/nodraw_p.h +++ b/src/render/backend/framegraph/nodraw_p.h @@ -36,12 +36,12 @@ #include <Qt3DRenderer/private/framegraphnode_p.h> -#ifndef QT3D_RENDER_NODRAW_H -#define QT3D_RENDER_NODRAW_H +#ifndef QT3DRENDER_RENDER_NODRAW_H +#define QT3DRENDER_RENDER_NODRAW_H QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -51,16 +51,16 @@ public: NoDraw(); ~NoDraw(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_NODRAW_H +#endif // QT3DRENDER_RENDER_NODRAW_H diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp index dd2e87060..10c0352d8 100644 --- a/src/render/backend/framegraph/renderpassfilternode.cpp +++ b/src/render/backend/framegraph/renderpassfilternode.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderPassFilter::RenderPassFilter() @@ -50,7 +52,7 @@ RenderPassFilter::RenderPassFilter() { } -void RenderPassFilter::updateFromPeer(QNode *peer) +void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer) { QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer); m_filters.clear(); @@ -62,7 +64,7 @@ void RenderPassFilter::updateFromPeer(QNode *peer) m_parameterPack.appendParameter(p->id()); } -QList<QNodeId> RenderPassFilter::filters() const +QList<Qt3D::QNodeId> RenderPassFilter::filters() const { return m_filters; } @@ -73,17 +75,17 @@ void RenderPassFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void RenderPassFilter::removeFilter(const QNodeId &criterionId) +void RenderPassFilter::removeFilter(const Qt3D::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -QList<QNodeId> RenderPassFilter::parameters() const +QList<Qt3D::QNodeId> RenderPassFilter::parameters() const { return m_parameterPack.parameters(); } -void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e) +void RenderPassFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -114,6 +116,6 @@ void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e) } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/renderpassfilternode_p.h b/src/render/backend/framegraph/renderpassfilternode_p.h index 80e577cc9..009794488 100644 --- a/src/render/backend/framegraph/renderpassfilternode_p.h +++ b/src/render/backend/framegraph/renderpassfilternode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERPASSFILTER_H -#define QT3D_RENDER_RENDERPASSFILTER_H +#ifndef QT3DRENDER_RENDER_RENDERPASSFILTER_H +#define QT3DRENDER_RENDER_RENDERPASSFILTER_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/private/parameterpack_p.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAnnotation; class QRenderPassFilter; @@ -59,21 +59,21 @@ class RenderPassFilter public: RenderPassFilter(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - QList<QNodeId> filters() const; - QList<QNodeId> parameters() const; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + QList<Qt3D::QNodeId> filters() const; + QList<Qt3D::QNodeId> parameters() const; void appendFilter(QAnnotation *criterion); - void removeFilter(const QNodeId &criterionId); - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void removeFilter(const Qt3D::QNodeId &criterionId); + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QList<QNodeId> m_filters; + QList<Qt3D::QNodeId> m_filters; ParameterPack m_parameterPack; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERPASSFILTER_H +#endif // QT3DRENDER_RENDER_RENDERPASSFILTER_H diff --git a/src/render/backend/framegraph/rendertargetselectornode.cpp b/src/render/backend/framegraph/rendertargetselectornode.cpp index d8f696913..ddd565d57 100644 --- a/src/render/backend/framegraph/rendertargetselectornode.cpp +++ b/src/render/backend/framegraph/rendertargetselectornode.cpp @@ -46,7 +46,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderTargetSelector::RenderTargetSelector() : @@ -54,7 +56,7 @@ RenderTargetSelector::RenderTargetSelector() : { } -void RenderTargetSelector::updateFromPeer(QNode *peer) +void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer) { QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer); m_renderTargetUuid = QNodeId(); @@ -64,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(QNode *peer) m_drawBuffers = selector->drawBuffers(); } -void RenderTargetSelector::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { @@ -74,11 +76,11 @@ void RenderTargetSelector::sceneChangeEvent(const QSceneChangePtr &e) else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) setEnabled(propertyChange->value().toBool()); else if (propertyChange->propertyName() == QByteArrayLiteral("drawBuffers")) - m_drawBuffers = propertyChange->value().value<QList<Qt3D::QRenderAttachment::RenderAttachmentType> >(); + m_drawBuffers = propertyChange->value().value<QList<Qt3DRender::QRenderAttachment::RenderAttachmentType> >(); } } -QNodeId RenderTargetSelector::renderTargetUuid() const +Qt3D::QNodeId RenderTargetSelector::renderTargetUuid() const { return m_renderTargetUuid; } @@ -88,7 +90,7 @@ QList<QRenderAttachment::RenderAttachmentType> RenderTargetSelector::drawBuffers return m_drawBuffers; } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/rendertargetselectornode_p.h b/src/render/backend/framegraph/rendertargetselectornode_p.h index adbd8b041..9b3e4199b 100644 --- a/src/render/backend/framegraph/rendertargetselectornode_p.h +++ b/src/render/backend/framegraph/rendertargetselectornode_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTARGETSELECTOR_H -#define QT3D_RENDER_RENDERTARGETSELECTOR_H +#ifndef QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H +#define QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H #include <Qt3DRenderer/private/framegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetSelector; @@ -52,19 +52,19 @@ class RenderTargetSelector : public FrameGraphNode public: RenderTargetSelector(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - QNodeId renderTargetUuid() const; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3D::QNodeId renderTargetUuid() const; QList<QRenderAttachment::RenderAttachmentType> drawBuffers() const; private: - QNodeId m_renderTargetUuid; + Qt3D::QNodeId m_renderTargetUuid; QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERTARGETSELECTOR_H +#endif // QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H diff --git a/src/render/backend/framegraph/sortcriterion.cpp b/src/render/backend/framegraph/sortcriterion.cpp index b1cc73ed9..97db75c9f 100644 --- a/src/render/backend/framegraph/sortcriterion.cpp +++ b/src/render/backend/framegraph/sortcriterion.cpp @@ -40,8 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { SortCriterion::SortCriterion() @@ -54,7 +55,7 @@ void SortCriterion::cleanup() { } -void SortCriterion::updateFromPeer(QNode *peer) +void SortCriterion::updateFromPeer(Qt3D::QNode *peer) { QSortCriterion *criterion = static_cast<QSortCriterion *>(peer); m_type = criterion->sort(); @@ -65,7 +66,7 @@ QSortCriterion::SortType SortCriterion::sortType() const return m_type; } -void SortCriterion::sceneChangeEvent(const QSceneChangePtr &e) +void SortCriterion::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) { @@ -73,8 +74,7 @@ void SortCriterion::sceneChangeEvent(const QSceneChangePtr &e) } } -} - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/sortcriterion_p.h b/src/render/backend/framegraph/sortcriterion_p.h index 234140148..982c3a50c 100644 --- a/src/render/backend/framegraph/sortcriterion_p.h +++ b/src/render/backend/framegraph/sortcriterion_p.h @@ -34,40 +34,40 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_SORTCRITERION_P_H -#define QT3D_RENDER_SORTCRITERION_P_H +#ifndef QT3DRENDER_RENDER_SORTCRITERION_P_H +#define QT3DRENDER_RENDER_SORTCRITERION_P_H #include <Qt3DRenderer/qsortcriterion.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class SortCriterionManager; -class SortCriterion : public QBackendNode +class SortCriterion : public Qt3D::QBackendNode { public: SortCriterion(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; QSortCriterion::SortType sortType() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: QSortCriterion::SortType m_type; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_SORTCRITERION_P_H +#endif // QT3DRENDER_RENDER_SORTCRITERION_P_H diff --git a/src/render/backend/framegraph/sortmethod.cpp b/src/render/backend/framegraph/sortmethod.cpp index 078399b52..4f67eb08f 100644 --- a/src/render/backend/framegraph/sortmethod.cpp +++ b/src/render/backend/framegraph/sortmethod.cpp @@ -40,8 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { SortMethod::SortMethod() @@ -49,7 +50,7 @@ SortMethod::SortMethod() { } -void SortMethod::updateFromPeer(QNode *peer) +void SortMethod::updateFromPeer(Qt3D::QNode *peer) { QSortMethod *sortMethod = static_cast<QSortMethod *>(peer); m_criteria.clear(); @@ -58,7 +59,7 @@ void SortMethod::updateFromPeer(QNode *peer) setEnabled(sortMethod->isEnabled()); } -void SortMethod::sceneChangeEvent(const QSceneChangePtr &e) +void SortMethod::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) { @@ -79,8 +80,7 @@ QList<QNodeId> SortMethod::criteria() const return m_criteria; } -} // Render - -} // Qt3D +} // namepace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/sortmethod_p.h b/src/render/backend/framegraph/sortmethod_p.h index b8f95f647..b9d26d2a3 100644 --- a/src/render/backend/framegraph/sortmethod_p.h +++ b/src/render/backend/framegraph/sortmethod_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_SORTMETHOD_P_H -#define QT3D_RENDER_SORTMETHOD_P_H +#ifndef QT3DRENDER_RENDER_SORTMETHOD_P_H +#define QT3DRENDER_RENDER_SORTMETHOD_P_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/qsortmethod.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -51,19 +51,19 @@ class SortMethod : public FrameGraphNode public: SortMethod(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - QList<QNodeId> criteria() const; + QList<Qt3D::QNodeId> criteria() const; private: - QList<QNodeId> m_criteria; + QList<Qt3D::QNodeId> m_criteria; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_SORTMETHOD_P_H +#endif // QT3DRENDER_RENDER_SORTMETHOD_P_H diff --git a/src/render/backend/framegraph/statesetnode.cpp b/src/render/backend/framegraph/statesetnode.cpp index 181e31fa4..0082602df 100644 --- a/src/render/backend/framegraph/statesetnode.cpp +++ b/src/render/backend/framegraph/statesetnode.cpp @@ -42,8 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { StateSetNode::StateSetNode() @@ -55,7 +56,7 @@ StateSetNode::~StateSetNode() { } -void StateSetNode::updateFromPeer(QNode *peer) +void StateSetNode::updateFromPeer(Qt3D::QNode *peer) { QStateSet *stateSet = static_cast<QStateSet*>(peer); @@ -69,7 +70,7 @@ QList<RenderState *> StateSetNode::renderStates() const return m_renderStates.values(); } -void StateSetNode::sceneChangeEvent(const QSceneChangePtr &e) +void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -93,19 +94,19 @@ void StateSetNode::sceneChangeEvent(const QSceneChangePtr &e) } } -void StateSetNode::appendRenderState(const QNodeId &id, RenderState *renderState) +void StateSetNode::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void StateSetNode::removeRenderState(const QNodeId &renderStateId) +void StateSetNode::removeRenderState(const Qt3D::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/statesetnode_p.h b/src/render/backend/framegraph/statesetnode_p.h index af6de5e8c..d5d2921f2 100644 --- a/src/render/backend/framegraph/statesetnode_p.h +++ b/src/render/backend/framegraph/statesetnode_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_STATESETNODE_H -#define QT3D_RENDER_STATESETNODE_H +#ifndef QT3DRENDER_RENDER_STATESETNODE_H +#define QT3DRENDER_RENDER_STATESETNODE_H #include <Qt3DRenderer/private/framegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -51,23 +51,23 @@ public: StateSetNode(); ~StateSetNode(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; QList<RenderState *> renderStates() const; protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderState(const QNodeId &id, RenderState *renderState); - void removeRenderState(const QNodeId &renderStateId); + void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3D::QNodeId &renderStateId); - QHash<QNodeId, RenderState *> m_renderStates; + QHash<Qt3D::QNodeId, RenderState *> m_renderStates; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_STATESETNODE_H +#endif // QT3DRENDER_RENDER_STATESETNODE_H diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp index 9f8bd3c78..547ed077b 100644 --- a/src/render/backend/framegraph/techniquefilternode.cpp +++ b/src/render/backend/framegraph/techniquefilternode.cpp @@ -43,7 +43,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { TechniqueFilter::TechniqueFilter() @@ -51,7 +53,7 @@ TechniqueFilter::TechniqueFilter() { } -void TechniqueFilter::updateFromPeer(QNode *peer) +void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer) { QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer); m_filters.clear(); @@ -63,12 +65,12 @@ void TechniqueFilter::updateFromPeer(QNode *peer) setEnabled(filter->isEnabled()); } -QList<QNodeId> TechniqueFilter::parameters() const +QList<Qt3D::QNodeId> TechniqueFilter::parameters() const { return m_parameterPack.parameters(); } -QList<QNodeId> TechniqueFilter::filters() const +QList<Qt3D::QNodeId> TechniqueFilter::filters() const { return m_filters; } @@ -79,12 +81,12 @@ void TechniqueFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void TechniqueFilter::removeFilter(const QNodeId &criterionId) +void TechniqueFilter::removeFilter(const Qt3D::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -void TechniqueFilter::sceneChangeEvent(const QSceneChangePtr &e) +void TechniqueFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -114,8 +116,7 @@ void TechniqueFilter::sceneChangeEvent(const QSceneChangePtr &e) } } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/techniquefilternode_p.h b/src/render/backend/framegraph/techniquefilternode_p.h index af32e991c..afcf7c1d8 100644 --- a/src/render/backend/framegraph/techniquefilternode_p.h +++ b/src/render/backend/framegraph/techniquefilternode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_TECHNIQUEFILTER_H -#define QT3D_RENDER_TECHNIQUEFILTER_H +#ifndef QT3DRENDER_RENDER_TECHNIQUEFILTER_H +#define QT3DRENDER_RENDER_TECHNIQUEFILTER_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/private/parameterpack_p.h> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAnnotation; class QTechniqueFilter; @@ -61,25 +61,25 @@ class TechniqueFilter { public: TechniqueFilter(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - QList<QNodeId> parameters() const; + QList<Qt3D::QNodeId> parameters() const; - QList<QNodeId> filters() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3D::QNodeId> filters() const; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: void appendFilter(QAnnotation *criterion); - void removeFilter(const QNodeId &criterionId); + void removeFilter(const Qt3D::QNodeId &criterionId); - QList<QNodeId> m_filters; + QList<Qt3D::QNodeId> m_filters; ParameterPack m_parameterPack; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_TECHNIQUEFILTER_H +#endif // QT3DRENDER_RENDER_TECHNIQUEFILTER_H diff --git a/src/render/backend/framegraph/viewportnode.cpp b/src/render/backend/framegraph/viewportnode.cpp index da1a63040..29751068c 100644 --- a/src/render/backend/framegraph/viewportnode.cpp +++ b/src/render/backend/framegraph/viewportnode.cpp @@ -40,7 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { ViewportNode::ViewportNode() @@ -52,7 +54,7 @@ ViewportNode::ViewportNode() { } -void ViewportNode::updateFromPeer(QNode *peer) +void ViewportNode::updateFromPeer(Qt3D::QNode *peer) { QViewport *viewport = static_cast<QViewport *>(peer); setXMin(viewport->rect().x()); @@ -105,7 +107,7 @@ QColor ViewportNode::clearColor() const return m_clearColor; } -void ViewportNode::sceneChangeEvent(const QSceneChangePtr &e) +void ViewportNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -141,7 +143,7 @@ QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentVi } } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/viewportnode_p.h b/src/render/backend/framegraph/viewportnode_p.h index 8e0d3e084..35a1110c2 100644 --- a/src/render/backend/framegraph/viewportnode_p.h +++ b/src/render/backend/framegraph/viewportnode_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_VIEWPORTNODE_H -#define QT3D_RENDER_VIEWPORTNODE_H +#ifndef QT3DRENDER_RENDER_VIEWPORTNODE_H +#define QT3DRENDER_RENDER_VIEWPORTNODE_H #include <Qt3DRenderer/private/framegraphnode_p.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QViewport; @@ -55,7 +55,7 @@ class ViewportNode : public FrameGraphNode public: ViewportNode(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; float xMin() const; void setXMin(float xMin); @@ -71,7 +71,7 @@ public: QColor clearColor() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: float m_xMin; @@ -83,9 +83,9 @@ private: QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport); -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_VIEWPORTNODE_H +#endif // QT3DRENDER_RENDER_VIEWPORTNODE_H diff --git a/src/render/backend/genericstate_p.h b/src/render/backend/genericstate_p.h index afd6f37c7..0235b8a50 100644 --- a/src/render/backend/genericstate_p.h +++ b/src/render/backend/genericstate_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_STATE_IMPLS_H -#define QT3D_RENDER_STATE_IMPLS_H +#ifndef QT3DRENDER_RENDER_STATE_IMPLS_H +#define QT3DRENDER_RENDER_STATE_IMPLS_H #include <QList> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { template <typename Derived, typename T> @@ -147,8 +147,8 @@ protected: Z m_6; }; -} // Render -} // Qt3D of namespace +} // namespace Render +} // namespace Qt3DRender of namespace QT_END_NAMESPACE diff --git a/src/render/backend/geometryrenderermanager.cpp b/src/render/backend/geometryrenderermanager.cpp index 9baaecb26..9acbfcd8f 100644 --- a/src/render/backend/geometryrenderermanager.cpp +++ b/src/render/backend/geometryrenderermanager.cpp @@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - - +namespace Qt3DRender { namespace Render { GeometryRendererManager::GeometryRendererManager() @@ -51,21 +49,20 @@ GeometryRendererManager::~GeometryRendererManager() { } -void GeometryRendererManager::addDirtyGeometryRenderer(const QNodeId &bufferId) +void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId) { if (!m_dirtyGeometryRenderers.contains(bufferId)) m_dirtyGeometryRenderers.push_back(bufferId); } -QVector<QNodeId> GeometryRendererManager::dirtyGeometryRenderers() +QVector<Qt3D::QNodeId> GeometryRendererManager::dirtyGeometryRenderers() { - QVector<QNodeId> vector(m_dirtyGeometryRenderers); + QVector<Qt3D::QNodeId> vector(m_dirtyGeometryRenderers); m_dirtyGeometryRenderers.clear(); return vector; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/geometryrenderermanager_p.h b/src/render/backend/geometryrenderermanager_p.h index 0fa26d5d7..f302b2c86 100644 --- a/src/render/backend/geometryrenderermanager_p.h +++ b/src/render/backend/geometryrenderermanager_p.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_GEOMETRYRENDERERMANAGER_H -#define QT3D_RENDER_GEOMETRYRENDERERMANAGER_H +#ifndef QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H +#define QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRenderer/private/rendergeometryrenderer_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class GeometryRendererManager : public QResourceManager< +class GeometryRendererManager : public Qt3D::QResourceManager< RenderGeometryRenderer, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -58,20 +58,19 @@ public: ~GeometryRendererManager(); // Aspect Thread - void addDirtyGeometryRenderer(const QNodeId &bufferId); - QVector<QNodeId> dirtyGeometryRenderers(); + void addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId); + QVector<Qt3D::QNodeId> dirtyGeometryRenderers(); private: - QVector<QNodeId> m_dirtyGeometryRenderers; + QVector<Qt3D::QNodeId> m_dirtyGeometryRenderers; }; -} // Render +} // namespace Render +} // namespace Qt3DRender -Q_DECLARE_RESOURCE_INFO(Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP); - -} // Qt3D +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE -#endif // QT3D_RENDER_GEOMETRYRENDERERMANAGER_H +#endif // QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 5681d6e3d..c2f071b45 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_HANDLE_TYPES_P_H -#define QT3D_RENDER_HANDLE_TYPES_P_H +#ifndef QT3DRENDER_RENDER_HANDLE_TYPES_P_H +#define QT3DRENDER_RENDER_HANDLE_TYPES_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qhandle.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QMatrix4x4; class QOpenGLVertexArrayObject; -namespace Qt3D { +namespace Qt3DRender { class TexImageData; @@ -74,37 +74,37 @@ class RenderAttribute; class RenderGeometry; class RenderGeometryRenderer; -typedef QHandle<RenderAttachment, 16> HAttachment; -typedef QHandle<RenderCameraLens, 8> HCamera; -typedef QHandle<RenderAnnotation, 16> HCriterion; -typedef QHandle<RenderEffect, 16> HEffect; -typedef QHandle<RenderEntity, 16> HEntity; -typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode; -typedef QHandle<RenderLayer, 16> HLayer; -typedef QHandle<RenderMaterial, 16> HMaterial; -typedef QHandle<QMatrix4x4, 16> HMatrix; -typedef QHandle<RenderShader, 16> HShader; -typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao; -typedef QHandle<RenderShader, 16> HShader; -typedef QHandle<SortCriterion, 8> HSortCriterion; -typedef QHandle<RenderTechnique, 16> HTechnique; -typedef QHandle<RenderTexture, 16> HTexture; -typedef QHandle<RenderTransform, 16> HTransform; -typedef QHandle<RenderTarget, 8> HTarget; -typedef QHandle<RenderRenderPass, 16> HRenderPass; -typedef QHandle<TexImageData, 16> HTextureData; -typedef QHandle<RenderParameter, 16> HParameter; -typedef QHandle<RenderShaderData, 16> HShaderData; -typedef QHandle<RenderTextureImage, 16> HTextureImage; -typedef QHandle<RenderBuffer, 16> HBuffer; -typedef QHandle<RenderAttribute, 16> HAttribute; -typedef QHandle<RenderGeometry, 16> HGeometry; -typedef QHandle<RenderGeometryRenderer, 16> HGeometryRenderer; +typedef Qt3D::QHandle<RenderAttachment, 16> HAttachment; +typedef Qt3D::QHandle<RenderCameraLens, 8> HCamera; +typedef Qt3D::QHandle<RenderAnnotation, 16> HCriterion; +typedef Qt3D::QHandle<RenderEffect, 16> HEffect; +typedef Qt3D::QHandle<RenderEntity, 16> HEntity; +typedef Qt3D::QHandle<FrameGraphNode *, 8> HFrameGraphNode; +typedef Qt3D::QHandle<RenderLayer, 16> HLayer; +typedef Qt3D::QHandle<RenderMaterial, 16> HMaterial; +typedef Qt3D::QHandle<QMatrix4x4, 16> HMatrix; +typedef Qt3D::QHandle<RenderShader, 16> HShader; +typedef Qt3D::QHandle<QOpenGLVertexArrayObject*, 16> HVao; +typedef Qt3D::QHandle<RenderShader, 16> HShader; +typedef Qt3D::QHandle<SortCriterion, 8> HSortCriterion; +typedef Qt3D::QHandle<RenderTechnique, 16> HTechnique; +typedef Qt3D::QHandle<RenderTexture, 16> HTexture; +typedef Qt3D::QHandle<RenderTransform, 16> HTransform; +typedef Qt3D::QHandle<RenderTarget, 8> HTarget; +typedef Qt3D::QHandle<RenderRenderPass, 16> HRenderPass; +typedef Qt3D::QHandle<TexImageData, 16> HTextureData; +typedef Qt3D::QHandle<RenderParameter, 16> HParameter; +typedef Qt3D::QHandle<RenderShaderData, 16> HShaderData; +typedef Qt3D::QHandle<RenderTextureImage, 16> HTextureImage; +typedef Qt3D::QHandle<RenderBuffer, 16> HBuffer; +typedef Qt3D::QHandle<RenderAttribute, 16> HAttribute; +typedef Qt3D::QHandle<RenderGeometry, 16> HGeometry; +typedef Qt3D::QHandle<RenderGeometryRenderer, 16> HGeometryRenderer; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_HANDLE_TYPES_P_H +#endif // QT3DRENDER_RENDER_HANDLE_TYPES_P_H diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/backend/jobs/framecleanupjob.cpp index b1d909626..91aa3bef2 100644 --- a/src/render/backend/jobs/framecleanupjob.cpp +++ b/src/render/backend/jobs/framecleanupjob.cpp @@ -43,8 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { FrameCleanupJob::FrameCleanupJob(Renderer *renderer) @@ -59,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob() void FrameCleanupJob::run() { // set each RenderShaderData to not need an update - Q_FOREACH (const QNodeId &id, RenderShaderData::updatedShaderDataList()) { + Q_FOREACH (const Qt3D::QNodeId &id, RenderShaderData::updatedShaderDataList()) { RenderShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id); if (shaderData != Q_NULLPTR) shaderData->clearUpdate(); @@ -71,8 +70,7 @@ void FrameCleanupJob::run() textureDataManager->cleanup(); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/framecleanupjob_p.h b/src/render/backend/jobs/framecleanupjob_p.h index 5e435cdd8..f200130e8 100644 --- a/src/render/backend/jobs/framecleanupjob_p.h +++ b/src/render/backend/jobs/framecleanupjob_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_FRAMECLEANUPJOB_H -#define QT3D_RENDER_FRAMECLEANUPJOB_H +#ifndef QT3DRENDER_RENDER_FRAMECLEANUPJOB_H +#define QT3DRENDER_RENDER_FRAMECLEANUPJOB_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -64,10 +64,10 @@ private: typedef QSharedPointer<FrameCleanupJob> FrameCleanupJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_FRAMECLEANUPJOB_H +#endif // QT3DRENDER_RENDER_FRAMECLEANUPJOB_H diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp index c402783cc..b573a5fdf 100644 --- a/src/render/backend/jobs/framepreparationjob.cpp +++ b/src/render/backend/jobs/framepreparationjob.cpp @@ -42,8 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { FramePreparationJob::FramePreparationJob(RenderEntity *root) @@ -64,11 +63,11 @@ void FramePreparationJob::run() void FramePreparationJob::parseNodeTree(RenderEntity *node) { // Initialize worldBoundingVolume if Mesh associated - Qt3D::Render::RenderGeometryRenderer *mesh = Q_NULLPTR; + Qt3DRender::Render::RenderGeometryRenderer *mesh = Q_NULLPTR; if ((node->localBoundingVolume()->isNull()) && (mesh = node->renderComponent<RenderGeometryRenderer>()) != Q_NULLPTR) { // if (!mesh->meshDataHandle().isNull()) { - // Qt3D::QMeshData *meshData = mesh->meshData(); + // Qt3DRender::QMeshData *meshData = mesh->meshData(); // if (meshData != Q_NULLPTR) { // const QAxisAlignedBoundingBox box = meshData->boundingBox(); // node->localBoundingVolume()->setCenter(box.center()); @@ -90,8 +89,7 @@ void FramePreparationJob::parseNodeTree(RenderEntity *node) parseNodeTree(child); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/framepreparationjob_p.h b/src/render/backend/jobs/framepreparationjob_p.h index 3ed69ad63..5de978639 100644 --- a/src/render/backend/jobs/framepreparationjob_p.h +++ b/src/render/backend/jobs/framepreparationjob_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_FRAMEPREPARATIONJOB_H -#define QT3D_RENDER_FRAMEPREPARATIONJOB_H +#ifndef QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H +#define QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H #include <Qt3DCore/qaspectjob.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -65,10 +65,10 @@ private: typedef QSharedPointer<FramePreparationJob> FramePreparationJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_FRAMEPREPARATIONJOB_H +#endif // QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H diff --git a/src/render/backend/jobs/loadbufferjob.cpp b/src/render/backend/jobs/loadbufferjob.cpp index 8bcdf4347..278dac9ff 100644 --- a/src/render/backend/jobs/loadbufferjob.cpp +++ b/src/render/backend/jobs/loadbufferjob.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -65,8 +65,8 @@ void LoadBufferJob::run() buffer->executeFunctor(); } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/loadbufferjob_p.h b/src/render/backend/jobs/loadbufferjob_p.h index b8e342b90..7ad43a8a0 100644 --- a/src/render/backend/jobs/loadbufferjob_p.h +++ b/src/render/backend/jobs/loadbufferjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LOADBUFFERJOB_H -#define QT3D_RENDER_LOADBUFFERJOB_H +#ifndef QT3DRENDER_RENDER_LOADBUFFERJOB_H +#define QT3DRENDER_RENDER_LOADBUFFERJOB_H #include <QSharedPointer> #include <Qt3DCore/qaspectjob.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -65,10 +65,10 @@ protected: typedef QSharedPointer<LoadBufferJob> LoadBufferJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_LOADBUFFERJOB_H +#endif // QT3DRENDER_RENDER_LOADBUFFERJOB_H diff --git a/src/render/backend/jobs/loadgeometryjob.cpp b/src/render/backend/jobs/loadgeometryjob.cpp index a5efb5d00..895ac3c34 100644 --- a/src/render/backend/jobs/loadgeometryjob.cpp +++ b/src/render/backend/jobs/loadgeometryjob.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -61,8 +61,8 @@ void LoadGeometryJob::run() geometryRenderer->executeFunctor(); } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/loadgeometryjob_p.h b/src/render/backend/jobs/loadgeometryjob_p.h index 6203e7d8a..493b1b694 100644 --- a/src/render/backend/jobs/loadgeometryjob_p.h +++ b/src/render/backend/jobs/loadgeometryjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LOADGEOMETRYJOB_H -#define QT3D_RENDER_LOADGEOMETRYJOB_H +#ifndef QT3DRENDER_RENDER_LOADGEOMETRYJOB_H +#define QT3DRENDER_RENDER_LOADGEOMETRYJOB_H #include <QSharedPointer> #include <Qt3DCore/qaspectjob.h> @@ -43,13 +43,13 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; -class LoadGeometryJob : public QAspectJob +class LoadGeometryJob : public Qt3D::QAspectJob { public: explicit LoadGeometryJob(const HGeometryRenderer &handle); @@ -65,10 +65,10 @@ protected: typedef QSharedPointer<LoadGeometryJob> LoadGeometryJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_LOADGEOMETRYJOB_H +#endif // QT3DRENDER_RENDER_LOADGEOMETRYJOB_H diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp index 169804e19..bae7afcc2 100644 --- a/src/render/backend/jobs/loadscenejob.cpp +++ b/src/render/backend/jobs/loadscenejob.cpp @@ -42,11 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { -LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent) +LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent) : QAspectJob() , m_renderer(Q_NULLPTR) , m_source(source) @@ -56,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent) void LoadSceneJob::run() { - QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); + Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); if (sceneTree == Q_NULLPTR) { Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) { if (parser->isExtensionSupported(m_source)) { @@ -71,8 +70,7 @@ void LoadSceneJob::run() scene->setSceneSubtree(sceneTree); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/loadscenejob_p.h b/src/render/backend/jobs/loadscenejob_p.h index 1497f7c9f..d4831d7ed 100644 --- a/src/render/backend/jobs/loadscenejob_p.h +++ b/src/render/backend/jobs/loadscenejob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LOADSCENEJOB_H -#define QT3D_RENDER_LOADSCENEJOB_H +#ifndef QT3DRENDER_RENDER_LOADSCENEJOB_H +#define QT3DRENDER_RENDER_LOADSCENEJOB_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -53,7 +53,7 @@ class Renderer; class LoadSceneJob : public Qt3D::QAspectJob { public: - explicit LoadSceneJob(const QUrl &source, const QNodeId &sceneComponent); + explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent); void setRenderer(Renderer *renderer) { m_renderer = renderer; } protected: @@ -62,14 +62,14 @@ protected: private: Renderer *m_renderer; QUrl m_source; - QNodeId m_sceneComponent; + Qt3D::QNodeId m_sceneComponent; }; typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/loadtexturedatajob.cpp b/src/render/backend/jobs/loadtexturedatajob.cpp index 7176f7ae2..ceb83cf53 100644 --- a/src/render/backend/jobs/loadtexturedatajob.cpp +++ b/src/render/backend/jobs/loadtexturedatajob.cpp @@ -42,11 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { -LoadTextureDataJob::LoadTextureDataJob(const QNodeId &textureId) +LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId) : m_textureId(textureId) { } @@ -127,8 +126,7 @@ void LoadTextureDataJob::run() } } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/loadtexturedatajob_p.h b/src/render/backend/jobs/loadtexturedatajob_p.h index 7e3af054b..15b32c79b 100644 --- a/src/render/backend/jobs/loadtexturedatajob_p.h +++ b/src/render/backend/jobs/loadtexturedatajob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LOADTEXTUREDATAJOB_H -#define QT3D_RENDER_LOADTEXTUREDATAJOB_H +#ifndef QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H +#define QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qaspectjob.h> @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; -class LoadTextureDataJob : public QAspectJob +class LoadTextureDataJob : public Qt3D::QAspectJob { public: - LoadTextureDataJob(const QNodeId &textureId); + LoadTextureDataJob(const Qt3D::QNodeId &textureId); ~LoadTextureDataJob(); inline void setRenderer(Renderer *renderer) { m_renderer = renderer; } @@ -60,16 +60,16 @@ protected: void run() Q_DECL_FINAL; private: - QNodeId m_textureId; + Qt3D::QNodeId m_textureId; Renderer *m_renderer; }; typedef QSharedPointer<LoadTextureDataJob> LoadTextureDataJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_LOADTEXTUREDATAJOB_H +#endif // QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp index 6819aed38..962bcaaa7 100644 --- a/src/render/backend/jobs/renderviewjob.cpp +++ b/src/render/backend/jobs/renderviewjob.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { void RenderViewJob::run() @@ -53,7 +53,7 @@ void RenderViewJob::run() // Create a RenderView object // The RenderView are created from a QFrameAllocator stored in the current Thread local storage - QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator(); + Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator(); RenderView *renderView = currentFrameAllocator->allocate<RenderView>(); // RenderView should allocate heap resources using only the currentFrameAllocator @@ -77,6 +77,6 @@ void RenderViewJob::run() } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/renderviewjob_p.h b/src/render/backend/jobs/renderviewjob_p.h index bbaa494b9..281928500 100644 --- a/src/render/backend/jobs/renderviewjob_p.h +++ b/src/render/backend/jobs/renderviewjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERVIEWJOB_H -#define QT3D_RENDER_RENDERVIEWJOB_H +#ifndef QT3DRENDER_RENDER_RENDERVIEWJOB_H +#define QT3DRENDER_RENDER_RENDERVIEWJOB_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qframeallocator.h> @@ -44,14 +44,14 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; class FrameGraphNode; -class RenderViewJob : public QAspectJob +class RenderViewJob : public Qt3D::QAspectJob { public: RenderViewJob() @@ -88,8 +88,8 @@ private: typedef QSharedPointer<RenderViewJob> RenderViewJobPtr; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERVIEWJOB_H +#endif // QT3DRENDER_RENDER_RENDERVIEWJOB_H diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp index 3cbb07d69..c4b2168f1 100644 --- a/src/render/backend/jobs/renderviewjobutils.cpp +++ b/src/render/backend/jobs/renderviewjobutils.cpp @@ -60,7 +60,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { /*! @@ -322,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri } void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, - const QList<QNodeId> ¶meterIds) + const QList<Qt3D::QNodeId> ¶meterIds) { Q_FOREACH (const QNodeId ¶mId, parameterIds) { RenderParameter *param = manager->lookupResource(paramId); @@ -434,6 +436,6 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(Render } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h index 6ac2c6b75..78ba67ff3 100644 --- a/src/render/backend/jobs/renderviewjobutils_p.h +++ b/src/render/backend/jobs/renderviewjobutils_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDERVIEWJOBUTILS_P_H -#define QT3D_RENDERVIEWJOBUTILS_P_H +#ifndef QT3DRENDER_RENDERVIEWJOBUTILS_P_H +#define QT3DRENDER_RENDERVIEWJOBUTILS_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qnodeid.h> @@ -45,9 +45,10 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - class QFrameAllocator; +} +namespace Qt3DRender { namespace Render { class FrameGraphNode; @@ -102,7 +103,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList * RenderTechnique *technique); Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, - const QList<QNodeId> ¶meterIds); + const QList<Qt3D::QNodeId> ¶meterIds); template<class T> void parametersFromParametersProvider(ParameterInfoList *infoList, @@ -117,7 +118,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i const QString &name); Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states, - QFrameAllocator *allocator); + Qt3D::QFrameAllocator *allocator); struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder @@ -139,10 +140,10 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender -Q_DECLARE_TYPEINFO(Qt3D::Render::ParameterInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(Qt3DRender::Render::ParameterInfo, Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif // QT3D_RENDERVIEWJOBUTILS_P_H +#endif // QT3DRENDER_RENDERVIEWJOBUTILS_P_H diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp index 49ddc9cc1..a346a0bee 100644 --- a/src/render/backend/jobs/updateboundingvolumejob.cpp +++ b/src/render/backend/jobs/updateboundingvolumejob.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { namespace { -void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node) +void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node) { - Qt3D::Render::RenderEntity *currentNode = node; + Qt3DRender::Render::RenderEntity *currentNode = node; QStack<int> childIndexStack; forever { @@ -68,15 +68,15 @@ void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node) return; // Initialize parent bounding volume to be equal to that of the first child - Qt3D::Render::RenderEntity *parentNode = currentNode->parent(); - Qt3D::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume(); + Qt3DRender::Render::RenderEntity *parentNode = currentNode->parent(); + Qt3DRender::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume(); *(parentBoundingVolume) = *(currentNode->worldBoundingVolume()); // Expand the parent bounding volume by each of remaining the siblings QVector<RenderEntity *> siblings = parentNode->children(); const int siblingCount = siblings.count(); for (int i = 1; i < siblingCount; ++i) { - Qt3D::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume(); + Qt3DRender::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume(); parentBoundingVolume->expandToContain(*siblingBoundingVolume); } @@ -111,6 +111,6 @@ void UpdateBoundingVolumeJob::run() } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/updateboundingvolumejob_p.h b/src/render/backend/jobs/updateboundingvolumejob_p.h index 52dca97c1..349ce1c13 100644 --- a/src/render/backend/jobs/updateboundingvolumejob_p.h +++ b/src/render/backend/jobs/updateboundingvolumejob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H -#define QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H +#ifndef QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H +#define QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H #include <Qt3DCore/qaspectjob.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class RenderEntity; @@ -63,8 +63,8 @@ private: typedef QSharedPointer<UpdateBoundingVolumeJob> UpdateBoundingVolumeJobPtr; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H +#endif // QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp index d019bb7d6..42ead834c 100644 --- a/src/render/backend/jobs/updateworldtransformjob.cpp +++ b/src/render/backend/jobs/updateworldtransformjob.cpp @@ -45,12 +45,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { namespace { -void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatrix4x4 &parentTransform) +void updateWorldTransformAndBounds(Qt3DRender::Render::RenderEntity *node, const QMatrix4x4 &parentTransform) { QMatrix4x4 worldTransform(parentTransform); RenderTransform *nodeTransform = node->renderComponent<RenderTransform>(); @@ -60,7 +60,7 @@ void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatr *(node->worldTransform()) = worldTransform; *(node->worldBoundingVolume()) = node->localBoundingVolume()->transformed(worldTransform); - Q_FOREACH (Qt3D::Render::RenderEntity *child, node->children()) + Q_FOREACH (Qt3DRender::Render::RenderEntity *child, node->children()) updateWorldTransformAndBounds(child, worldTransform); } @@ -93,6 +93,6 @@ void UpdateWorldTransformJob::run() } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/jobs/updateworldtransformjob_p.h b/src/render/backend/jobs/updateworldtransformjob_p.h index d863ef79c..168792dfc 100644 --- a/src/render/backend/jobs/updateworldtransformjob_p.h +++ b/src/render/backend/jobs/updateworldtransformjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H -#define QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H +#ifndef QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H +#define QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H #include <Qt3DCore/qaspectjob.h> @@ -43,12 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class RenderEntity; -class UpdateWorldTransformJob : public QAspectJob +class UpdateWorldTransformJob : public Qt3D::QAspectJob { public: explicit UpdateWorldTransformJob(RenderEntity *node); @@ -63,8 +63,8 @@ private: typedef QSharedPointer<UpdateWorldTransformJob> UpdateWorldTransformJobPtr; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H +#endif // QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 7f156688c..c1de8c707 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_MANAGERS_P_H -#define QT3D_RENDER_MANAGERS_P_H +#ifndef QT3DRENDER_RENDER_MANAGERS_P_H +#define QT3DRENDER_RENDER_MANAGERS_P_H #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRenderer/private/renderattachment_p.h> @@ -62,13 +62,13 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class AttachmentManager : public QResourceManager< +class AttachmentManager : public Qt3D::QResourceManager< RenderAttachment, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -77,9 +77,9 @@ public: AttachmentManager() {} }; -class CameraManager : public QResourceManager< +class CameraManager : public Qt3D::QResourceManager< RenderCameraLens, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -87,9 +87,9 @@ public: CameraManager() {} }; -class CriterionManager : public QResourceManager< +class CriterionManager : public Qt3D::QResourceManager< RenderAnnotation, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -99,9 +99,9 @@ public: CriterionManager() {} }; -class EffectManager : public QResourceManager< +class EffectManager : public Qt3D::QResourceManager< RenderEffect, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -110,15 +110,15 @@ public: EffectManager() {} }; -class EntityManager : public QResourceManager<RenderEntity, QNodeId, 16> +class EntityManager : public Qt3D::QResourceManager<RenderEntity, Qt3D::QNodeId, 16> { public: EntityManager() {} }; -class FrameGraphManager : public QResourceManager< +class FrameGraphManager : public Qt3D::QResourceManager< FrameGraphNode *, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -126,9 +126,9 @@ public: FrameGraphManager() {} }; -class LayerManager : public QResourceManager< +class LayerManager : public Qt3D::QResourceManager< RenderLayer, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -137,9 +137,9 @@ public: LayerManager() {} }; -class MaterialManager : public QResourceManager< +class MaterialManager : public Qt3D::QResourceManager< RenderMaterial, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -148,15 +148,15 @@ public: MaterialManager() {} }; -class MatrixManager : public QResourceManager<QMatrix4x4, QNodeId, 16> +class MatrixManager : public Qt3D::QResourceManager<QMatrix4x4, Qt3D::QNodeId, 16> { public: MatrixManager() {} }; -class ShaderManager : public QResourceManager< +class ShaderManager : public Qt3D::QResourceManager< RenderShader, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -165,9 +165,9 @@ public: ShaderManager() {} }; -class SortCriterionManager : public QResourceManager< +class SortCriterionManager : public Qt3D::QResourceManager< SortCriterion, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -176,9 +176,9 @@ public: SortCriterionManager() {} }; -class TechniqueManager : public QResourceManager< +class TechniqueManager : public Qt3D::QResourceManager< RenderTechnique, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -187,9 +187,9 @@ public: TechniqueManager() {} }; -class TextureManager : public QResourceManager< +class TextureManager : public Qt3D::QResourceManager< RenderTexture, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -198,9 +198,9 @@ public: TextureManager() {} }; -class TransformManager : public QResourceManager< +class TransformManager : public Qt3D::QResourceManager< RenderTransform, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -209,7 +209,7 @@ public: TransformManager() {} }; -class VAOManager : public QResourceManager< +class VAOManager : public Qt3D::QResourceManager< QOpenGLVertexArrayObject *, QPair<HGeometry, HShader>, 16> @@ -218,9 +218,9 @@ public: VAOManager() {} }; -class RenderTargetManager : public QResourceManager< +class RenderTargetManager : public Qt3D::QResourceManager< RenderTarget, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -229,9 +229,9 @@ public: RenderTargetManager() {} }; -class RenderPassManager : public QResourceManager< +class RenderPassManager : public Qt3D::QResourceManager< RenderRenderPass, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -241,9 +241,9 @@ public: }; -class ParameterManager : public QResourceManager< +class ParameterManager : public Qt3D::QResourceManager< RenderParameter, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -252,9 +252,9 @@ public: ParameterManager() {} }; -class ShaderDataManager : public QResourceManager< +class ShaderDataManager : public Qt3D::QResourceManager< RenderShaderData, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -263,7 +263,7 @@ public: ShaderDataManager() {} }; -class UBOManager : public QResourceManager< +class UBOManager : public Qt3D::QResourceManager< UniformBuffer, ShaderDataShaderUboKey, 16, @@ -272,53 +272,52 @@ class UBOManager : public QResourceManager< { }; -class TextureImageManager : public QResourceManager< +class TextureImageManager : public Qt3D::QResourceManager< RenderTextureImage, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> { }; -class AttributeManager : public QResourceManager< +class AttributeManager : public Qt3D::QResourceManager< RenderAttribute, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> { }; -class GeometryManager : public QResourceManager< +class GeometryManager : public Qt3D::QResourceManager< RenderGeometry, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> { }; -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderAnnotation, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderEffect, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderEntity, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderLayer, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderMaterial, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderShader, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::SortCriterion, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderTarget, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderTechnique, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderTexture, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderTextureImage, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderAttribute, Q_REQUIRES_CLEANUP); -Q_DECLARE_RESOURCE_INFO(Render::RenderGeometry, Q_REQUIRES_CLEANUP); - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender + +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderAnnotation, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderEffect, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderEntity, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderLayer, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderMaterial, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderShader, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::SortCriterion, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTarget, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTechnique, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTexture, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderRenderPass, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTextureImage, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderAttribute, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderGeometry, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE -#endif // QT3D_RENDER_MANAGERS_P_H +#endif // QT3DRENDER_RENDER_MANAGERS_P_H diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index cd846760c..3d6553363 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { ParameterPack::ParameterPack() @@ -56,25 +55,24 @@ void ParameterPack::clear() m_peers.clear(); } -void ParameterPack::appendParameter(const QNodeId ¶meterId) +void ParameterPack::appendParameter(const Qt3D::QNodeId ¶meterId) { if (!m_peers.contains(parameterId)) { m_peers.append(parameterId); } } -void ParameterPack::removeParameter(const QNodeId ¶meterId) +void ParameterPack::removeParameter(const Qt3D::QNodeId ¶meterId) { m_peers.removeOne(parameterId); } -QList<QNodeId> ParameterPack::parameters() const +QList<Qt3D::QNodeId> ParameterPack::parameters() const { return m_peers; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h index 64ed7d46a..fc52a1df0 100644 --- a/src/render/backend/parameterpack_p.h +++ b/src/render/backend/parameterpack_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_PARAMETERPACK_H -#define QT3D_RENDER_PARAMETERPACK_H +#ifndef QT3DRENDER_RENDER_PARAMETERPACK_H +#define QT3DRENDER_RENDER_PARAMETERPACK_H #include <Qt3DCore/qnodeid.h> #include <QList> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -52,18 +52,18 @@ public: ParameterPack(); ~ParameterPack(); void clear(); - void appendParameter(const QNodeId ¶meterId); - void removeParameter(const QNodeId ¶meterId); - QList<QNodeId> parameters() const; + void appendParameter(const Qt3D::QNodeId ¶meterId); + void removeParameter(const Qt3D::QNodeId ¶meterId); + QList<Qt3D::QNodeId> parameters() const; private: - QList<QNodeId> m_peers; + QList<Qt3D::QNodeId> m_peers; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_PARAMETERPACK_H +#endif // QT3DRENDER_RENDER_PARAMETERPACK_H diff --git a/src/render/backend/platformsurfacefilter.cpp b/src/render/backend/platformsurfacefilter.cpp index 596d3845d..fec56ee3e 100644 --- a/src/render/backend/platformsurfacefilter.cpp +++ b/src/render/backend/platformsurfacefilter.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { PlatformSurfaceFilter::PlatformSurfaceFilter(Renderer *renderer, @@ -113,6 +113,6 @@ void PlatformSurfaceFilter::setRendererSurface(QSurface *surface) } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/platformsurfacefilter_p.h b/src/render/backend/platformsurfacefilter_p.h index 70ef03f24..187feb637 100644 --- a/src/render/backend/platformsurfacefilter_p.h +++ b/src/render/backend/platformsurfacefilter_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_PLATFORMSURFACEFILTER_H -#define QT3D_RENDER_PLATFORMSURFACEFILTER_H +#ifndef QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H +#define QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H #include <QtCore/qobject.h> #include <QtGui/qsurface.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QOffscreenSurface; class QWindow; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; @@ -89,8 +89,8 @@ private: }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_PLATFORMSURFACEFILTER_H +#endif // QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp index 846f240c7..1de6fb67f 100644 --- a/src/render/backend/qgraphicscontext.cpp +++ b/src/render/backend/qgraphicscontext.cpp @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { static QHash<unsigned int, QGraphicsContext*> static_contexts; @@ -1085,7 +1085,7 @@ GLint QGraphicsContext::glDataTypeFromAttributeDataType(QAttribute::DataType dat return GL_FLOAT; } -} // Render -} // Qt3D of namespace +} // namespace Render +} // namespace Qt3DRender of namespace QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicscontext_p.h b/src/render/backend/qgraphicscontext_p.h index afffbf4ec..66376984e 100644 --- a/src/render/backend/qgraphicscontext_p.h +++ b/src/render/backend/qgraphicscontext_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSCONTEXT_H -#define QT3D_RENDER_QGRAPHICSCONTEXT_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H +#define QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H #include <QOpenGLContext> #include <QOpenGLFunctions> @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; class QAbstractOpenGLFunctions; -namespace Qt3D { +namespace Qt3DRender { class QOpenGLFilter; @@ -216,7 +216,7 @@ private: RenderShader *m_activeShader; QHash<ProgramDNA, RenderShader *> m_renderShaderHash; QHash<RenderBuffer *, QOpenGLBuffer> m_renderBufferHash; - QHash<QNodeId, GLuint> m_renderTargets; + QHash<Qt3D::QNodeId, GLuint> m_renderTargets; QHash<GLuint, QSize> m_renderTargetsSize; // active textures, indexed by texture unit @@ -243,9 +243,9 @@ private: bool m_supportsVAO; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QGRAPHICSCONTEXT_H +#endif // QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H diff --git a/src/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp index 9484c6162..4d4b38578 100644 --- a/src/render/backend/qgraphicshelperes2.cpp +++ b/src/render/backend/qgraphicshelperes2.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE #define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 #endif -namespace Qt3D { +namespace Qt3DRender { namespace Render { QGraphicsHelperES2::QGraphicsHelperES2() : @@ -554,7 +554,7 @@ QSize QGraphicsHelperES2::getTextureDimensions(GLuint textureId, GLenum target, return QSize(0, 0); } -} // Render -} //Qt3D +} // namespace Render +} // namespace Qt3D QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicshelperes2_p.h b/src/render/backend/qgraphicshelperes2_p.h index 843cc3d20..21d53a166 100644 --- a/src/render/backend/qgraphicshelperes2_p.h +++ b/src/render/backend/qgraphicshelperes2_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERES2_H -#define QT3D_RENDER_QGRAPHICSHELPERES2_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <QOpenGLContext> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsHelperES2 : public QGraphicsHelperInterface @@ -99,9 +99,9 @@ private: bool m_isES3; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QGRAPHICSHELPERES2_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H diff --git a/src/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp index 51f2dc32c..f737cde78 100644 --- a/src/render/backend/qgraphicshelpergl2.cpp +++ b/src/render/backend/qgraphicshelpergl2.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { QGraphicsHelperGL2::QGraphicsHelperGL2() @@ -560,8 +560,8 @@ QSize QGraphicsHelperGL2::getTextureDimensions(GLuint textureId, GLenum target, return QSize(width, height); } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl2_p.h b/src/render/backend/qgraphicshelpergl2_p.h index 105c9aeb6..af35496f6 100644 --- a/src/render/backend/qgraphicshelpergl2_p.h +++ b/src/render/backend/qgraphicshelpergl2_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERGL2_H -#define QT3D_RENDER_QGRAPHICSHELPERGL2_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFunctions_2_0; class QOpenGLExtension_ARB_framebuffer_object; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsHelperGL2 : public QGraphicsHelperInterface @@ -101,11 +101,11 @@ private: QOpenGLExtension_ARB_framebuffer_object *m_fboFuncs; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE #endif // !QT_OPENGL_ES_2 -#endif // QT3D_RENDER_QGRAPHICSHELPERGL2_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H diff --git a/src/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp index bc792ad1e..9a81a967f 100644 --- a/src/render/backend/qgraphicshelpergl3.cpp +++ b/src/render/backend/qgraphicshelpergl3.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { QGraphicsHelperGL3::QGraphicsHelperGL3() @@ -921,8 +921,8 @@ QSize QGraphicsHelperGL3::getTextureDimensions(GLuint textureId, GLenum target, return QSize(width, height); } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl3_3.cpp b/src/render/backend/qgraphicshelpergl3_3.cpp index 9190dcf1f..7d849b7f4 100644 --- a/src/render/backend/qgraphicshelpergl3_3.cpp +++ b/src/render/backend/qgraphicshelpergl3_3.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { QGraphicsHelperGL3_3::QGraphicsHelperGL3_3() @@ -918,8 +918,8 @@ QSize QGraphicsHelperGL3_3::getTextureDimensions(GLuint textureId, GLenum target return QSize(width, height); } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl3_3_p.h b/src/render/backend/qgraphicshelpergl3_3_p.h index feeadde08..e91adbb1b 100644 --- a/src/render/backend/qgraphicshelpergl3_3_p.h +++ b/src/render/backend/qgraphicshelpergl3_3_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H -#define QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFunctions_3_3_Core; class QOpenGLExtension_ARB_tessellation_shader; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsHelperGL3_3 : public QGraphicsHelperInterface @@ -102,11 +102,11 @@ private: QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE #endif // !QT_OPENGL_ES_2 -#endif // QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H diff --git a/src/render/backend/qgraphicshelpergl3_p.h b/src/render/backend/qgraphicshelpergl3_p.h index 4b4c8f408..55f46cdec 100644 --- a/src/render/backend/qgraphicshelpergl3_p.h +++ b/src/render/backend/qgraphicshelpergl3_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERGL3_H -#define QT3D_RENDER_QGRAPHICSHELPERGL3_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFunctions_3_2_Core; class QOpenGLExtension_ARB_tessellation_shader; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsHelperGL3 : public QGraphicsHelperInterface @@ -102,11 +102,11 @@ private: QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE #endif // !QT_OPENGL_ES_2 -#endif // QT3D_RENDER_QGRAPHICSHELPERGL3_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H diff --git a/src/render/backend/qgraphicshelpergl4.cpp b/src/render/backend/qgraphicshelpergl4.cpp index 18df9accd..0f998c556 100644 --- a/src/render/backend/qgraphicshelpergl4.cpp +++ b/src/render/backend/qgraphicshelpergl4.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { QGraphicsHelperGL4::QGraphicsHelperGL4() @@ -905,8 +905,8 @@ QSize QGraphicsHelperGL4::getTextureDimensions(GLuint textureId, GLenum target, return QSize(width, height); } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/qgraphicshelpergl4_p.h b/src/render/backend/qgraphicshelpergl4_p.h index 32b300bde..26a40ec4c 100644 --- a/src/render/backend/qgraphicshelpergl4_p.h +++ b/src/render/backend/qgraphicshelpergl4_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERGL4_H -#define QT3D_RENDER_QGRAPHICSHELPERGL4_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFunctions_4_3_Core; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsHelperGL4 : public QGraphicsHelperInterface @@ -100,11 +100,11 @@ private: QOpenGLFunctions_4_3_Core *m_funcs; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE #endif // !QT_OPENGL_ES_2 -#endif // QT3D_RENDER_QGRAPHICSHELPERGL4_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H diff --git a/src/render/backend/qgraphicshelperinterface_p.h b/src/render/backend/qgraphicshelperinterface_p.h index db2684dce..5a0ff8a43 100644 --- a/src/render/backend/qgraphicshelperinterface_p.h +++ b/src/render/backend/qgraphicshelperinterface_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H -#define QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H +#define QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H #include <QOpenGLFunctions> #include <QOpenGLTexture> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { struct Attachment; @@ -106,9 +106,9 @@ public: }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H +#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H diff --git a/src/render/backend/qgraphicsutils_p.h b/src/render/backend/qgraphicsutils_p.h index 9bb98e4a8..42ab19204 100644 --- a/src/render/backend/qgraphicsutils_p.h +++ b/src/render/backend/qgraphicsutils_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QGRAPHICSUTILS_P_H -#define QT3D_RENDER_QGRAPHICSUTILS_P_H +#ifndef QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H +#define QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/private/shadervariables_p.h> @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -387,10 +387,10 @@ public: }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QGRAPHICSUTILS_P_H +#endif // QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H diff --git a/src/render/backend/qraycastingservice.cpp b/src/render/backend/qraycastingservice.cpp index 56566f19a..ccfbb34a6 100644 --- a/src/render/backend/qraycastingservice.cpp +++ b/src/render/backend/qraycastingservice.cpp @@ -48,10 +48,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; -QCollisionQueryResult QRayCastingServicePrivate::collides(const QRay3D &ray, QBoundingVolumeProvider *provider, - QAbstractCollisionQueryService::QueryMode mode, const QQueryHandle &handle) +namespace Qt3DRender { + +QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3D::QRay3D &ray, Qt3D::QBoundingVolumeProvider *provider, + Qt3D::QAbstractCollisionQueryService::QueryMode mode, const Qt3D::QQueryHandle &handle) { Q_Q(QRayCastingService); @@ -95,13 +97,13 @@ QRayCastingServicePrivate::QRayCastingServicePrivate(const QString &description, { } -QRayCastingService::QRayCastingService(QBoundingVolumeProvider *provider) +QRayCastingService::QRayCastingService(Qt3D::QBoundingVolumeProvider *provider) : QAbstractCollisionQueryService(*new QRayCastingServicePrivate(QStringLiteral("Collision detection service using Ray Casting"), provider)) { } -QQueryHandle QRayCastingService::query(const QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode) +Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode) { Q_D(QRayCastingService); @@ -115,14 +117,14 @@ QQueryHandle QRayCastingService::query(const QRay3D &ray, QAbstractCollisionQuer return handle; } -QCollisionQueryResult QRayCastingService::fetchResult(const QQueryHandle &handle) +Qt3D::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3D::QQueryHandle &handle) { Q_D(QRayCastingService); return d->m_results.value(handle).result(); } -QVector<QCollisionQueryResult> QRayCastingService::fetchAllResults() const +QVector<Qt3D::QCollisionQueryResult> QRayCastingService::fetchAllResults() const { Q_D(const QRayCastingService); @@ -136,6 +138,6 @@ QVector<QCollisionQueryResult> QRayCastingService::fetchAllResults() const return results; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/qraycastingservice.h b/src/render/backend/qraycastingservice.h index 4ae2b817e..0dbb93863 100644 --- a/src/render/backend/qraycastingservice.h +++ b/src/render/backend/qraycastingservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QRAYCASTINGSERVICE_H -#define QT3D_RENDER_QRAYCASTINGSERVICE_H +#ifndef QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H +#define QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H #include <Qt3DRenderer/qt3drenderer_global.h> @@ -44,19 +44,22 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - class QBoundingVolumeProvider; +} + +namespace Qt3DRender { + class QRayCastingServicePrivate; -class QT3DRENDERERSHARED_EXPORT QRayCastingService : public QAbstractCollisionQueryService +class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3D::QAbstractCollisionQueryService { public: - explicit QRayCastingService(QBoundingVolumeProvider *provider); + explicit QRayCastingService(Qt3D::QBoundingVolumeProvider *provider); - QQueryHandle query(const QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE; + Qt3D::QQueryHandle query(const Qt3D::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE; - QCollisionQueryResult fetchResult(const QQueryHandle &handle) Q_DECL_OVERRIDE; - QVector<QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE; + Qt3D::QCollisionQueryResult fetchResult(const Qt3D::QQueryHandle &handle) Q_DECL_OVERRIDE; + QVector<Qt3D::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE; protected: QRayCastingService(QRayCastingServicePrivate &dd); @@ -66,8 +69,8 @@ private: Q_DECLARE_PRIVATE(QRayCastingService) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QRAYCASTINGSERVICE_H +#endif // QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H diff --git a/src/render/backend/qraycastingservice_p.h b/src/render/backend/qraycastingservice_p.h index d9ed92323..90afe64ca 100644 --- a/src/render/backend/qraycastingservice_p.h +++ b/src/render/backend/qraycastingservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRAYCASTINGSERVICE_P_H -#define QT3D_QRAYCASTINGSERVICE_P_H +#ifndef QT3DRENDER_QRAYCASTINGSERVICE_P_H +#define QT3DRENDER_QRAYCASTINGSERVICE_P_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qabstractcollisionqueryservice.h> @@ -49,36 +49,41 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - -class QBoundingVolumeProvider; class QBoundingVolume; -typedef QFuture<QCollisionQueryResult> FutureQueryResult; +class QBoundingVolumeProvider; +} + +namespace Qt3DRender { + +typedef QFuture<Qt3D::QCollisionQueryResult> FutureQueryResult; -class QRayCastingServicePrivate : public QAbstractCollisionQueryServicePrivate +class QRayCastingServicePrivate : public Qt3D::QAbstractCollisionQueryServicePrivate { public: - QRayCastingServicePrivate(const QString &description, QBoundingVolumeProvider *provider); + QRayCastingServicePrivate(const QString &description, Qt3D::QBoundingVolumeProvider *provider); - QCollisionQueryResult collides(const QRay3D &ray, QBoundingVolumeProvider *provider, - QAbstractCollisionQueryService::QueryMode mode, const QQueryHandle &handle); + Qt3D::QCollisionQueryResult collides(const Qt3D::QRay3D &ray, + Qt3D::QBoundingVolumeProvider *provider, + Qt3D::QAbstractCollisionQueryService::QueryMode mode, + const Qt3D::QQueryHandle &handle); Q_DECLARE_PUBLIC(QRayCastingService) struct Query { - QQueryHandle handle; - QRay3D ray; + Qt3D::QQueryHandle handle; + Qt3D::QRay3D ray; QRayCastingService::QueryMode mode; }; - QHash<QQueryHandle, FutureQueryResult> m_results; + QHash<Qt3D::QQueryHandle, FutureQueryResult> m_results; QAtomicInt m_handlesCount; - QBoundingVolumeProvider *m_boundingProvider; + Qt3D::QBoundingVolumeProvider *m_boundingProvider; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRAYCASTINGSERVICE_P_H +#endif // QT3DRENDER_QRAYCASTINGSERVICE_P_H diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index 1c68454f5..b24e0445b 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -121,7 +121,9 @@ static void initResources() QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! \class Qt3D::QRenderAspectPrivate @@ -136,7 +138,7 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) , m_initialized(false) { initResources(); - m_aspectType = QAbstractAspect::AspectRenderer; + m_aspectType = Qt3D::QAbstractAspect::AspectRenderer; } void QRenderAspectPrivate::setSurface(QSurface *surface) @@ -199,18 +201,18 @@ QRenderAspect::QRenderAspect(QRenderAspectPrivate &dd, QObject *parent) void QRenderAspect::registerBackendTypes() { Q_D(QRenderAspect); - registerBackendType<QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); - registerBackendType<QTransform>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTransform, Render::TransformManager>(d->m_renderer->transformManager()))); + registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); + registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTransform, Render::TransformManager>(d->m_renderer->transformManager()))); registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderMaterial, Render::MaterialManager>(d->m_renderer->materialManager()))); registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTechnique, Render::TechniqueManager>(d->m_renderer->techniqueManager()))); registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::RenderTextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager()))); registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderShader, Render::ShaderManager>(d->m_renderer->shaderManager()))); registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderEffect, Render::EffectManager>(d->m_renderer->effectManager()))); registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderAnnotation, Render::CriterionManager>(d->m_renderer->criterionManager()))); - registerBackendType<QCameraLens>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); + registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderLayer, Render::LayerManager>(d->m_renderer->layerManager()))); registerBackendType<QRenderPass>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderRenderPass, Render::RenderPassManager>(d->m_renderer->renderPassManager()))); - registerBackendType<Render::QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager()))); + registerBackendType<QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager()))); registerBackendType<QRenderTarget>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTarget, Render::RenderTargetManager>(d->m_renderer->renderTargetManager()))); registerBackendType<QRenderAttachment>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderAttachment, Render::AttachmentManager>(d->m_renderer->attachmentManager()))); registerBackendType<QSortCriterion>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::SortCriterion, Render::SortCriterionManager>(d->m_renderer->sortCriterionManager()))); @@ -256,7 +258,7 @@ void QRenderAspect::renderShutdown() d->m_renderer->shutdown(); } -QVector<QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) +QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) { Q_D(QRenderAspect); d->m_time = time; @@ -319,7 +321,7 @@ QVector<QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) return jobs; } -void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e) +void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -328,7 +330,7 @@ void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e) visitor.traverse(n, this, &QRenderAspect::visitNode); } -void QRenderAspect::sceneNodeRemoved(QSceneChangePtr &e) +void QRenderAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -342,7 +344,7 @@ qint64 QRenderAspect::time() const return d->m_time; } -void QRenderAspect::setRootEntity(QEntity *rootObject) +void QRenderAspect::setRootEntity(Qt3D::QEntity *rootObject) { // setSceneGraphRoot is synchronized using the Renderer's mutex Q_D(QRenderAspect); @@ -360,7 +362,7 @@ void QRenderAspect::onInitialize(const QVariantMap &data) // Register the VSyncFrameAdvanceService to drive the aspect manager loop // depending on the vsync - services()->registerServiceProvider(QServiceLocator::FrameAdvanceService, + services()->registerServiceProvider(Qt3D::QServiceLocator::FrameAdvanceService, d->m_renderer->vsyncFrameAdvanceService()); d->m_renderer->setQRenderAspect(this); @@ -392,13 +394,13 @@ void QRenderAspect::onCleanup() d->m_renderer = Q_NULLPTR; } -void QRenderAspect::visitNode(QNode *node) +void QRenderAspect::visitNode(Qt3D::QNode *node) { QAbstractAspect::createBackendNode(node); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -QT3D_REGISTER_NAMESPACED_ASPECT("render", QT_PREPEND_NAMESPACE(Qt3D), QRenderAspect) +QT3D_REGISTER_NAMESPACED_ASPECT("render", QT_PREPEND_NAMESPACE(Qt3DRender), QRenderAspect) diff --git a/src/render/backend/qrenderaspect.h b/src/render/backend/qrenderaspect.h index 047498fc0..180424565 100644 --- a/src/render/backend/qrenderaspect.h +++ b/src/render/backend/qrenderaspect.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERASPECT_H -#define QT3D_QRENDERASPECT_H +#ifndef QT3DRENDER_QRENDERASPECT_H +#define QT3DRENDER_QRENDERASPECT_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qabstractaspect.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QOpenGLContext; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; @@ -52,7 +52,7 @@ class Renderer; class QRenderAspectPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAspect : public QAbstractAspect +class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3D::QAbstractAspect { Q_OBJECT public: @@ -68,10 +68,10 @@ public: void renderSynchronous(); void renderShutdown(); - QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; qint64 time() const; @@ -79,13 +79,13 @@ protected: void registerBackendTypes(); private: - void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(QNode *node); + void visitNode(Qt3D::QNode *node); Q_DECLARE_PRIVATE(QRenderAspect) QRenderAspect(QRenderAspectPrivate &dd, QObject *parent); @@ -97,4 +97,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QRENDERASPECT_H +#endif // QT3DRENDER_QRENDERASPECT_H diff --git a/src/render/backend/qrenderaspect_p.h b/src/render/backend/qrenderaspect_p.h index 610015ff5..2de526f41 100644 --- a/src/render/backend/qrenderaspect_p.h +++ b/src/render/backend/qrenderaspect_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERASPECT_P_H -#define QT3D_QRENDERASPECT_P_H +#ifndef QT3DRENDER_QRENDERASPECT_P_H +#define QT3DRENDER_QRENDERASPECT_P_H #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DRenderer/qrenderaspect.h> @@ -49,13 +49,13 @@ QT_BEGIN_NAMESPACE class QSurface; -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; } -class QRenderAspectPrivate : public QAbstractAspectPrivate +class QRenderAspectPrivate : public Qt3D::QAbstractAspectPrivate { QRenderAspectPrivate(QRenderAspect::RenderType type); @@ -82,4 +82,4 @@ class QRenderAspectPrivate : public QAbstractAspectPrivate QT_END_NAMESPACE -#endif // QT3D_QRENDERASPECT_P_H +#endif // QT3DRENDER_QRENDERASPECT_P_H diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index d88798765..ae355e83d 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -49,14 +49,14 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { QUniformValue::QUniformValue() { } -QUniformValue *QUniformValue::fromVariant(const QVariant &v, QFrameAllocator *allocator) +QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator) { QUniformValue *u = allocator->allocate<QUniformValue>(); u->m_var = v; @@ -88,7 +88,7 @@ void QUniformPack::setUniform(const QString &glslName, const QUniformValue *val) m_uniforms.insert(glslName, val); } -void QUniformPack::setTexture(const QString &glslName, const QNodeId &texId) +void QUniformPack::setTexture(const QString &glslName, const Qt3D::QNodeId &texId) { for (int t=0; t<m_textures.size(); ++t) { if (m_textures[t].glslName != glslName) { @@ -125,6 +125,6 @@ void TextureUniform::apply(QGraphicsContext *ctx, const ShaderUniform &descripti } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index 4669ddcda..6f4b96624 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QUNIFORMVALUE_H -#define QT3D_RENDER_QUNIFORMVALUE_H +#ifndef QT3DRENDER_RENDER_QUNIFORMVALUE_H +#define QT3DRENDER_RENDER_QUNIFORMVALUE_H #include <QVariant> #include <QByteArray> @@ -51,9 +51,10 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; namespace Qt3D { - class QFrameAllocator; +} +namespace Qt3DRender { namespace Render { class QGraphicsContext; @@ -67,7 +68,7 @@ public: QUniformValue(); virtual ~QUniformValue() {} - static QUniformValue *fromVariant(const QVariant &v, QFrameAllocator *allocator); + static QUniformValue *fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator); virtual bool operator ==(const QUniformValue &other); bool operator !=(const QUniformValue &other); @@ -97,12 +98,12 @@ public : return true; } - void setTextureId(const QNodeId &id) + void setTextureId(const Qt3D::QNodeId &id) { m_textureId = id; } - QNodeId textureId() const { return m_textureId; } + Qt3D::QNodeId textureId() const { return m_textureId; } bool operator ==(const QUniformValue &other) Q_DECL_OVERRIDE { @@ -119,13 +120,13 @@ public : void apply(QGraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE; private: - QNodeId m_textureId; + Qt3D::QNodeId m_textureId; int m_textureUnit; }; struct BlockToUBO { int m_blockIndex; - QNodeId m_shaderDataID; + Qt3D::QNodeId m_shaderDataID; bool m_needsUpdate; QHash<QString, QVariant> m_updatedProperties; }; @@ -136,7 +137,7 @@ public: ~QUniformPack(); void setUniform(const QString &glslName, const QUniformValue *val); - void setTexture(const QString &glslName, const QNodeId &id); + void setTexture(const QString &glslName, const Qt3D::QNodeId &id); void setUniformBuffer(const BlockToUBO &blockToUBO); inline const QHash<QString, const QUniformValue* > &uniforms() const { return m_uniforms; } @@ -145,13 +146,13 @@ public: struct NamedTexture { NamedTexture() {} - NamedTexture(const QString &nm, const QNodeId &t) + NamedTexture(const QString &nm, const Qt3D::QNodeId &t) : glslName(nm) , texId(t) { } QString glslName; - QNodeId texId; + Qt3D::QNodeId texId; }; inline QVector<NamedTexture> textures() const { return m_textures; } @@ -166,9 +167,9 @@ private: friend class RenderView; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QUNIFORMVALUE_H +#endif // QT3DRENDER_RENDER_QUNIFORMVALUE_H diff --git a/src/render/backend/renderannotation.cpp b/src/render/backend/renderannotation.cpp index d8832090d..bf14552a0 100644 --- a/src/render/backend/renderannotation.cpp +++ b/src/render/backend/renderannotation.cpp @@ -39,8 +39,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderAnnotation::RenderAnnotation() @@ -57,7 +58,7 @@ void RenderAnnotation::cleanup() { } -void RenderAnnotation::updateFromPeer(QNode *peer) +void RenderAnnotation::updateFromPeer(Qt3D::QNode *peer) { QAnnotation *criterion = static_cast<QAnnotation *>(peer); @@ -77,7 +78,7 @@ QString RenderAnnotation::criterionName() const return m_name; } -void RenderAnnotation::sceneChangeEvent(const QSceneChangePtr &e) +void RenderAnnotation::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("value")) @@ -99,8 +100,7 @@ bool RenderAnnotation::operator !=(const RenderAnnotation &other) return !operator ==(other); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderannotation_p.h b/src/render/backend/renderannotation_p.h index 70f6641ce..18fc6c0c8 100644 --- a/src/render/backend/renderannotation_p.h +++ b/src/render/backend/renderannotation_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERANNOTATION_P_H -#define QT3D_RENDER_RENDERANNOTATION_P_H +#ifndef QT3DRENDER_RENDER_RENDERANNOTATION_P_H +#define QT3DRENDER_RENDER_RENDERANNOTATION_P_H #include <Qt3DRenderer/qannotation.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAnnotation; @@ -50,17 +50,17 @@ namespace Render { class CriterionManager; -class RenderAnnotation : public QBackendNode +class RenderAnnotation : public Qt3D::QBackendNode { public: RenderAnnotation(); ~RenderAnnotation(); void cleanup(); - void updateFromPeer(QNode *criterion) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *criterion) Q_DECL_OVERRIDE; QVariant criterionValue() const; QString criterionName() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool operator ==(const RenderAnnotation &other); bool operator !=(const RenderAnnotation &other); @@ -69,10 +69,10 @@ private: QString m_name; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERANNOTATION_P_H +#endif // QT3DRENDER_RENDER_RENDERANNOTATION_P_H diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index 295872a17..a62ae76a5 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderAttachment::RenderAttachment() @@ -50,7 +51,7 @@ RenderAttachment::RenderAttachment() { } -void RenderAttachment::updateFromPeer(QNode *peer) +void RenderAttachment::updateFromPeer(Qt3D::QNode *peer) { QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer); @@ -63,7 +64,7 @@ void RenderAttachment::updateFromPeer(QNode *peer) m_attachmentData.m_textureUuid = attachment->texture()->id(); } -QNodeId RenderAttachment::textureUuid() const +Qt3D::QNodeId RenderAttachment::textureUuid() const { return m_attachmentData.m_textureUuid; } @@ -93,7 +94,7 @@ QRenderAttachment::RenderAttachmentType RenderAttachment::type() const return m_attachmentData.m_type; } -void RenderAttachment::sceneChangeEvent(const QSceneChangePtr &e) +void RenderAttachment::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated) { @@ -123,8 +124,7 @@ Attachment RenderAttachment::attachment() const return m_attachmentData; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h index 8014ba10f..35a9d55cb 100644 --- a/src/render/backend/renderattachment_p.h +++ b/src/render/backend/renderattachment_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERATTACHMENT_H -#define QT3D_RENDER_RENDERATTACHMENT_H +#ifndef QT3DRENDER_RENDER_RENDERATTACHMENT_H +#define QT3DRENDER_RENDER_RENDERATTACHMENT_H #include <Qt3DRenderer/qrenderattachment.h> #include <Qt3DRenderer/private/attachmentpack_p.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderAttachment; @@ -52,31 +52,31 @@ namespace Render { class AttachmentManager; -class RenderAttachment : public QBackendNode +class RenderAttachment : public Qt3D::QBackendNode { public: RenderAttachment(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - QNodeId textureUuid() const; + Qt3D::QNodeId textureUuid() const; int mipLevel() const; int layer() const; QString name() const; QRenderAttachment::CubeMapFace face() const; QRenderAttachment::RenderAttachmentType type() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; Attachment attachment() const; private: - QNodeId m_attachmentUuid; + Qt3D::QNodeId m_attachmentUuid; Attachment m_attachmentData; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERATTACHMENT_H +#endif // QT3DRENDER_RENDER_RENDERATTACHMENT_H diff --git a/src/render/backend/renderattribute.cpp b/src/render/backend/renderattribute.cpp index 4a717849d..4224dee92 100644 --- a/src/render/backend/renderattribute.cpp +++ b/src/render/backend/renderattribute.cpp @@ -40,19 +40,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderAttribute::RenderAttribute() : QBackendNode(ReadOnly) - , m_dataType(QAbstractAttribute::Float) + , m_dataType(Qt3D::QAbstractAttribute::Float) , m_dataSize(1) , m_count(0) , m_byteStride(0) , m_byteOffset(0) , m_divisor(0) - , m_attributeType(QAbstractAttribute::VertexAttribute) + , m_attributeType(Qt3D::QAbstractAttribute::VertexAttribute) , m_attributeDirty(false) { } @@ -63,19 +64,19 @@ RenderAttribute::~RenderAttribute() void RenderAttribute::cleanup() { - m_dataType = QAbstractAttribute::Float; + m_dataType = Qt3D::QAbstractAttribute::Float; m_dataSize = 1; m_count = 0; m_byteStride = 0; m_byteOffset = 0; m_divisor = 0; - m_attributeType = QAbstractAttribute::VertexAttribute; - m_bufferId = QNodeId(); + m_attributeType = Qt3D::QAbstractAttribute::VertexAttribute; + m_bufferId = Qt3D::QNodeId(); m_name.clear(); m_attributeDirty = false; } -void RenderAttribute::updateFromPeer(QNode *peer) +void RenderAttribute::updateFromPeer(Qt3D::QNode *peer) { QAttribute *attribute = static_cast<QAttribute *>(peer); if (attribute) { @@ -93,7 +94,7 @@ void RenderAttribute::updateFromPeer(QNode *peer) } } -void RenderAttribute::sceneChangeEvent(const QSceneChangePtr &e) +void RenderAttribute::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); @@ -155,8 +156,7 @@ void RenderAttribute::unsetDirty() m_attributeDirty = false; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderattribute_p.h b/src/render/backend/renderattribute_p.h index 92eefe67c..d266c5559 100644 --- a/src/render/backend/renderattribute_p.h +++ b/src/render/backend/renderattribute_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERATTRIBUTE_H -#define QT3D_RENDER_RENDERATTRIBUTE_H +#ifndef QT3DRENDER_RENDER_RENDERATTRIBUTE_H +#define QT3DRENDER_RENDER_RENDERATTRIBUTE_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DRenderer/qattribute.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class Q_AUTOTEST_EXPORT RenderAttribute : public QBackendNode +class Q_AUTOTEST_EXPORT RenderAttribute : public Qt3D::QBackendNode { public: RenderAttribute(); @@ -54,38 +54,38 @@ public: void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - inline QNodeId bufferId() const { return m_bufferId; } + inline Qt3D::QNodeId bufferId() const { return m_bufferId; } inline QString name() const { return m_name; } - inline QAbstractAttribute::DataType dataType() const { return m_dataType; } + inline Qt3D::QAbstractAttribute::DataType dataType() const { return m_dataType; } inline uint dataSize() const { return m_dataSize; } inline uint count() const { return m_count; } inline uint byteStride() const { return m_byteStride; } inline uint byteOffset() const { return m_byteOffset; } inline uint divisor() const { return m_divisor; } - inline QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; } + inline Qt3D::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; } inline bool isDirty() const { return m_attributeDirty; } void unsetDirty(); private: - QNodeId m_bufferId; + Qt3D::QNodeId m_bufferId; QString m_name; - QAbstractAttribute::DataType m_dataType; + Qt3D::QAbstractAttribute::DataType m_dataType; uint m_dataSize; uint m_count; uint m_byteStride; uint m_byteOffset; uint m_divisor; - QAbstractAttribute::AttributeType m_attributeType; + Qt3D::QAbstractAttribute::AttributeType m_attributeType; bool m_attributeDirty; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERATTRIBUTE_H +#endif // QT3DRENDER_RENDER_RENDERATTRIBUTE_H diff --git a/src/render/backend/renderbuffer.cpp b/src/render/backend/renderbuffer.cpp index d7ff4bca4..08bf23fd3 100644 --- a/src/render/backend/renderbuffer.cpp +++ b/src/render/backend/renderbuffer.cpp @@ -40,8 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderBuffer::RenderBuffer() @@ -80,7 +81,7 @@ void RenderBuffer::executeFunctor() m_data = (*m_functor)(); } -void RenderBuffer::updateFromPeer(QNode *peer) +void RenderBuffer::updateFromPeer(Qt3D::QNode *peer) { QBuffer *buffer = static_cast<QBuffer *>(peer); if (buffer != Q_NULLPTR) { @@ -95,7 +96,7 @@ void RenderBuffer::updateFromPeer(QNode *peer) } } -void RenderBuffer::sceneChangeEvent(const QSceneChangePtr &e) +void RenderBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -130,7 +131,7 @@ RenderBufferFunctor::RenderBufferFunctor(BufferManager *manager) { } -QBackendNode *RenderBufferFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderBufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderBuffer *buffer = m_manager->getOrCreateResource(frontend->id()); buffer->setFactory(factory); @@ -139,18 +140,17 @@ QBackendNode *RenderBufferFunctor::create(QNode *frontend, const QBackendNodeFac return buffer; } -QBackendNode *RenderBufferFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderBufferFunctor::get(const Qt3D::QNodeId &id) const { return m_manager->lookupResource(id); } -void RenderBufferFunctor::destroy(const QNodeId &id) const +void RenderBufferFunctor::destroy(const Qt3D::QNodeId &id) const { return m_manager->releaseResource(id); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderbuffer_p.h b/src/render/backend/renderbuffer_p.h index 698ad8084..b5fba6f93 100644 --- a/src/render/backend/renderbuffer_p.h +++ b/src/render/backend/renderbuffer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERBUFFER_H -#define QT3D_RENDER_RENDERBUFFER_H +#ifndef QT3DRENDER_RENDER_RENDERBUFFER_H +#define QT3DRENDER_RENDER_RENDERBUFFER_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DRenderer/qbuffer.h> @@ -43,21 +43,21 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class BufferManager; -class Q_AUTOTEST_EXPORT RenderBuffer : public QBackendNode +class Q_AUTOTEST_EXPORT RenderBuffer : public Qt3D::QBackendNode { public: RenderBuffer(); ~RenderBuffer(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; void setManager(BufferManager *manager); void executeFunctor(); @@ -78,21 +78,21 @@ private: BufferManager *m_manager; }; -class RenderBufferFunctor : public QBackendNodeFunctor +class RenderBufferFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderBufferFunctor(BufferManager *manager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + 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; private: BufferManager *m_manager; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERBUFFER_H +#endif // QT3DRENDER_RENDER_RENDERBUFFER_H diff --git a/src/render/backend/rendercameralens.cpp b/src/render/backend/rendercameralens.cpp index efcf5d7ef..5da56ef26 100644 --- a/src/render/backend/rendercameralens.cpp +++ b/src/render/backend/rendercameralens.cpp @@ -46,7 +46,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderCameraLens::RenderCameraLens() @@ -65,7 +67,7 @@ void RenderCameraLens::cleanup() } -void RenderCameraLens::updateFromPeer(QNode *peer) +void RenderCameraLens::updateFromPeer(Qt3D::QNode *peer) { QCameraLens *lens = static_cast<QCameraLens *>(peer); setProjection(lens->projectionMatrix()); @@ -77,7 +79,7 @@ void RenderCameraLens::setProjection(const QMatrix4x4 &projection) m_projection = projection; } -void RenderCameraLens::sceneChangeEvent(const QSceneChangePtr &e) +void RenderCameraLens::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { @@ -97,7 +99,7 @@ void RenderCameraLens::sceneChangeEvent(const QSceneChangePtr &e) } } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendercameralens_p.h b/src/render/backend/rendercameralens_p.h index 84edd6b6a..523de9d23 100644 --- a/src/render/backend/rendercameralens_p.h +++ b/src/render/backend/rendercameralens_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERCAMERA_H -#define QT3D_RENDER_RENDERCAMERA_H +#ifndef QT3DRENDER_RENDER_RENDERCAMERA_H +#define QT3DRENDER_RENDER_RENDERCAMERA_H #include <Qt3DCore/qbackendnode.h> #include <QMatrix4x4> @@ -43,20 +43,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class CameraManager; -class RenderCameraLens : public QBackendNode +class RenderCameraLens : public Qt3D::QBackendNode { public: RenderCameraLens(); ~RenderCameraLens(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; void setClearColor(); QVector4D clearColor() const { return m_clearColor; } @@ -66,7 +66,7 @@ public: inline bool isEnabled() const { return m_enabled; } - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: QVector4D m_clearColor; @@ -74,9 +74,9 @@ private: bool m_enabled; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERCAMERA_H +#endif // QT3DRENDER_RENDER_RENDERCAMERA_H diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp index 3e9a1c52e..8f748ac27 100644 --- a/src/render/backend/rendercommand.cpp +++ b/src/render/backend/rendercommand.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { RenderCommand::RenderCommand() @@ -53,6 +53,6 @@ bool compareCommands(RenderCommand *r1, RenderCommand *r2) } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h index 9d0e2d856..827b08fe9 100644 --- a/src/render/backend/rendercommand_p.h +++ b/src/render/backend/rendercommand_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERCOMMAND_H -#define QT3D_RENDER_RENDERCOMMAND_H +#ifndef QT3DRENDER_RENDER_RENDERCOMMAND_H +#define QT3DRENDER_RENDER_RENDERCOMMAND_H #include <qglobal.h> #include <Qt3DRenderer/private/quniformvalue_p.h> @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QOpenGLVertexArrayObject; -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -87,10 +87,10 @@ public: bool compareCommands(RenderCommand *r1, RenderCommand *r2); -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERCOMMAND_H +#endif // QT3DRENDER_RENDER_RENDERCOMMAND_H diff --git a/src/render/backend/renderconfiguration.cpp b/src/render/backend/renderconfiguration.cpp index f15a7e747..ad350cb7b 100644 --- a/src/render/backend/renderconfiguration.cpp +++ b/src/render/backend/renderconfiguration.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { RenderConfiguration::RenderConfiguration() @@ -46,6 +46,6 @@ RenderConfiguration::RenderConfiguration() } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderconfiguration_p.h b/src/render/backend/renderconfiguration_p.h index a48e1687d..7dda15ccb 100644 --- a/src/render/backend/renderconfiguration_p.h +++ b/src/render/backend/renderconfiguration_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERCONFIGURATION_H -#define QT3D_RENDER_RENDERCONFIGURATION_H +#ifndef QT3DRENDER_RENDER_RENDERCONFIGURATION_H +#define QT3DRENDER_RENDER_RENDERCONFIGURATION_H #include <qglobal.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class RenderConfiguration @@ -51,8 +51,8 @@ public: }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERCONFIGURATION_H +#endif // QT3DRENDER_RENDER_RENDERCONFIGURATION_H diff --git a/src/render/backend/rendereffect.cpp b/src/render/backend/rendereffect.cpp index 4689d39a6..96a9ce3f4 100644 --- a/src/render/backend/rendereffect.cpp +++ b/src/render/backend/rendereffect.cpp @@ -45,8 +45,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderEffect::RenderEffect() @@ -63,7 +64,7 @@ void RenderEffect::cleanup() { } -void RenderEffect::updateFromPeer(QNode *peer) +void RenderEffect::updateFromPeer(Qt3D::QNode *peer) { QEffect *effect = static_cast<QEffect *>(peer); @@ -77,7 +78,7 @@ void RenderEffect::updateFromPeer(QNode *peer) m_parameterPack.appendParameter(p->id()); } -void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e) +void RenderEffect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QVariant propertyValue = propertyChange->value(); @@ -102,24 +103,23 @@ void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e) } } -void RenderEffect::appendRenderTechnique(const QNodeId &technique) +void RenderEffect::appendRenderTechnique(const Qt3D::QNodeId &technique) { if (!m_techniques.contains(technique)) m_techniques.append(technique); } -QList<QNodeId> RenderEffect::techniques() const +QList<Qt3D::QNodeId> RenderEffect::techniques() const { return m_techniques; } -QList<QNodeId> RenderEffect::parameters() const +QList<Qt3D::QNodeId> RenderEffect::parameters() const { return m_parameterPack.parameters(); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendereffect_p.h b/src/render/backend/rendereffect_p.h index 40291c275..fa42e46a0 100644 --- a/src/render/backend/rendereffect_p.h +++ b/src/render/backend/rendereffect_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDEREFFECT_H -#define QT3D_RENDER_RENDEREFFECT_H +#ifndef QT3DRENDER_RENDER_RENDEREFFECT_H +#define QT3DRENDER_RENDER_RENDEREFFECT_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/private/parameterpack_p.h> @@ -45,36 +45,36 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechnique; namespace Render { class RenderEffect - : public QBackendNode + : public Qt3D::QBackendNode { public: RenderEffect(); ~RenderEffect(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderTechnique(const QNodeId &t); + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void appendRenderTechnique(const Qt3D::QNodeId &t); - QList<QNodeId> techniques() const; - QList<QNodeId> parameters() const; + QList<Qt3D::QNodeId> techniques() const; + QList<Qt3D::QNodeId> parameters() const; private: - QList<QNodeId> m_techniques; + QList<Qt3D::QNodeId> m_techniques; ParameterPack m_parameterPack; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDEREFFECT_H +#endif // QT3DRENDER_RENDER_RENDEREFFECT_H diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index 11301e032..e51b2fec6 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -57,14 +57,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderEntity::RenderEntity() : QBackendNode() , m_renderer(Q_NULLPTR) - , m_localBoundingVolume(new Qt3D::Sphere) - , m_worldBoundingVolume(new Qt3D::Sphere) + , m_localBoundingVolume(new Sphere) + , m_worldBoundingVolume(new Sphere) { } @@ -91,10 +93,10 @@ void RenderEntity::cleanup() qCDebug(Render::RenderNodes) << Q_FUNC_INFO; // Clear components - m_transformComponent = QNodeId(); - m_cameraComponent = QNodeId(); - m_materialComponent = QNodeId(); - m_geometryRendererComponent = QNodeId(); + m_transformComponent = Qt3D::QNodeId(); + m_cameraComponent = Qt3D::QNodeId(); + m_materialComponent = Qt3D::QNodeId(); + m_geometryRendererComponent = Qt3D::QNodeId(); m_layerComponents.clear(); m_shaderDataComponents.clear(); } @@ -129,7 +131,7 @@ void RenderEntity::setHandle(HEntity handle) m_handle = handle; } -void RenderEntity::updateFromPeer(QNode *peer) +void RenderEntity::updateFromPeer(Qt3D::QNode *peer) { QEntity *entity = static_cast<QEntity *>(peer); const QNodeId parentEntityId = entity->parentEntityId(); @@ -155,7 +157,7 @@ void RenderEntity::updateFromPeer(QNode *peer) } } -void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e) +void RenderEntity::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -235,12 +237,12 @@ const QMatrix4x4 *RenderEntity::worldTransform() const return m_renderer->worldMatrixManager()->data(m_worldTransform); } -void RenderEntity::addComponent(QComponent *component) +void RenderEntity::addComponent(Qt3D::QComponent *component) { // The backend element is always created when this method is called // If that's not the case something has gone wrong - if (qobject_cast<QTransform*>(component) != Q_NULLPTR) + if (qobject_cast<Qt3D::QTransform*>(component) != Q_NULLPTR) m_transformComponent = component->id(); else if (qobject_cast<QCameraLens *>(component) != Q_NULLPTR) m_cameraComponent = component->id(); @@ -254,7 +256,7 @@ void RenderEntity::addComponent(QComponent *component) m_geometryRendererComponent = component->id(); } -void RenderEntity::removeComponent(const QNodeId &nodeId) +void RenderEntity::removeComponent(const Qt3D::QNodeId &nodeId) { if (m_transformComponent == nodeId) m_transformComponent = QNodeId(); @@ -319,13 +321,13 @@ RenderGeometryRenderer *RenderEntity::renderComponent<RenderGeometryRenderer>() } template<> -QNodeId RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; } +Qt3D::QNodeId RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; } template<> -QNodeId RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; } +Qt3D::QNodeId RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; } template<> -QNodeId RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; } +Qt3D::QNodeId RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; } template<> QList<HLayer> RenderEntity::componentsHandle<RenderLayer>() const @@ -346,7 +348,7 @@ QList<RenderLayer *> RenderEntity::renderComponents<RenderLayer>() const } template<> -QList<QNodeId> RenderEntity::componentsUuid<RenderLayer>() const { return m_layerComponents; } +QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderLayer>() const { return m_layerComponents; } template<> QList<HShaderData> RenderEntity::componentsHandle<RenderShaderData>() const @@ -367,10 +369,10 @@ QList<RenderShaderData *> RenderEntity::renderComponents<RenderShaderData>() con } template<> -QList<QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const { return m_shaderDataComponents; } +QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const { return m_shaderDataComponents; } template<> -QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const { return m_geometryRendererComponent; } +Qt3D::QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const { return m_geometryRendererComponent; } RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer) @@ -378,7 +380,7 @@ RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer) { } -QBackendNode *RenderEntityFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { HEntity renderNodeHandle = m_renderer->renderNodesManager()->getOrAcquireHandle(frontend->id()); RenderEntity *entity = m_renderer->renderNodesManager()->data(renderNodeHandle); @@ -389,17 +391,17 @@ QBackendNode *RenderEntityFunctor::create(QNode *frontend, const QBackendNodeFac return entity; } -QBackendNode *RenderEntityFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderEntityFunctor::get(const Qt3D::QNodeId &id) const { return m_renderer->renderNodesManager()->lookupResource(id); } -void RenderEntityFunctor::destroy(const QNodeId &id) const +void RenderEntityFunctor::destroy(const Qt3D::QNodeId &id) const { m_renderer->renderNodesManager()->releaseResource(id); } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderentity_p.h b/src/render/backend/renderentity_p.h index f3afa822a..9940e315d 100644 --- a/src/render/backend/renderentity_p.h +++ b/src/render/backend/renderentity_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERNODE_H -#define QT3D_RENDER_RENDERNODE_H +#ifndef QT3DRENDER_RENDER_RENDERNODE_H +#define QT3DRENDER_RENDER_RENDERNODE_H #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/handle_types_p.h> @@ -50,18 +50,21 @@ QT_BEGIN_NAMESPACE class QMatrix4x4; namespace Qt3D { - -class QRenderAspect; -class Sphere; class QNode; class QEntity; class QComponent; +} + +namespace Qt3DRender { + +class QRenderAspect; +class Sphere; namespace Render { class Renderer; -class Q_AUTOTEST_EXPORT RenderEntity : public QBackendNode +class Q_AUTOTEST_EXPORT RenderEntity : public Qt3D::QBackendNode { public: RenderEntity(); @@ -70,8 +73,8 @@ public: void setParentHandle(HEntity parentHandle); void setRenderer(Renderer *renderer); - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; void dump() const; @@ -90,19 +93,19 @@ public: Sphere *localBoundingVolume() { return m_localBoundingVolume; } Sphere *worldBoundingVolume() { return m_worldBoundingVolume; } - void addComponent(QComponent *component); - void removeComponent(const QNodeId &nodeId); + void addComponent(Qt3D::QComponent *component); + void removeComponent(const Qt3D::QNodeId &nodeId); template<class Backend, uint INDEXBITS> - QHandle<Backend, INDEXBITS> componentHandle() const + Qt3D::QHandle<Backend, INDEXBITS> componentHandle() const { - return QHandle<Backend, INDEXBITS>(); + return Qt3D::QHandle<Backend, INDEXBITS>(); } template<class Backend, uint INDEXBITS> - QList<QHandle<Backend, INDEXBITS> > componentsHandle() const + QList<Qt3D::QHandle<Backend, INDEXBITS> > componentsHandle() const { - return QList<QHandle<Backend, INDEXBITS> >(); + return QList<Qt3D::QHandle<Backend, INDEXBITS> >(); } template<class Backend> @@ -118,15 +121,15 @@ public: } template<class Backend> - QNodeId componentUuid() const + Qt3D::QNodeId componentUuid() const { - return QNodeId(); + return Qt3D::QNodeId(); } template<class Backend> - QList<QNodeId> componentsUuid() const + QList<Qt3D::QNodeId> componentsUuid() const { - return QList<QNodeId>(); + return QList<Qt3D::QNodeId>(); } private: @@ -152,12 +155,12 @@ private: Sphere *m_worldBoundingVolume; // Handles to Components - QNodeId m_transformComponent; - QNodeId m_materialComponent; - QNodeId m_cameraComponent; - QList<QNodeId> m_layerComponents; - QList<QNodeId> m_shaderDataComponents; - QNodeId m_geometryRendererComponent; + Qt3D::QNodeId m_transformComponent; + Qt3D::QNodeId m_materialComponent; + Qt3D::QNodeId m_cameraComponent; + QList<Qt3D::QNodeId> m_layerComponents; + QList<Qt3D::QNodeId> m_shaderDataComponents; + Qt3D::QNodeId m_geometryRendererComponent; QString m_objectName; }; @@ -187,13 +190,13 @@ template<> Q_AUTOTEST_EXPORT RenderGeometryRenderer *RenderEntity::renderComponent<RenderGeometryRenderer>() const; template<> -Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderTransform>() const; +Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderTransform>() const; template<> -Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderCameraLens>() const; +Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderCameraLens>() const; template<> -Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderMaterial>() const; +Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderMaterial>() const; template<> QList<HLayer> RenderEntity::componentsHandle<RenderLayer>() const; @@ -202,7 +205,7 @@ template<> QList<RenderLayer *> RenderEntity::renderComponents<RenderLayer>() const; template<> -Q_AUTOTEST_EXPORT QList<QNodeId> RenderEntity::componentsUuid<RenderLayer>() const; +Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderLayer>() const; template<> QList<HShaderData> RenderEntity::componentsHandle<RenderShaderData>() const; @@ -211,26 +214,26 @@ template<> QList<RenderShaderData *> RenderEntity::renderComponents<RenderShaderData>() const; template<> -Q_AUTOTEST_EXPORT QList<QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const; +Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const; template<> -Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const; +Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const; -class RenderEntityFunctor : public QBackendNodeFunctor +class RenderEntityFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderEntityFunctor(Renderer *renderer); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + 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; private: Renderer *m_renderer; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERNODE_H +#endif // QT3DRENDER_RENDER_RENDERNODE_H diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index e3a16fad8..b5a896057 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -97,8 +97,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { static void logOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage) @@ -325,7 +326,7 @@ void Renderer::createThreadLocalAllocator(void *renderer) /*! * Returns the a FrameAllocator for the caller thread. */ -QFrameAllocator *Renderer::currentFrameAllocator() +Qt3D::QFrameAllocator *Renderer::currentFrameAllocator() { // return the QFrameAllocator for the current thread // It is never cleared as each renderview when it is destroyed @@ -355,7 +356,7 @@ void Renderer::initialize(QOpenGLContext *context) if (m_renderThread) m_waitForWindowToBeSetCondition.wait(mutex()); - QByteArray debugLoggingMode = qgetenv("QT3D_DEBUG_LOGGING"); + QByteArray debugLoggingMode = qgetenv("QT3DRENDER_DEBUG_LOGGING"); bool enableDebugLogging = !debugLoggingMode.isEmpty(); m_graphicsContext.reset(new QGraphicsContext); @@ -428,7 +429,7 @@ void Renderer::shutdown() } } -void Renderer::setFrameGraphRoot(const QNodeId &frameGraphRootUuid) +void Renderer::setFrameGraphRoot(const Qt3D::QNodeId &frameGraphRootUuid) { m_frameGraphRootUuid = frameGraphRootUuid; qCDebug(Backend) << Q_FUNC_INFO << m_frameGraphRootUuid; @@ -549,7 +550,7 @@ void Renderer::render() // Matrice update, bounding volumes computation ... // Should be jobs - // Qt3D has 2 distincts node trees + // namespace Qt3D has 2 distincts node trees // One scene description // One framegraph description @@ -757,7 +758,7 @@ bool Renderer::submitRenderViews() // Waits to be told to create jobs for the next frame // Called by QRenderAspect jobsToExecute context of QAspectThread -QVector<QAspectJobPtr> Renderer::createRenderBinJobs() +QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBinJobs() { // Traverse the current framegraph. For each leaf node create a // RenderView and set its configuration then create a job to @@ -780,7 +781,7 @@ QVector<QAspectJobPtr> Renderer::createRenderBinJobs() // Returns a vector of jobs to be performed for dirty buffers // 1 dirty buffer == 1 job, all job can be performed in parallel -QVector<QAspectJobPtr> Renderer::createRenderBufferJobs() +QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs() { const QVector<QNodeId> dirtyBuffers = m_bufferManager->dirtyBuffers(); QVector<QAspectJobPtr> dirtyBuffersJobs; @@ -798,7 +799,7 @@ QVector<QAspectJobPtr> Renderer::createRenderBufferJobs() return dirtyBuffersJobs; } -QVector<QAspectJobPtr> Renderer::createGeometryRendererJobs() +QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs() { const QVector<QNodeId> dirtyGeometryRenderers = m_geometryRendererManager->dirtyGeometryRenderers(); QVector<QAspectJobPtr> dirtyGeometryRendererJobs; @@ -816,7 +817,7 @@ QVector<QAspectJobPtr> Renderer::createGeometryRendererJobs() } // Called during while traversing the FrameGraph for each leaf node context of QAspectThread -QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex) +Qt3D::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex) { RenderViewJobPtr job(new RenderViewJob); job->setRenderer(this); @@ -1052,7 +1053,7 @@ RenderAttribute *Renderer::updateBuffersAndAttributes(RenderGeometry *geometry, return indexAttribute; } -void Renderer::addAllocator(QFrameAllocator *allocator) +void Renderer::addAllocator(Qt3D::QFrameAllocator *allocator) { QMutexLocker lock(&m_mutex); m_allocators.append(allocator); @@ -1064,6 +1065,6 @@ QOpenGLFilter *Renderer::contextInfo() const } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index b6cdfea58..e1eefa7a1 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERER_H -#define QT3D_RENDER_RENDERER_H +#ifndef QT3DRENDER_RENDER_RENDERER_H +#define QT3DRENDER_RENDER_RENDERER_H #include <Qt3DRenderer/qrenderaspect.h> #include <Qt3DRenderer/qtechnique.h> @@ -64,15 +64,18 @@ class QSurface; class QOpenGLDebugLogger; namespace Qt3D { +class QEntity; +class QFrameAllocator; +} + +namespace Qt3DRender { class QCamera; -class QEntity; class QMaterial; class QShaderProgram; class QMesh; class QRenderPass; class QAbstractShapeMesh; -class QFrameAllocator; class QOpenGLFilter; class AbstractSceneParser; @@ -134,11 +137,11 @@ public: void createAllocators(); void destroyAllocators(); - QFrameAllocator *currentFrameAllocator(); + Qt3D::QFrameAllocator *currentFrameAllocator(); - QThreadStorage<QFrameAllocator *> *tlsAllocators(); + QThreadStorage<Qt3D::QFrameAllocator *> *tlsAllocators(); - void setFrameGraphRoot(const QNodeId &fgRoot); + void setFrameGraphRoot(const Qt3D::QNodeId &fgRoot); Render::FrameGraphNode *frameGraphRoot() const; void setSceneGraphRoot(RenderEntity *sgRoot); @@ -147,13 +150,13 @@ public: void render(); void doRender(); - QVector<QAspectJobPtr> createRenderBinJobs(); - QVector<QAspectJobPtr> createRenderBufferJobs(); - QVector<QAspectJobPtr> createGeometryRendererJobs(); - QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex); + QVector<Qt3D::QAspectJobPtr> createRenderBinJobs(); + QVector<Qt3D::QAspectJobPtr> createRenderBufferJobs(); + QVector<Qt3D::QAspectJobPtr> createGeometryRendererJobs(); + Qt3D::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex); void executeCommands(const QVector<RenderCommand *> &commands); RenderAttribute *updateBuffersAndAttributes(RenderGeometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate); - void addAllocator(QFrameAllocator *allocator); + void addAllocator(Qt3D::QFrameAllocator *allocator); inline CameraManager *cameraManager() const { return m_cameraManager; } inline EntityManager *renderNodesManager() const { return m_renderNodesManager; } @@ -211,7 +214,7 @@ private: QRenderAspect *m_rendererAspect; // Frame graph root - QNodeId m_frameGraphRootUuid; + Qt3D::QNodeId m_frameGraphRootUuid; RenderEntity *m_renderSceneRoot; @@ -279,21 +282,21 @@ private: static void createThreadLocalAllocator(void *renderer); static void destroyThreadLocalAllocator(void *renderer); - QThreadStorage<QFrameAllocator *> m_tlsAllocators; + QThreadStorage<Qt3D::QFrameAllocator *> m_tlsAllocators; QAtomicInt m_running; QScopedPointer<QOpenGLDebugLogger> m_debugLogger; QList<AbstractSceneParser *> m_sceneParsers; - QVector<QFrameAllocator *> m_allocators; + QVector<Qt3D::QFrameAllocator *> m_allocators; QVector<RenderAttribute *> m_dirtyAttributes; QVector<RenderGeometry *> m_dirtyGeometry; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERER_H +#endif // QT3DRENDER_RENDER_RENDERER_H diff --git a/src/render/backend/rendergeometry.cpp b/src/render/backend/rendergeometry.cpp index 026a8146e..983dd5915 100644 --- a/src/render/backend/rendergeometry.cpp +++ b/src/render/backend/rendergeometry.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderGeometry::RenderGeometry() @@ -63,7 +64,7 @@ void RenderGeometry::cleanup() m_geometryDirty = false; } -void RenderGeometry::updateFromPeer(QNode *peer) +void RenderGeometry::updateFromPeer(Qt3D::QNode *peer) { QGeometry *geometry = static_cast<QGeometry *>(peer); if (geometry != Q_NULLPTR) { @@ -75,7 +76,7 @@ void RenderGeometry::updateFromPeer(QNode *peer) } } -void RenderGeometry::sceneChangeEvent(const QSceneChangePtr &e) +void RenderGeometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); @@ -116,8 +117,7 @@ void RenderGeometry::unsetDirty() m_geometryDirty = false; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendergeometry_p.h b/src/render/backend/rendergeometry_p.h index 01381dc01..48eb53724 100644 --- a/src/render/backend/rendergeometry_p.h +++ b/src/render/backend/rendergeometry_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERGEOMETRY_H -#define QT3D_RENDER_RENDERGEOMETRY_H +#ifndef QT3DRENDER_RENDER_RENDERGEOMETRY_H +#define QT3DRENDER_RENDER_RENDERGEOMETRY_H #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { -class Q_AUTOTEST_EXPORT RenderGeometry : public QBackendNode +class Q_AUTOTEST_EXPORT RenderGeometry : public Qt3D::QBackendNode { public: RenderGeometry(); @@ -54,24 +54,24 @@ public: void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - inline QVector<QNodeId> attributes() const { return m_attributes; } + inline QVector<Qt3D::QNodeId> attributes() const { return m_attributes; } inline bool isDirty() const { return m_geometryDirty; } inline int verticesPerPatch() const { return m_verticesPerPatch; } void unsetDirty(); private: - QVector<QNodeId> m_attributes; + QVector<Qt3D::QNodeId> m_attributes; int m_verticesPerPatch; bool m_geometryDirty; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERGEOMETRY_H +#endif // QT3DRENDER_RENDER_RENDERGEOMETRY_H diff --git a/src/render/backend/rendergeometryrenderer.cpp b/src/render/backend/rendergeometryrenderer.cpp index 08ff49768..77d681989 100644 --- a/src/render/backend/rendergeometryrenderer.cpp +++ b/src/render/backend/rendergeometryrenderer.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderGeometryRenderer::RenderGeometryRenderer() @@ -72,7 +73,7 @@ void RenderGeometryRenderer::cleanup() m_restartIndex = -1; m_primitiveRestart = false; m_primitiveType = QGeometryRenderer::Triangles; - m_geometryId = QNodeId(); + m_geometryId = Qt3D::QNodeId(); m_dirty = false; m_functor.reset(); } @@ -82,7 +83,7 @@ void RenderGeometryRenderer::setManager(GeometryRendererManager *manager) m_manager = manager; } -void RenderGeometryRenderer::updateFromPeer(QNode *peer) +void RenderGeometryRenderer::updateFromPeer(Qt3D::QNode *peer) { QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer); if (geometryRenderer) { @@ -102,7 +103,7 @@ void RenderGeometryRenderer::updateFromPeer(QNode *peer) } } -void RenderGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e) +void RenderGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); @@ -189,7 +190,7 @@ RenderGeometryRendererFunctor::RenderGeometryRendererFunctor(GeometryRendererMan { } -QBackendNode *RenderGeometryRendererFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderGeometryRendererFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderGeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id()); geometryRenderer->setFactory(factory); @@ -198,18 +199,17 @@ QBackendNode *RenderGeometryRendererFunctor::create(QNode *frontend, const QBack return geometryRenderer; } -QBackendNode *RenderGeometryRendererFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderGeometryRendererFunctor::get(const Qt3D::QNodeId &id) const { return m_manager->lookupResource(id); } -void RenderGeometryRendererFunctor::destroy(const QNodeId &id) const +void RenderGeometryRendererFunctor::destroy(const Qt3D::QNodeId &id) const { return m_manager->releaseResource(id); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendergeometryrenderer_p.h b/src/render/backend/rendergeometryrenderer_p.h index baa81048c..5bdae6ee9 100644 --- a/src/render/backend/rendergeometryrenderer_p.h +++ b/src/render/backend/rendergeometryrenderer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERGEOMETRYRENDERER_H -#define QT3D_RENDER_RENDERGEOMETRYRENDERER_H +#ifndef QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H +#define QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,13 +43,13 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class GeometryRendererManager; -class Q_AUTOTEST_EXPORT RenderGeometryRenderer : public QBackendNode +class Q_AUTOTEST_EXPORT RenderGeometryRenderer : public Qt3D::QBackendNode { public: RenderGeometryRenderer(); @@ -57,11 +57,11 @@ public: void cleanup(); void setManager(GeometryRendererManager *manager); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; void executeFunctor(); - inline QNodeId geometryId() const { return m_geometryId; } + inline Qt3D::QNodeId geometryId() const { return m_geometryId; } inline int instanceCount() const { return m_instanceCount; } inline int primitiveCount() const { return m_primitiveCount; } inline int baseVertex() const { return m_baseVertex; } @@ -74,7 +74,7 @@ public: void unsetDirty(); private: - QNodeId m_geometryId; + Qt3D::QNodeId m_geometryId; int m_instanceCount; int m_primitiveCount; int m_baseVertex; @@ -87,21 +87,21 @@ private: GeometryRendererManager *m_manager; }; -class RenderGeometryRendererFunctor : public QBackendNodeFunctor +class RenderGeometryRendererFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderGeometryRendererFunctor(GeometryRendererManager *manager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + 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; private: GeometryRendererManager *m_manager; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERGEOMETRYRENDERER_H +#endif // QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H diff --git a/src/render/backend/renderlayer.cpp b/src/render/backend/renderlayer.cpp index b2a2b5803..5912210aa 100644 --- a/src/render/backend/renderlayer.cpp +++ b/src/render/backend/renderlayer.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderLayer::RenderLayer() @@ -59,7 +60,7 @@ void RenderLayer::cleanup() { } -void RenderLayer::updateFromPeer(QNode *peer) +void RenderLayer::updateFromPeer(Qt3D::QNode *peer) { QLayer *layer = static_cast<QLayer *>(peer); m_layers = layer->names(); @@ -71,7 +72,7 @@ QStringList RenderLayer::layers() const return m_layers; } -void RenderLayer::sceneChangeEvent(const QSceneChangePtr &e) +void RenderLayer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("names")) @@ -80,8 +81,7 @@ void RenderLayer::sceneChangeEvent(const QSceneChangePtr &e) m_enabled = propertyChange->value().toBool(); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderlayer_p.h b/src/render/backend/renderlayer_p.h index bd7209536..6ccf3b7e7 100644 --- a/src/render/backend/renderlayer_p.h +++ b/src/render/backend/renderlayer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERLAYER_H -#define QT3D_RENDER_RENDERLAYER_H +#ifndef QT3DRENDER_RENDER_RENDERLAYER_H +#define QT3DRENDER_RENDER_RENDERLAYER_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qbackendnode.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayer; @@ -51,17 +51,17 @@ namespace Render { class LayerManager; -class RenderLayer : public QBackendNode +class RenderLayer : public Qt3D::QBackendNode { public: RenderLayer(); ~RenderLayer(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; QStringList layers() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } private: @@ -69,10 +69,10 @@ private: bool m_enabled; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERLAYER_H +#endif // QT3DRENDER_RENDER_RENDERLAYER_H diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp index 39f8cc322..1a2749f0d 100644 --- a/src/render/backend/rendermaterial.cpp +++ b/src/render/backend/rendermaterial.cpp @@ -46,9 +46,11 @@ #include <Qt3DCore/qscenepropertychange.h> #include <QOpenGLShaderProgram> +using namespace Qt3D; + QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { RenderMaterial::RenderMaterial() @@ -67,7 +69,7 @@ void RenderMaterial::cleanup() m_parameterPack.clear(); } -void RenderMaterial::updateFromPeer(QNode *node) +void RenderMaterial::updateFromPeer(Qt3D::QNode *node) { QMaterial *mat = static_cast<QMaterial *>(node); m_parameterPack.clear(); @@ -78,7 +80,7 @@ void RenderMaterial::updateFromPeer(QNode *node) m_parameterPack.appendParameter(p->id()); } -void RenderMaterial::sceneChangeEvent(const QSceneChangePtr &e) +void RenderMaterial::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -109,17 +111,17 @@ void RenderMaterial::sceneChangeEvent(const QSceneChangePtr &e) } } -QList<QNodeId> RenderMaterial::parameters() const +QList<Qt3D::QNodeId> RenderMaterial::parameters() const { return m_parameterPack.parameters(); } -QNodeId RenderMaterial::effect() const +Qt3D::QNodeId RenderMaterial::effect() const { return m_effectUuid; } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendermaterial_p.h b/src/render/backend/rendermaterial_p.h index 934441f90..862ff0ad2 100644 --- a/src/render/backend/rendermaterial_p.h +++ b/src/render/backend/rendermaterial_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERMATERIAL_H -#define QT3D_RENDER_RENDERMATERIAL_H +#ifndef QT3DRENDER_RENDER_RENDERMATERIAL_H +#define QT3DRENDER_RENDER_RENDERMATERIAL_H #include <QVariant> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QMaterial; class QParameter; @@ -58,29 +58,29 @@ class RenderTechnique; class RenderEffect; class MaterialManager; -class Q_AUTOTEST_EXPORT RenderMaterial : public QBackendNode +class Q_AUTOTEST_EXPORT RenderMaterial : public Qt3D::QBackendNode { public: RenderMaterial(); ~RenderMaterial(); void cleanup(); - void updateFromPeer(QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } - QList<QNodeId> parameters() const; - QNodeId effect() const; + QList<Qt3D::QNodeId> parameters() const; + Qt3D::QNodeId effect() const; private: ParameterPack m_parameterPack; - QNodeId m_effectUuid; + Qt3D::QNodeId m_effectUuid; bool m_enabled; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERMATERIAL_H +#endif // QT3DRENDER_RENDER_RENDERMATERIAL_H diff --git a/src/render/backend/rendernodefunctor_p.h b/src/render/backend/rendernodefunctor_p.h index 1670336e0..736c62554 100644 --- a/src/render/backend/rendernodefunctor_p.h +++ b/src/render/backend/rendernodefunctor_p.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERNODEFUNCTOR_P_H -#define QT3D_RENDER_RENDERNODEFUNCTOR_P_H +#ifndef QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H +#define QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { template<class Backend, class Manager> -class RenderNodeFunctor : public QBackendNodeFunctor +class RenderNodeFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderNodeFunctor(Manager *manager) @@ -55,7 +55,7 @@ public: { } - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL { Backend *backend = m_manager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -63,12 +63,12 @@ public: return backend; } - QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL { return m_manager->lookupResource(id); } - void destroy(const QNodeId &id) const Q_DECL_FINAL + void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL { m_manager->releaseResource(id); } @@ -77,10 +77,10 @@ private: Manager *m_manager; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERNODEFUNCTOR_P_H +#endif // QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H diff --git a/src/render/backend/renderparameter.cpp b/src/render/backend/renderparameter.cpp index e3f93cd3b..85d9e0980 100644 --- a/src/render/backend/renderparameter.cpp +++ b/src/render/backend/renderparameter.cpp @@ -44,8 +44,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderParameter::RenderParameter() @@ -55,14 +56,14 @@ RenderParameter::RenderParameter() { } -void RenderParameter::updateFromPeer(QNode *mat) +void RenderParameter::updateFromPeer(Qt3D::QNode *mat) { QParameter *param = static_cast<QParameter *>(mat); m_name = param->name(); m_value = toBackendValue(param->value()); } -void RenderParameter::sceneChangeEvent(const QSceneChangePtr &e) +void RenderParameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -110,8 +111,7 @@ QVariant RenderParameter::toBackendValue(const QVariant &value) } } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderparameter_p.h b/src/render/backend/renderparameter_p.h index 091082035..b071b41a6 100644 --- a/src/render/backend/renderparameter_p.h +++ b/src/render/backend/renderparameter_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERPARAMETER_P_H -#define QT3D_RENDER_RENDERPARAMETER_P_H +#ifndef QT3DRENDER_RENDER_RENDERPARAMETER_P_H +#define QT3DRENDER_RENDER_RENDERPARAMETER_P_H #include <Qt3DCore/qbackendnode.h> #include <QVariant> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -50,13 +50,13 @@ class ParameterManager; class ShaderDataManager; class TextureManager; -class RenderParameter : public QBackendNode +class RenderParameter : public Qt3D::QBackendNode { public: RenderParameter(); - void updateFromPeer(QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; QString name() const; QVariant value() const; @@ -74,10 +74,10 @@ private: QVariant m_value; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERPARAMETER_P_H +#endif // QT3DRENDER_RENDER_RENDERPARAMETER_P_H diff --git a/src/render/backend/renderparametermapping.cpp b/src/render/backend/renderparametermapping.cpp index f112023f3..62cb16dcf 100644 --- a/src/render/backend/renderparametermapping.cpp +++ b/src/render/backend/renderparametermapping.cpp @@ -38,8 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { RenderParameterMapping::RenderParameterMapping() @@ -48,7 +47,7 @@ RenderParameterMapping::RenderParameterMapping() } RenderParameterMapping::RenderParameterMapping(QParameterMapping *mapping) - : m_id(mapping ? mapping->id() : QNodeId()) + : m_id(mapping ? mapping->id() : Qt3D::QNodeId()) , m_parameterName(mapping ? mapping->parameterName() : QString()) , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString()) , m_bindingType(mapping ? mapping->bindingType() : QParameterMapping::Uniform) @@ -60,7 +59,7 @@ bool RenderParameterMapping::isValid() const return !m_id.isNull(); } -QNodeId RenderParameterMapping::id() const +Qt3D::QNodeId RenderParameterMapping::id() const { return m_id; } @@ -80,8 +79,7 @@ QParameterMapping::Binding RenderParameterMapping::bindingType() const return m_bindingType; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderparametermapping_p.h b/src/render/backend/renderparametermapping_p.h index 578d0c826..fe5b85a91 100644 --- a/src/render/backend/renderparametermapping_p.h +++ b/src/render/backend/renderparametermapping_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERPARAMETERMAPPING_P_H -#define QT3D_RENDER_RENDERPARAMETERMAPPING_P_H +#ifndef QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H +#define QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H #include <Qt3DRenderer/qparametermapping.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -53,22 +53,22 @@ public: bool isValid() const; - QNodeId id() const; + Qt3D::QNodeId id() const; QString parameterName() const; QString shaderVariableName() const; QParameterMapping::Binding bindingType() const; private: - QNodeId m_id; + Qt3D::QNodeId m_id; QString m_parameterName; QString m_shaderVariableName; QParameterMapping::Binding m_bindingType; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERPARAMETERMAPPING_P_H +#endif // QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H diff --git a/src/render/backend/renderqueue.cpp b/src/render/backend/renderqueue.cpp index 758315efc..1cdb8f96f 100644 --- a/src/render/backend/renderqueue.cpp +++ b/src/render/backend/renderqueue.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -107,8 +107,8 @@ bool RenderQueue::isFrameQueueComplete() const return m_targetRenderViewCount && m_targetRenderViewCount == currentRenderViewCount(); } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderqueue_p.h b/src/render/backend/renderqueue_p.h index 8368977f4..dceaf3966 100644 --- a/src/render/backend/renderqueue_p.h +++ b/src/render/backend/renderqueue_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERQUEUE_H -#define QT3D_RENDER_RENDERQUEUE_H +#ifndef QT3DRENDER_RENDER_RENDERQUEUE_H +#define QT3DRENDER_RENDER_RENDERQUEUE_H #include <QVector> #include <QtGlobal> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -68,10 +68,10 @@ private: QVector<RenderView *> m_currentWorkQueue; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERQUEUE_H +#endif // QT3DRENDER_RENDER_RENDERQUEUE_H diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp index 85828c14e..5bece0d4e 100644 --- a/src/render/backend/renderrenderpass.cpp +++ b/src/render/backend/renderrenderpass.cpp @@ -50,8 +50,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderRenderPass::RenderRenderPass() @@ -68,7 +69,7 @@ void RenderRenderPass::cleanup() { } -void RenderRenderPass::updateFromPeer(QNode *peer) +void RenderRenderPass::updateFromPeer(Qt3D::QNode *peer) { QRenderPass *pass = static_cast<QRenderPass *>(peer); @@ -88,7 +89,7 @@ void RenderRenderPass::updateFromPeer(QNode *peer) m_parameterPack.appendParameter(p->id()); } -void RenderRenderPass::sceneChangeEvent(const QSceneChangePtr &e) +void RenderRenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -130,7 +131,7 @@ void RenderRenderPass::sceneChangeEvent(const QSceneChangePtr &e) } } -QNodeId RenderRenderPass::shaderProgram() const +Qt3D::QNodeId RenderRenderPass::shaderProgram() const { return m_shaderUuid; } @@ -140,7 +141,7 @@ QList<RenderParameterMapping> RenderRenderPass::bindings() const return m_bindings.values(); } -QList<QNodeId> RenderRenderPass::annotations() const +QList<Qt3D::QNodeId> RenderRenderPass::annotations() const { return m_annotationList; } @@ -150,18 +151,18 @@ QList<RenderState *> RenderRenderPass::renderStates() const return m_renderStates.values(); } -QList<QNodeId> RenderRenderPass::parameters() const +QList<Qt3D::QNodeId> RenderRenderPass::parameters() const { return m_parameterPack.parameters(); } -void RenderRenderPass::appendAnnotation(const QNodeId &annotationId) +void RenderRenderPass::appendAnnotation(const Qt3D::QNodeId &annotationId) { if (!m_annotationList.contains(annotationId)) m_annotationList.append(annotationId); } -void RenderRenderPass::removeAnnotation(const QNodeId &annotationId) +void RenderRenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId) { m_annotationList.removeOne(annotationId); } @@ -172,24 +173,23 @@ void RenderRenderPass::appendBinding(const RenderParameterMapping &binding) m_bindings[binding.id()] = binding; } -void RenderRenderPass::removeBinding(const QNodeId &bindingId) +void RenderRenderPass::removeBinding(const Qt3D::QNodeId &bindingId) { m_bindings.remove(bindingId); } -void RenderRenderPass::appendRenderState(const QNodeId &id, RenderState *renderState) +void RenderRenderPass::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void RenderRenderPass::removeRenderState(const QNodeId &renderStateId) +void RenderRenderPass::removeRenderState(const Qt3D::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderrenderpass_p.h b/src/render/backend/renderrenderpass_p.h index 1e9b8ecfd..b36c09f5a 100644 --- a/src/render/backend/renderrenderpass_p.h +++ b/src/render/backend/renderrenderpass_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERRENDERPASS_H -#define QT3D_RENDER_RENDERRENDERPASS_H +#ifndef QT3DRENDER_RENDER_RENDERRENDERPASS_H +#define QT3DRENDER_RENDER_RENDERRENDERPASS_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/private/renderparametermapping_p.h> @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPass; class QAbstractShader; @@ -60,7 +60,7 @@ namespace Render { class RenderPassManager; class RenderState; -class Q_AUTOTEST_EXPORT RenderRenderPass : public QBackendNode +class Q_AUTOTEST_EXPORT RenderRenderPass : public Qt3D::QBackendNode { public: RenderRenderPass(); @@ -68,36 +68,36 @@ public: void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - QNodeId shaderProgram() const; + Qt3D::QNodeId shaderProgram() const; QList<RenderParameterMapping> bindings() const; - QList<QNodeId> annotations() const; + QList<Qt3D::QNodeId> annotations() const; QList<RenderState *> renderStates() const; - QList<QNodeId> parameters() const; + QList<Qt3D::QNodeId> parameters() const; private: - void appendAnnotation(const QNodeId &criterionId); - void removeAnnotation(const QNodeId &criterionId); + void appendAnnotation(const Qt3D::QNodeId &criterionId); + void removeAnnotation(const Qt3D::QNodeId &criterionId); void appendBinding(const RenderParameterMapping &binding); - void removeBinding(const QNodeId &bindingId); + void removeBinding(const Qt3D::QNodeId &bindingId); - void appendRenderState(const QNodeId &id, RenderState *renderState); - void removeRenderState(const QNodeId &renderStateId); + void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3D::QNodeId &renderStateId); - QNodeId m_shaderUuid; - QHash<QNodeId, RenderParameterMapping> m_bindings; - QHash<QNodeId, RenderState *> m_renderStates; - QList<QNodeId> m_annotationList; + Qt3D::QNodeId m_shaderUuid; + QHash<Qt3D::QNodeId, RenderParameterMapping> m_bindings; + QHash<Qt3D::QNodeId, RenderState *> m_renderStates; + QList<Qt3D::QNodeId> m_annotationList; ParameterPack m_parameterPack; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERRENDERPASS_H +#endif // QT3DRENDER_RENDER_RENDERRENDERPASS_H diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/renderscene.cpp index 343b7a8d9..4cea15b19 100644 --- a/src/render/backend/renderscene.cpp +++ b/src/render/backend/renderscene.cpp @@ -44,8 +44,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderScene::RenderScene() @@ -54,7 +55,7 @@ RenderScene::RenderScene() { } -void RenderScene::updateFromPeer(QNode *peer) +void RenderScene::updateFromPeer(Qt3D::QNode *peer) { QAbstractSceneLoader *loader = static_cast<QAbstractSceneLoader *>(peer); @@ -62,7 +63,7 @@ void RenderScene::updateFromPeer(QNode *peer) m_sceneManager->addSceneData(m_source, peerUuid()); } -void RenderScene::sceneChangeEvent(const QSceneChangePtr &e) +void RenderScene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("source")) { @@ -76,7 +77,7 @@ QUrl RenderScene::source() const return m_source; } -void RenderScene::setSceneSubtree(QEntity *subTree) +void RenderScene::setSceneSubtree(Qt3D::QEntity *subTree) { QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid())); e->setPropertyName("scene"); @@ -103,7 +104,7 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager) { } -QBackendNode *RenderSceneFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderScene *scene = m_sceneManager->getOrCreateResource(frontend->id()); scene->setFactory(factory); @@ -112,18 +113,17 @@ QBackendNode *RenderSceneFunctor::create(QNode *frontend, const QBackendNodeFact return scene; } -QBackendNode *RenderSceneFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderSceneFunctor::get(const Qt3D::QNodeId &id) const { return m_sceneManager->lookupResource(id); } -void RenderSceneFunctor::destroy(const QNodeId &id) const +void RenderSceneFunctor::destroy(const Qt3D::QNodeId &id) const { m_sceneManager->releaseResource(id); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderscene_p.h b/src/render/backend/renderscene_p.h index 49cf8bbdb..c6a07a565 100644 --- a/src/render/backend/renderscene_p.h +++ b/src/render/backend/renderscene_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERSCENE_P_H -#define QT3D_RENDER_RENDERSCENE_P_H +#ifndef QT3DRENDER_RENDER_RENDERSCENE_P_H +#define QT3DRENDER_RENDER_RENDERSCENE_P_H #include <QtGlobal> #include <Qt3DCore/qbackendnode.h> @@ -44,24 +44,25 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - class QEntity; +} +namespace Qt3DRender { namespace Render { class SceneManager; -class RenderScene : public QBackendNode +class RenderScene : public Qt3D::QBackendNode { public: RenderScene(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; // QObserverInterface interface - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; QUrl source() const; - void setSceneSubtree(QEntity *subTree); + void setSceneSubtree(Qt3D::QEntity *subTree); void setSceneManager(SceneManager *manager); private: @@ -69,22 +70,21 @@ private: QUrl m_source; }; -class RenderSceneFunctor : public QBackendNodeFunctor +class RenderSceneFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderSceneFunctor(SceneManager *sceneManager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + 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; private: SceneManager *m_sceneManager; }; -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERSCENE_P_H +#endif // QT3DRENDER_RENDER_RENDERSCENE_P_H diff --git a/src/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp index 9eea96cf2..38d894a09 100644 --- a/src/render/backend/rendershader.cpp +++ b/src/render/backend/rendershader.cpp @@ -48,7 +48,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderShader::RenderShader() @@ -83,7 +85,7 @@ void RenderShader::cleanup() m_uniformBlocks.clear(); } -void RenderShader::updateFromPeer(QNode *peer) +void RenderShader::updateFromPeer(Qt3D::QNode *peer) { QShaderProgram *shader = static_cast<QShaderProgram *>(peer); @@ -120,7 +122,7 @@ QVector<QByteArray> RenderShader::shaderCode() const return m_shaderCode; } -void RenderShader::sceneChangeEvent(const QSceneChangePtr &e) +void RenderShader::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); @@ -396,6 +398,6 @@ void RenderShader::initialize(const RenderShader &other) } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendershader_p.h b/src/render/backend/rendershader_p.h index becbb1317..13d5ae2a9 100644 --- a/src/render/backend/rendershader_p.h +++ b/src/render/backend/rendershader_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERSHADER_H -#define QT3D_RENDER_RENDERSHADER_H +#ifndef QT3DRENDER_RENDER_RENDERSHADER_H +#define QT3DRENDER_RENDER_RENDERSHADER_H #include <QVector> #include <Qt3DRenderer/private/quniformvalue_p.h> @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; class QMutex; -namespace Qt3D { +namespace Qt3DRender { class QShaderProgram; @@ -58,7 +58,7 @@ class AttachmentPack; typedef uint ProgramDNA; -class Q_AUTOTEST_EXPORT RenderShader : public QBackendNode +class Q_AUTOTEST_EXPORT RenderShader : public Qt3D::QBackendNode { public: RenderShader(); @@ -66,7 +66,7 @@ public: void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; void updateUniforms(QGraphicsContext *ctx, const QUniformPack &pack); void setFragOutputs(const QHash<QString, int> &fragOutputs); @@ -75,7 +75,7 @@ public: QVector<QString> uniformBlockNames() const; QVector<QByteArray> shaderCode() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool isLoaded() const; ProgramDNA dna() const; @@ -124,9 +124,9 @@ private: friend class QGraphicsContext; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERSHADER_H +#endif // QT3DRENDER_RENDER_RENDERSHADER_H diff --git a/src/render/backend/rendershaderdata.cpp b/src/render/backend/rendershaderdata.cpp index 5ed42ce2a..dd7ce3a3f 100644 --- a/src/render/backend/rendershaderdata.cpp +++ b/src/render/backend/rendershaderdata.cpp @@ -47,11 +47,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { -QList<QNodeId> RenderShaderData::m_updatedShaderData; +QList<Qt3D::QNodeId> RenderShaderData::m_updatedShaderData; RenderShaderData::RenderShaderData() : QBackendNode() @@ -65,7 +66,7 @@ RenderShaderData::~RenderShaderData() delete m_mutex; } -void RenderShaderData::updateFromPeer(QNode *peer) +void RenderShaderData::updateFromPeer(Qt3D::QNode *peer) { m_properties.clear(); const QShaderData *shaderData = static_cast<const QShaderData *>(peer); @@ -189,7 +190,7 @@ void RenderShaderData::addToClearUpdateList() RenderShaderData::m_updatedShaderData.append(peerUuid()); } -const int qNodeIdTypeId = qMetaTypeId<QNodeId>(); +const int qNodeIdTypeId = qMetaTypeId<Qt3D::QNodeId>(); void RenderShaderData::readPeerProperties(QShaderData *shaderData) { @@ -239,7 +240,7 @@ void RenderShaderData::setManager(ShaderDataManager *manager) m_manager = manager; } -void RenderShaderData::sceneChangeEvent(const QSceneChangePtr &e) +void RenderShaderData::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (!m_propertyReader.isNull()) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -289,7 +290,7 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(ShaderDataManager *manager) { } -QBackendNode *RenderShaderDataFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderShaderData *backend = m_manager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -298,18 +299,17 @@ QBackendNode *RenderShaderDataFunctor::create(QNode *frontend, const QBackendNod return backend; } -QBackendNode *RenderShaderDataFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderShaderDataFunctor::get(const Qt3D::QNodeId &id) const { return m_manager->lookupResource(id); } -void RenderShaderDataFunctor::destroy(const QNodeId &id) const +void RenderShaderDataFunctor::destroy(const Qt3D::QNodeId &id) const { m_manager->releaseResource(id); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendershaderdata_p.h b/src/render/backend/rendershaderdata_p.h index 147d72ff5..2b09dca09 100644 --- a/src/render/backend/rendershaderdata_p.h +++ b/src/render/backend/rendershaderdata_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERSHADERDATA_P_H -#define QT3D_RENDER_RENDERSHADERDATA_P_H +#ifndef QT3DRENDER_RENDER_RENDERSHADERDATA_P_H +#define QT3DRENDER_RENDER_RENDERSHADERDATA_P_H #include <Qt3DCore/qbackendnode.h> #include <private/shadervariables_p.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -53,18 +53,18 @@ class QGraphicsContext; class UniformBuffer; class ShaderDataManager; -class Q_AUTOTEST_EXPORT RenderShaderData : public QBackendNode +class Q_AUTOTEST_EXPORT RenderShaderData : public Qt3D::QBackendNode { public: RenderShaderData(); ~RenderShaderData(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; inline QHash<QString, QVariant> properties() const { return m_properties; } inline QHash<QString, QVariant> updatedProperties() const { return m_updatedProperties; } // Called by cleanup job - inline static QList<QNodeId> updatedShaderDataList() { return m_updatedShaderData; } + inline static QList<Qt3D::QNodeId> updatedShaderDataList() { return m_updatedShaderData; } inline static void clearShaderDataList() { return m_updatedShaderData.clear(); } void clearUpdate(); @@ -75,7 +75,7 @@ public: void updateTransformedProperties(const QMatrix4x4 &nodeWordlTransform); protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: // 1 to 1 match with frontend properties, modified only by sceneChangeEvent @@ -91,7 +91,7 @@ private: QHash<QString, QShaderData::TransformType> m_transformedProperties; ShaderDataManager *m_manager; QMutex *m_mutex; - static QList<QNodeId> m_updatedShaderData; + static QList<Qt3D::QNodeId> m_updatedShaderData; QMatrix4x4 m_worldMatrix; QMatrix4x4 m_viewMatrix; @@ -101,25 +101,25 @@ private: friend class RenderShaderDataFunctor; }; -class RenderShaderDataFunctor : public QBackendNodeFunctor +class RenderShaderDataFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderShaderDataFunctor(ShaderDataManager *manager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL; - QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL; - void destroy(const QNodeId &id) const Q_DECL_FINAL; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; private: ShaderDataManager *m_manager; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Render::RenderShaderData*) +Q_DECLARE_METATYPE(Qt3DRender::Render::RenderShaderData*) -#endif // QT3D_RENDER_RENDERSHADERDATA_P_H +#endif // QT3DRENDER_RENDER_RENDERSHADERDATA_P_H diff --git a/src/render/backend/renderstate.cpp b/src/render/backend/renderstate.cpp index b89d807af..502cb0160 100644 --- a/src/render/backend/renderstate.cpp +++ b/src/render/backend/renderstate.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { RenderStateSet::RenderStateSet() @@ -330,7 +330,7 @@ RenderState *RenderState::getOrCreateBackendState(QRenderState *renderState) } } -} // Render -} // namespace Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderstate_p.h b/src/render/backend/renderstate_p.h index 7779a5a3b..59d5fcef3 100644 --- a/src/render/backend/renderstate_p.h +++ b/src/render/backend/renderstate_p.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERSTATE_H -#define QT3D_RENDER_RENDERSTATE_H +#ifndef QT3DRENDER_RENDER_RENDERSTATE_H +#define QT3DRENDER_RENDER_RENDERSTATE_H #include <QVector> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderState; @@ -123,9 +123,9 @@ private: }; -} // Render -} // namespace Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERSTATE_H +#endif // QT3DRENDER_RENDER_RENDERSTATE_H diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index ae47539ad..e55284377 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -42,8 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderTarget::RenderTarget() @@ -51,7 +52,7 @@ RenderTarget::RenderTarget() { } -void RenderTarget::updateFromPeer(QNode *peer) +void RenderTarget::updateFromPeer(Qt3D::QNode *peer) { QRenderTarget *target = static_cast<QRenderTarget *>(peer); m_renderAttachments.clear(); @@ -74,12 +75,12 @@ void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId) m_renderAttachments.removeOne(attachmentId); } -QList<QNodeId> RenderTarget::renderAttachments() const +QList<Qt3D::QNodeId> RenderTarget::renderAttachments() const { return m_renderAttachments; } -void RenderTarget::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTarget::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("attachment")) @@ -88,8 +89,7 @@ void RenderTarget::sceneChangeEvent(const QSceneChangePtr &e) removeRenderAttachment(propertyChange->value().value<QNodeId>()); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h index 35b1ad674..ceb3fe3ce 100644 --- a/src/render/backend/rendertarget_p.h +++ b/src/render/backend/rendertarget_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTARGET_H -#define QT3D_RENDER_RENDERTARGET_H +#ifndef QT3DRENDER_RENDER_RENDERTARGET_H +#define QT3DRENDER_RENDER_RENDERTARGET_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTarget; class QRenderAttachment; @@ -52,29 +52,29 @@ namespace Render { class RenderTargetManager; -class RenderTarget : public QBackendNode +class RenderTarget : public Qt3D::QBackendNode { public: RenderTarget(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; void cleanup(); - void appendRenderAttachment(const QNodeId &attachmentId); - void removeRenderAttachment(const QNodeId &attachmentId); + void appendRenderAttachment(const Qt3D::QNodeId &attachmentId); + void removeRenderAttachment(const Qt3D::QNodeId &attachmentId); - QList<QNodeId> renderAttachments() const; + QList<Qt3D::QNodeId> renderAttachments() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QList<QNodeId> m_renderAttachments; + QList<Qt3D::QNodeId> m_renderAttachments; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERTARGET_H +#endif // QT3DRENDER_RENDER_RENDERTARGET_H diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp index 4f4262aef..bc72b188c 100644 --- a/src/render/backend/rendertechnique.cpp +++ b/src/render/backend/rendertechnique.cpp @@ -51,7 +51,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderTechnique::RenderTechnique() @@ -70,7 +72,7 @@ void RenderTechnique::cleanup() { } -void RenderTechnique::updateFromPeer(QNode *peer) +void RenderTechnique::updateFromPeer(Qt3D::QNode *peer) { m_parameterPack.clear(); m_renderPasses.clear(); @@ -92,7 +94,7 @@ void RenderTechnique::updateFromPeer(QNode *peer) } } -void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTechnique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -139,28 +141,28 @@ void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e) } } -QList<QNodeId> RenderTechnique::parameters() const +QList<Qt3D::QNodeId> RenderTechnique::parameters() const { return m_parameterPack.parameters(); } -void RenderTechnique::appendRenderPass(const QNodeId &renderPassId) +void RenderTechnique::appendRenderPass(const Qt3D::QNodeId &renderPassId) { if (!m_renderPasses.contains(renderPassId)) m_renderPasses.append(renderPassId); } -void RenderTechnique::removeRenderPass(const QNodeId &renderPassId) +void RenderTechnique::removeRenderPass(const Qt3D::QNodeId &renderPassId) { m_renderPasses.removeOne(renderPassId); } -QList<QNodeId> RenderTechnique::annotations() const +QList<Qt3D::QNodeId> RenderTechnique::annotations() const { return m_annotationList; } -QList<QNodeId> RenderTechnique::renderPasses() const +QList<Qt3D::QNodeId> RenderTechnique::renderPasses() const { return m_renderPasses; } @@ -170,18 +172,18 @@ QOpenGLFilter *RenderTechnique::openGLFilter() const return m_openglFilter; } -void RenderTechnique::appendAnnotation(const QNodeId &criterionId) +void RenderTechnique::appendAnnotation(const Qt3D::QNodeId &criterionId) { if (!m_annotationList.contains(criterionId)) m_annotationList.append(criterionId); } -void RenderTechnique::removeAnnotation(const QNodeId &criterionId) +void RenderTechnique::removeAnnotation(const Qt3D::QNodeId &criterionId) { m_annotationList.removeOne(criterionId); } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/rendertechnique_p.h index 6427c6176..04fdb3180 100644 --- a/src/render/backend/rendertechnique_p.h +++ b/src/render/backend/rendertechnique_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTECHNIQUE_H -#define QT3D_RENDER_RENDERTECHNIQUE_H +#ifndef QT3DRENDER_RENDER_RENDERTECHNIQUE_H +#define QT3DRENDER_RENDER_RENDERTECHNIQUE_H #include <QVector> #include <QStringList> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechnique; class QParameter; @@ -58,39 +58,39 @@ namespace Render { class TechniqueManager; -class RenderTechnique : public QBackendNode +class RenderTechnique : public Qt3D::QBackendNode { public: RenderTechnique(); ~RenderTechnique(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - QList<QNodeId> parameters() const; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3D::QNodeId> parameters() const; - void appendRenderPass(const QNodeId &renderPassId); - void removeRenderPass(const QNodeId &renderPassId); + void appendRenderPass(const Qt3D::QNodeId &renderPassId); + void removeRenderPass(const Qt3D::QNodeId &renderPassId); - void appendAnnotation(const QNodeId &criterionId); - void removeAnnotation(const QNodeId &criterionId); + void appendAnnotation(const Qt3D::QNodeId &criterionId); + void removeAnnotation(const Qt3D::QNodeId &criterionId); - QList<QNodeId> annotations() const; - QList<QNodeId> renderPasses() const; + QList<Qt3D::QNodeId> annotations() const; + QList<Qt3D::QNodeId> renderPasses() const; QOpenGLFilter *openGLFilter() const; private: QOpenGLFilter *m_openglFilter; ParameterPack m_parameterPack; - QList<QNodeId> m_annotationList; - QList<QNodeId> m_renderPasses; + QList<Qt3D::QNodeId> m_annotationList; + QList<Qt3D::QNodeId> m_renderPasses; }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERTECHNIQUE_H +#endif // QT3DRENDER_RENDER_RENDERTECHNIQUE_H diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp index f49809fe9..2c411d19a 100644 --- a/src/render/backend/rendertexture.cpp +++ b/src/render/backend/rendertexture.cpp @@ -50,7 +50,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { namespace Render { RenderTexture::RenderTexture() @@ -121,7 +123,7 @@ void RenderTexture::cleanup() } // AspectThread -void RenderTexture::updateFromPeer(QNode *peer) +void RenderTexture::updateFromPeer(Qt3D::QNode *peer) { QAbstractTextureProvider *texture = static_cast<QAbstractTextureProvider *>(peer); @@ -410,7 +412,7 @@ void RenderTexture::setFormat(QAbstractTextureProvider::TextureFormat format) } // ChangeArbiter/Aspect Thread -void RenderTexture::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTexture::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { // The QOpenGLTexture has to be manipulated from the RenderThread only QMutexLocker lock(m_lock); @@ -577,7 +579,7 @@ RenderTextureFunctor::RenderTextureFunctor(TextureManager *textureManager, { } -QBackendNode *RenderTextureFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderTextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderTexture *backend = m_textureManager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -588,17 +590,17 @@ QBackendNode *RenderTextureFunctor::create(QNode *frontend, const QBackendNodeFa return backend; } -QBackendNode *RenderTextureFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderTextureFunctor::get(const Qt3D::QNodeId &id) const { return m_textureManager->lookupResource(id); } -void RenderTextureFunctor::destroy(const QNodeId &id) const +void RenderTextureFunctor::destroy(const Qt3D::QNodeId &id) const { m_textureManager->releaseResource(id); } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertexture_p.h b/src/render/backend/rendertexture_p.h index 052c00b36..1764ef35a 100644 --- a/src/render/backend/rendertexture_p.h +++ b/src/render/backend/rendertexture_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTEXTURE_H -#define QT3D_RENDER_RENDERTEXTURE_H +#ifndef QT3DRENDER_RENDER_RENDERTEXTURE_H +#define QT3DRENDER_RENDER_RENDERTEXTURE_H #include <QOpenGLContext> #include <QMutex> @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QOpenGLTexture; -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureProvider; @@ -60,14 +60,14 @@ class TextureDataManager; typedef uint TextureDNA; -class RenderTexture : public QBackendNode +class RenderTexture : public Qt3D::QBackendNode { public: RenderTexture(); ~RenderTexture(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; QOpenGLTexture* getOrCreateGLTexture() ; @@ -75,7 +75,7 @@ public: bool isTextureReset() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; TextureDNA dna() const; void setTextureManager(TextureManager *manager); @@ -134,16 +134,16 @@ private: void updateDNA(); }; -class RenderTextureFunctor : public QBackendNodeFunctor +class RenderTextureFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderTextureFunctor(TextureManager *textureManager, TextureImageManager *textureImageManager, TextureDataManager *textureDataManager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL; - QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL; - void destroy(const QNodeId &id) const Q_DECL_FINAL; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; @@ -152,10 +152,10 @@ private: }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Render::RenderTexture*) +Q_DECLARE_METATYPE(Qt3DRender::Render::RenderTexture*) -#endif // QT3D_RENDER_RENDERTEXTURE_H +#endif // QT3DRENDER_RENDER_RENDERTEXTURE_H diff --git a/src/render/backend/rendertextureimage.cpp b/src/render/backend/rendertextureimage.cpp index 0a24e4e71..c54bd2eec 100644 --- a/src/render/backend/rendertextureimage.cpp +++ b/src/render/backend/rendertextureimage.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderTextureImage::RenderTextureImage() @@ -72,7 +73,7 @@ void RenderTextureImage::cleanup() m_dna = 0; } -void RenderTextureImage::updateFromPeer(QNode *peer) +void RenderTextureImage::updateFromPeer(Qt3D::QNode *peer) { QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer); m_layer = textureImage->layer(); @@ -93,7 +94,7 @@ void RenderTextureImage::updateFromPeer(QNode *peer) } } -void RenderTextureImage::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTextureImage::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -160,7 +161,7 @@ RenderTextureImageFunctor::RenderTextureImageFunctor(TextureManager *textureMana { } -QBackendNode *RenderTextureImageFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *RenderTextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { RenderTextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -171,18 +172,17 @@ QBackendNode *RenderTextureImageFunctor::create(QNode *frontend, const QBackendN return backend; } -QBackendNode *RenderTextureImageFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *RenderTextureImageFunctor::get(const Qt3D::QNodeId &id) const { return m_textureImageManager->lookupResource(id); } -void RenderTextureImageFunctor::destroy(const QNodeId &id) const +void RenderTextureImageFunctor::destroy(const Qt3D::QNodeId &id) const { m_textureImageManager->releaseResource(id); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertextureimage_p.h b/src/render/backend/rendertextureimage_p.h index d9aa9c09a..e15c7c30b 100644 --- a/src/render/backend/rendertextureimage_p.h +++ b/src/render/backend/rendertextureimage_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTEXTUREIMAGE_H -#define QT3D_RENDER_RENDERTEXTUREIMAGE_H +#ifndef QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H +#define QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H #include <qglobal.h> #include <Qt3DCore/qbackendnode.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -55,13 +55,13 @@ class TextureDataManager; typedef uint TextureImageDNA; -class RenderTextureImage : public QBackendNode +class RenderTextureImage : public Qt3D::QBackendNode { public: RenderTextureImage(); void cleanup(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; int m_layer; int m_mipmapLevel; @@ -94,22 +94,22 @@ private: TextureManager *m_textureManager; TextureImageManager *m_textureImageManager; TextureDataManager *m_textureDataManager; - QList<QNodeId> m_referencedTextures; + QList<Qt3D::QNodeId> m_referencedTextures; HTexture m_textureProvider; - QNodeId m_textureProviderId; + Qt3D::QNodeId m_textureProviderId; TextureImageDNA m_dna; }; -class RenderTextureImageFunctor : public QBackendNodeFunctor +class RenderTextureImageFunctor : public Qt3D::QBackendNodeFunctor { public: explicit RenderTextureImageFunctor(TextureManager *textureManager, TextureImageManager *textureImageManager, TextureDataManager *textureDataManager); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL; - QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL; - void destroy(const QNodeId &id) const Q_DECL_FINAL; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; @@ -118,10 +118,10 @@ private: }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERTEXTUREIMAGE_H +#endif // QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index a75e3bc68..e899d0057 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -95,8 +95,8 @@ void RenderThread::run() qCDebug(Render::Backend) << "Exiting RenderThread"; } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderthread_p.h b/src/render/backend/renderthread_p.h index c704881b9..845aec2fe 100644 --- a/src/render/backend/renderthread_p.h +++ b/src/render/backend/renderthread_p.h @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -67,9 +67,9 @@ private: QSemaphore m_semaphore; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp index ea531a5f9..c01c3523f 100644 --- a/src/render/backend/rendertransform.cpp +++ b/src/render/backend/rendertransform.cpp @@ -43,8 +43,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderTransform::RenderTransform() @@ -52,9 +53,9 @@ RenderTransform::RenderTransform() { } -void RenderTransform::updateFromPeer(QNode *peer) +void RenderTransform::updateFromPeer(Qt3D::QNode *peer) { - QTransform *transform = static_cast<QTransform *>(peer); + Qt3D::QTransform *transform = static_cast<Qt3D::QTransform *>(peer); m_transformMatrix = transform->matrix(); m_enabled = transform->isEnabled(); @@ -65,7 +66,7 @@ QMatrix4x4 RenderTransform::transformMatrix() const return m_transformMatrix; } -void RenderTransform::sceneChangeEvent(const QSceneChangePtr &e) +void RenderTransform::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -76,8 +77,7 @@ void RenderTransform::sceneChangeEvent(const QSceneChangePtr &e) } } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/rendertransform_p.h b/src/render/backend/rendertransform_p.h index 52df04b4a..8508e52dc 100644 --- a/src/render/backend/rendertransform_p.h +++ b/src/render/backend/rendertransform_p.h @@ -34,29 +34,29 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERTRANSFORM_H -#define QT3D_RENDER_RENDERTRANSFORM_H +#ifndef QT3DRENDER_RENDER_RENDERTRANSFORM_H +#define QT3DRENDER_RENDER_RENDERTRANSFORM_H #include <Qt3DCore/qbackendnode.h> #include <QMatrix4x4> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; class TransformManager; -class RenderTransform : public QBackendNode +class RenderTransform : public Qt3D::QBackendNode { public: RenderTransform(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; QMatrix4x4 transformMatrix() const; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } private: @@ -64,10 +64,10 @@ private: bool m_enabled; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERTRANSFORM_H +#endif // QT3DRENDER_RENDER_RENDERTRANSFORM_H diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 64ed66569..b4e902388 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { namespace { @@ -94,7 +94,7 @@ bool isEntityInLayers(const RenderEntity *entity, const QStringList &layers) return false; } -void destroyUniformValue(const QUniformValue *value, QFrameAllocator *allocator) +void destroyUniformValue(const QUniformValue *value, Qt3D::QFrameAllocator *allocator) { QUniformValue *v = const_cast<QUniformValue *>(value); if (v->isTexture()) @@ -704,6 +704,6 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass * } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 366030af9..127cea5e4 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERVIEW_H -#define QT3D_RENDER_RENDERVIEW_H +#ifndef QT3DRENDER_RENDER_RENDERVIEW_H +#define QT3DRENDER_RENDER_RENDERVIEW_H #include <Qt3DRenderer/qparameter.h> #include <Qt3DRenderer/qclearbuffer.h> @@ -57,10 +57,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPass; -class QFrameAllocator; namespace Render { @@ -94,7 +93,7 @@ public: inline void setSurfaceSize(const QSize &size) { m_surfaceSize = size; } inline Renderer *renderer() const { return m_renderer; } - inline void setAllocator(QFrameAllocator *allocator) + inline void setAllocator(Qt3D::QFrameAllocator *allocator) { m_allocator = allocator; m_data = m_allocator->allocate<InnerData>(); @@ -106,7 +105,7 @@ public: // help cache performance during iteration m_data->m_viewMatrix = m_allocator->allocate<QMatrix4x4>(); } - inline QFrameAllocator *allocator() const { return m_allocator; } + inline Qt3D::QFrameAllocator *allocator() const { return m_allocator; } inline void setRenderCamera(RenderCameraLens *renderCamera) { m_data->m_renderCamera = renderCamera; } inline RenderCameraLens *renderCamera() const { return m_data->m_renderCamera; } @@ -186,7 +185,7 @@ public: void setRenderTargetHandle(HTarget renderTargetHandle) { m_renderTarget = renderTargetHandle; } HTarget renderTargetHandle() const { return m_renderTarget; } - void addSortCriteria(const QList<QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } + void addSortCriteria(const QList<Qt3D::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } // Helps making the size of RenderView smaller // Contains all the data needed for the actual building of the RenderView @@ -204,7 +203,7 @@ public: const RenderPassFilter *m_passFilter; QMatrix4x4 *m_viewMatrix; QStringList m_layers; - QList<QNodeId> m_sortingCriteria; + QList<Qt3D::QNodeId> m_sortingCriteria; QVector3D m_eyePos; UniformBlockValueBuilder m_uniformBlockBuilder; }; @@ -214,7 +213,7 @@ private: Renderer *m_renderer; QSize m_surfaceSize; - QFrameAllocator *m_allocator; + Qt3D::QFrameAllocator *m_allocator; InnerData *m_data; @@ -267,8 +266,8 @@ private: }; } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERVIEW_H +#endif // QT3DRENDER_RENDER_RENDERVIEW_H diff --git a/src/render/backend/scenemanager.cpp b/src/render/backend/scenemanager.cpp index fb49a2410..ed1253226 100644 --- a/src/render/backend/scenemanager.cpp +++ b/src/render/backend/scenemanager.cpp @@ -38,19 +38,18 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { SceneManager::SceneManager() : QResourceManager<RenderScene, - QNodeId, - 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() + Qt3D::QNodeId, + 8, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy>() { } -void SceneManager::addSceneData(const QUrl &source, const QNodeId &sceneUuid) +void SceneManager::addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid) { LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid)); @@ -69,20 +68,19 @@ QVector<LoadSceneJobPtr> SceneManager::pendingSceneLoaderJobs() return copy; } -void SceneManager::addLoadedSceneTree(const QUrl &source, QEntity *tree) +void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree) { SceneManager::Locker lock(this); m_loadedSceneTrees.insert(source, tree); } -QEntity *SceneManager::sceneTreeFromSource(const QUrl &source) +Qt3D::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source) { SceneManager::Locker lock(this); return m_loadedSceneTrees.value(source); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/scenemanager_p.h b/src/render/backend/scenemanager_p.h index 61b0c02a9..073737de2 100644 --- a/src/render/backend/scenemanager_p.h +++ b/src/render/backend/scenemanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_SCENEMANAGER_P_H -#define QT3D_RENDER_SCENEMANAGER_P_H +#ifndef QT3DRENDER_RENDER_SCENEMANAGER_P_H +#define QT3DRENDER_RENDER_SCENEMANAGER_P_H #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRenderer/private/renderscene_p.h> @@ -45,13 +45,14 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - class QEntity; +} +namespace Qt3DRender { namespace Render { -class SceneManager : public QResourceManager<RenderScene, - QNodeId, +class SceneManager : public Qt3D::QResourceManager<RenderScene, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy, Qt3D::ObjectLevelLockingPolicy> @@ -59,20 +60,19 @@ class SceneManager : public QResourceManager<RenderScene, public: SceneManager(); - void addSceneData(const QUrl &source, const QNodeId &sceneUuid); + void addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid); QVector<LoadSceneJobPtr> pendingSceneLoaderJobs(); - void addLoadedSceneTree(const QUrl &source, QEntity *tree); - QEntity *sceneTreeFromSource(const QUrl &source); + void addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree); + Qt3D::QEntity *sceneTreeFromSource(const QUrl &source); private: - QHash<QUrl, QEntity *> m_loadedSceneTrees; + QHash<QUrl, Qt3D::QEntity *> m_loadedSceneTrees; QVector<LoadSceneJobPtr> m_pendingJobs; }; -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/shadervariables_p.h b/src/render/backend/shadervariables_p.h index a1d4748c1..d6bd1245d 100644 --- a/src/render/backend/shadervariables_p.h +++ b/src/render/backend/shadervariables_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_SHADERVARIABLES_P_H -#define QT3D_RENDER_SHADERVARIABLES_P_H +#ifndef QT3DRENDER_RENDER_SHADERVARIABLES_P_H +#define QT3DRENDER_RENDER_SHADERVARIABLES_P_H #include <QtGlobal> #include <QOpenGLContext> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -91,10 +91,10 @@ struct ShaderUniformBlock int m_size; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_SHADERVARIABLES_P_H +#endif // QT3DRENDER_RENDER_SHADERVARIABLES_P_H diff --git a/src/render/backend/states/blendstate.cpp b/src/render/backend/states/blendstate.cpp index 0e6894535..822f4820d 100644 --- a/src/render/backend/states/blendstate.cpp +++ b/src/render/backend/states/blendstate.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { template <class State> @@ -329,7 +329,7 @@ StencilMask::StencilMask(uint frontMask, uint backMask) { } -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/states/blendstate_p.h b/src/render/backend/states/blendstate_p.h index 13dcb646b..2530b5209 100644 --- a/src/render/backend/states/blendstate_p.h +++ b/src/render/backend/states/blendstate_p.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Q_AUTOTEST_EXPORT BlendState : public GenericState2<BlendState, GLenum, GLenum> @@ -155,7 +155,7 @@ private: FrontFace(GLenum func); }; -class Q_AUTOTEST_EXPORT Dithering : public Qt3D::Render::RenderState +class Q_AUTOTEST_EXPORT Dithering : public RenderState { public: virtual void apply(QGraphicsContext *gc) const Q_DECL_OVERRIDE; @@ -194,7 +194,7 @@ private: StencilTest(GLenum frontFunc, int frontRef, uint frontMask, GLenum backFunc, int backRef, uint backMask); }; -class Q_AUTOTEST_EXPORT AlphaCoverage : public Qt3D::Render::RenderState +class Q_AUTOTEST_EXPORT AlphaCoverage : public RenderState { public: void apply(QGraphicsContext *gc) const Q_DECL_OVERRIDE; @@ -275,8 +275,8 @@ private: StencilMask(uint frontMask, uint backMask); }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/texturedatamanager.cpp b/src/render/backend/texturedatamanager.cpp index 6568bff5d..3e77179f6 100644 --- a/src/render/backend/texturedatamanager.cpp +++ b/src/render/backend/texturedatamanager.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { @@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager() {} // Called from AspectThread sync -void TextureDataManager::addToPendingTextures(const QNodeId &textureId) +void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId) { // This simple check ensures that we won't be having n jobs // for one mesh, in case n Materials are referencing the said @@ -58,9 +58,9 @@ void TextureDataManager::addToPendingTextures(const QNodeId &textureId) } // Called from AspectThread prepare jobs -QVector<QNodeId> TextureDataManager::texturesPending() +QVector<Qt3D::QNodeId> TextureDataManager::texturesPending() { - QVector<QNodeId> textureIds = m_texturesPending; + QVector<Qt3D::QNodeId> textureIds = m_texturesPending; m_texturesPending.clear(); return textureIds; } @@ -163,8 +163,8 @@ void TextureDataManager::cleanup() m_textureHandlesToRelease.clear(); } -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/texturedatamanager_p.h b/src/render/backend/texturedatamanager_p.h index 8765ae6f1..734e9049c 100644 --- a/src/render/backend/texturedatamanager_p.h +++ b/src/render/backend/texturedatamanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_TEXTUREDATAMANAGER_H -#define QT3D_RENDER_TEXTUREDATAMANAGER_H +#ifndef QT3DRENDER_RENDER_TEXTUREDATAMANAGER_H +#define QT3DRENDER_RENDER_TEXTUREDATAMANAGER_H #include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DRenderer/qtexture.h> @@ -47,24 +47,24 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair; typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair; -class TextureDataManager : public QResourceManager<TexImageData, - QNodeId, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> +class TextureDataManager : public Qt3D::QResourceManager<TexImageData, + Qt3D::QNodeId, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> { public: TextureDataManager(); - void addToPendingTextures(const QNodeId &textureId); + void addToPendingTextures(const Qt3D::QNodeId &textureId); - QVector<QNodeId> texturesPending(); + QVector<Qt3D::QNodeId> texturesPending(); HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const; void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor); @@ -76,19 +76,17 @@ public: void cleanup(); private: - QVector<QNodeId> m_texturesPending; + QVector<Qt3D::QNodeId> m_texturesPending; QVector<FunctorTextureDataPair > m_textureDataFunctors; QVector<FunctorImageHandlesPair > m_texturesImagesPerFunctor; mutable QMutex m_mutex; QVector<HTextureData> m_textureHandlesToRelease; }; -} // Render - -Q_DECLARE_RESOURCE_INFO(TexImageData, Q_REQUIRES_CLEANUP); - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender +Q_DECLARE_RESOURCE_INFO(Qt3DRender::TexImageData, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE diff --git a/src/render/backend/vsyncframeadvanceservice.cpp b/src/render/backend/vsyncframeadvanceservice.cpp index f8c7bf5c8..5c937e6ed 100644 --- a/src/render/backend/vsyncframeadvanceservice.cpp +++ b/src/render/backend/vsyncframeadvanceservice.cpp @@ -42,11 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { -class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public QAbstractFrameAdvanceServicePrivate +class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceServicePrivate { public: VSyncFrameAdvanceServicePrivate() @@ -109,8 +108,7 @@ void VSyncFrameAdvanceService::proceedToNextFrame() d->m_semaphore.release(1); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/backend/vsyncframeadvanceservice_p.h b/src/render/backend/vsyncframeadvanceservice_p.h index 6499a9eaf..e38e9b4ca 100644 --- a/src/render/backend/vsyncframeadvanceservice_p.h +++ b/src/render/backend/vsyncframeadvanceservice_p.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H -#define QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H +#ifndef QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H +#define QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H #include <Qt3DCore/qabstractframeadvanceservice.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class VSyncFrameAdvanceServicePrivate; -class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public QAbstractFrameAdvanceService +class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceService { public: VSyncFrameAdvanceService(); @@ -63,10 +63,10 @@ private: Q_DECLARE_PRIVATE(VSyncFrameAdvanceService) }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H +#endif // QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H |