diff options
Diffstat (limited to 'src/render/frontend')
177 files changed, 1100 insertions, 1068 deletions
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp index 5085adf45..d77c493e9 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.cpp +++ b/src/render/frontend/framegraph-components/qcameraselector.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! \class Qt3D::CameraSelector @@ -55,7 +55,7 @@ QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent) } /*! - \class Qt3D::QCameraSelectorPrivate + \class Qt3DRender::QCameraSelectorPrivate \internal */ QCameraSelectorPrivate::QCameraSelectorPrivate() @@ -69,7 +69,7 @@ void QCameraSelector::copy(const QNode *ref) const QCameraSelector *other = static_cast<const QCameraSelector*>(ref); if (other->d_func()->m_camera) - setCamera(qobject_cast<QEntity *>(QNode::clone(other->d_func()->m_camera))); + setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera))); } QCameraSelector::QCameraSelector(Qt3D::QNode *parent) @@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector() QNode::cleanup(); } -void QCameraSelector::setCamera(QEntity *camera) +void QCameraSelector::setCamera(Qt3D::QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -97,12 +97,12 @@ void QCameraSelector::setCamera(QEntity *camera) } } -QEntity *QCameraSelector::camera() const +Qt3D::QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h index 4811d7a96..546d77a61 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.h +++ b/src/render/frontend/framegraph-components/qcameraselector.h @@ -34,17 +34,16 @@ ** ****************************************************************************/ -#ifndef QT3D_QCAMERASELECTOR_H -#define QT3D_QCAMERASELECTOR_H +#ifndef QT3DRENDER_QCAMERASELECTOR_H +#define QT3DRENDER_QCAMERASELECTOR_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QCamera; class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode @@ -53,27 +52,27 @@ class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(QNode *parent = 0); + explicit QCameraSelector(Qt3D::QNode *parent = 0); ~QCameraSelector(); - void setCamera(QEntity *camera); - QEntity *camera() const; + void setCamera(Qt3D::QEntity *camera); + Qt3D::QEntity *camera() const; Q_SIGNALS: void cameraChanged(); protected: - QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QCameraSelector) Q_DECLARE_PRIVATE(QCameraSelector) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCAMERASELECTOR_H +#endif // QT3DRENDER_QCAMERASELECTOR_H diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h index 1ef076557..bcf00d6b6 100644 --- a/src/render/frontend/framegraph-components/qcameraselector_p.h +++ b/src/render/frontend/framegraph-components/qcameraselector_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QCAMERASELECTOR_P_H -#define QT3D_QCAMERASELECTOR_P_H +#ifndef QT3DRENDER_QCAMERASELECTOR_P_H +#define QT3DRENDER_QCAMERASELECTOR_P_H #include <private/qframegraphnode_p.h> #include <Qt3DRenderer/qcameraselector.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QCameraSelector; @@ -52,12 +52,12 @@ public: QCameraSelectorPrivate(); Q_DECLARE_PUBLIC(QCameraSelector) - QEntity *m_camera; + Qt3D::QEntity *m_camera; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCAMERASELECTOR_P_H +#endif // QT3DRENDER_QCAMERASELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qclearbuffer.cpp b/src/render/frontend/framegraph-components/qclearbuffer.cpp index f40a80883..5706f6aa7 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer.cpp +++ b/src/render/frontend/framegraph-components/qclearbuffer.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QClearBufferPrivate + \class Qt3DRender::QClearBufferPrivate \internal */ QClearBufferPrivate::QClearBufferPrivate() @@ -91,6 +91,6 @@ void QClearBuffer::setBuffers(QClearBuffer::BufferType buffers) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qclearbuffer.h b/src/render/frontend/framegraph-components/qclearbuffer.h index 782ec6ef4..9b42cb46c 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer.h +++ b/src/render/frontend/framegraph-components/qclearbuffer.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QCLEARBUFFER_H -#define QT3D_QCLEARBUFFER_H +#ifndef QT3DRENDER_QCLEARBUFFER_H +#define QT3DRENDER_QCLEARBUFFER_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClearBufferPrivate; @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) public: - explicit QClearBuffer(QNode *parent = 0); + explicit QClearBuffer(Qt3D::QNode *parent = 0); ~QClearBuffer(); enum BufferType { @@ -72,16 +72,16 @@ Q_SIGNALS: void buffersChanged(); protected: - QClearBuffer(QClearBufferPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QClearBuffer) QT3D_CLONEABLE(QClearBuffer) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCLEARBUFFER_H +#endif // QT3DRENDER_QCLEARBUFFER_H diff --git a/src/render/frontend/framegraph-components/qclearbuffer_p.h b/src/render/frontend/framegraph-components/qclearbuffer_p.h index f78b89429..402f956a2 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer_p.h +++ b/src/render/frontend/framegraph-components/qclearbuffer_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QCLEARBUFFER_P_H -#define QT3D_QCLEARBUFFER_P_H +#ifndef QT3DRENDER_QCLEARBUFFER_P_H +#define QT3DRENDER_QCLEARBUFFER_P_H #include <private/qframegraphnode_p.h> #include <Qt3DRenderer/qclearbuffer.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClearBufferPrivate : public QFrameGraphNodePrivate { @@ -53,8 +53,8 @@ public: QClearBuffer::BufferType m_buffersType; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCLEARBUFFER_P_H +#endif // QT3DRENDER_QCLEARBUFFER_P_H diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index fdf9724ee..b8357f396 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphPrivate + \class Qt3DRender::QFrameGraphPrivate \internal */ QFrameGraphPrivate::QFrameGraphPrivate() @@ -72,14 +72,14 @@ QFrameGraphPrivate::QFrameGraphPrivate() /*! \qmltype FrameGraph - \instantiates Qt3D::QFrameGraph + \instantiates Qt3DRender::QFrameGraph \inherits Component3D \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ -/*! \fn void Qt3D::QFrameGraph::copy(const QNode *ref) +/*! \fn void Qt3DRender::QFrameGraph::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QFrameGraph::copy(const QNode *ref) @@ -90,7 +90,7 @@ void QFrameGraph::copy(const QNode *ref) } /*! - \fn Qt3D::QFrameGraph::QFrameGraph(QNode *parent) + \fn Qt3DRender::QFrameGraph::QFrameGraph(QNode *parent) Constructs a new QFrameGraph with the specified \a parent. */ QFrameGraph::QFrameGraph(QNode *parent) @@ -116,7 +116,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent) */ /*! - \property Qt3D::QFrameGraph::activeFrameGraph + \property Qt3DRender::QFrameGraph::activeFrameGraph Holds the current activeFrameGraph root node. */ @@ -139,6 +139,6 @@ void QFrameGraph::setActiveFrameGraph(QFrameGraphNode *activeFrameGraph) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraph.h b/src/render/frontend/framegraph-components/qframegraph.h index 9dc3fbc76..2a32a95f6 100644 --- a/src/render/frontend/framegraph-components/qframegraph.h +++ b/src/render/frontend/framegraph-components/qframegraph.h @@ -34,29 +34,29 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPH_H -#define QT3D_QFRAMEGRAPH_H +#ifndef QT3DRENDER_QFRAMEGRAPH_H +#define QT3DRENDER_QFRAMEGRAPH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public QComponent +class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property // otherwise this results in an error "cannot assign object to property" - Q_PROPERTY(Qt3D::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged) + Q_PROPERTY(Qt3DRender::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged) Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(QNode *parent = 0); + explicit QFrameGraph(Qt3D::QNode *parent = 0); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -66,16 +66,16 @@ Q_SIGNALS: void activeFrameGraphChanged(); protected: - QFrameGraph(QFrameGraphPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrameGraph) QT3D_CLONEABLE(QFrameGraph) }; -} //Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPH_H +#endif // QT3DRENDER_QFRAMEGRAPH_H diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/frontend/framegraph-components/qframegraph_p.h index c4963a4ea..0eb8ca7e5 100644 --- a/src/render/frontend/framegraph-components/qframegraph_p.h +++ b/src/render/frontend/framegraph-components/qframegraph_p.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPH_P_H -#define QT3D_QFRAMEGRAPH_P_H +#ifndef QT3DRENDER_QFRAMEGRAPH_P_H +#define QT3DRENDER_QFRAMEGRAPH_P_H #include <Qt3DCore/qt3dcore_global.h> #include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraph; class QFrameGraphNode; -class QFrameGraphPrivate : public QComponentPrivate +class QFrameGraphPrivate : public Qt3D::QComponentPrivate { public: QFrameGraphPrivate(); @@ -61,4 +61,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPH_P_H +#endif // QT3DRENDER_QFRAMEGRAPH_P_H diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp index 78d50782a..1c28d72a0 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.cpp +++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphNodePrivate + \class Qt3DRender::QFrameGraphNodePrivate \internal */ QFrameGraphNodePrivate::QFrameGraphNodePrivate() @@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent) QFrameGraphNode::~QFrameGraphNode() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); } /*! @@ -114,7 +114,7 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent) */ /*! - \property Qt3D::QFrameGraphNode::enabled + \property Qt3DRender::QFrameGraphNode::enabled Holds whether the frame graph node is enabled or disabled. */ @@ -135,6 +135,6 @@ void QFrameGraphNode::setEnabled(bool enabled) } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraphnode.h b/src/render/frontend/framegraph-components/qframegraphnode.h index b13fd6eb6..ce14b9bed 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.h +++ b/src/render/frontend/framegraph-components/qframegraphnode.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHNODE_H -#define QT3D_QFRAMEGRAPHNODE_H +#ifndef QT3DRENDER_QFRAMEGRAPHNODE_H +#define QT3DRENDER_QFRAMEGRAPHNODE_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public QNode +class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QFrameGraphNode(QNode *parent = 0); + explicit QFrameGraphNode(Qt3D::QNode *parent = 0); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; @@ -61,7 +61,7 @@ public: void setEnabled(bool enabled); protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0); Q_SIGNALS: void enabledChanged(); @@ -70,8 +70,8 @@ private: Q_DECLARE_PRIVATE(QFrameGraphNode) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHNODE_H +#endif // QT3DRENDER_QFRAMEGRAPHNODE_H diff --git a/src/render/frontend/framegraph-components/qframegraphnode_p.h b/src/render/frontend/framegraph-components/qframegraphnode_p.h index 02cfc5be1..d1dc98196 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode_p.h +++ b/src/render/frontend/framegraph-components/qframegraphnode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHNODE_P_H -#define QT3D_QFRAMEGRAPHNODE_P_H +#ifndef QT3DRENDER_QFRAMEGRAPHNODE_P_H +#define QT3DRENDER_QFRAMEGRAPHNODE_P_H #include <QtCore/QtGlobal> #include <private/qnode_p.h> @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphNode; -class QFrameGraphNodePrivate : public QNodePrivate +class QFrameGraphNodePrivate : public Qt3D::QNodePrivate { public: QFrameGraphNodePrivate(); @@ -57,8 +57,8 @@ public: QList<QFrameGraphNode *> m_fgChildren; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHNODE_P_H +#endif // QT3DRENDER_QFRAMEGRAPHNODE_P_H diff --git a/src/render/frontend/framegraph-components/qframegraphselector.cpp b/src/render/frontend/framegraph-components/qframegraphselector.cpp index e60872ffe..6d2dc7e6e 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector.cpp +++ b/src/render/frontend/framegraph-components/qframegraphselector.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphSelectorPrivate + \class Qt3DRender::QFrameGraphSelectorPrivate \internal */ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate() @@ -51,19 +51,19 @@ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate() } /*! - \class Qt3D::QFrameGraphSelector + \class Qt3DRender::QFrameGraphSelector \inmodule Qt3DRenderer - \brief Qt3D::QFrameGraphSelector provide a way to select a one or more subtree of + \brief Qt3DRender::QFrameGraphSelector provide a way to select a one or more subtree of the FrameGraph at runtime - The selection is made by executing Qt3D::QFrameGraphSelectorFunctor that will + The selection is made by executing Qt3DRender::QFrameGraphSelectorFunctor that will return a vector containing the indices of the \l {QFrameGraph}{FrameGraph} subtree to be used for the current frame. */ /*! - Constructs a new Qt3D::QFrameGraphSelector instance using \a parent as parent. + Constructs a new Qt3DRender::QFrameGraphSelector instance using \a parent as parent. */ QFrameGraphSelector::QFrameGraphSelector(QNode *parent) : QFrameGraphNode(*new QFrameGraphSelectorPrivate, parent) @@ -99,6 +99,6 @@ void QFrameGraphSelector::copy(const QNode *ref) QFrameGraphNode::copy(ref); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraphselector.h b/src/render/frontend/framegraph-components/qframegraphselector.h index f350539d4..8300be080 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector.h +++ b/src/render/frontend/framegraph-components/qframegraphselector.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHSELECTOR_H -#define QT3D_QFRAMEGRAPHSELECTOR_H +#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_H +#define QT3DRENDER_QFRAMEGRAPHSELECTOR_H #include <Qt3DRenderer/qframegraphnode.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphSelectorPrivate; @@ -59,24 +59,24 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: - explicit QFrameGraphSelector(QNode *parent = 0); + explicit QFrameGraphSelector(Qt3D::QNode *parent = 0); ~QFrameGraphSelector(); QFrameGraphSelectorFunctorPtr selectionFunctor() const; void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QFrameGraphSelector) Q_DECLARE_PRIVATE(QFrameGraphSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QFrameGraphSelectorFunctorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QFrameGraphSelectorFunctorPtr) -#endif // QT3D_QGFRAMEGRAPHSELECTOR_H +#endif // QT3DRENDER_QGFRAMEGRAPHSELECTOR_H diff --git a/src/render/frontend/framegraph-components/qframegraphselector_p.h b/src/render/frontend/framegraph-components/qframegraphselector_p.h index 28228dcdb..b1d63a7fe 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector_p.h +++ b/src/render/frontend/framegraph-components/qframegraphselector_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHSELECTOR_P_H -#define QT3D_QFRAMEGRAPHSELECTOR_P_H +#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H +#define QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H #include <Qt3DRenderer/private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphSelector; class QFrameGraphSelectorFunctor; @@ -57,9 +57,9 @@ public: Q_DECLARE_PUBLIC(QFrameGraphSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHSELECTOR_P_H +#endif // QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp index b15147f28..1dad3c1db 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.cpp +++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QLayerFilterPrivate + \class Qt3DRender::QLayerFilterPrivate \internal */ QLayerFilterPrivate::QLayerFilterPrivate() @@ -60,14 +60,14 @@ QLayerFilterPrivate::QLayerFilterPrivate() /*! \qmltype LayerFilter - \instantiates Qt3D::QLayerFilter + \instantiates Qt3DRender::QLayerFilter \inherits FrameGraphNode \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ -/*! \fn void Qt3D::QLayerFilter::copy(const QNode *ref) +/*! \fn void Qt3DRender::QLayerFilter::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QLayerFilter::copy(const QNode *ref) @@ -78,7 +78,7 @@ void QLayerFilter::copy(const QNode *ref) } -/*! \fn Qt3D::QLayerFilter::QLayerFilter(QNode *parent) +/*! \fn Qt3DRender::QLayerFilter::QLayerFilter(QNode *parent) Constructs a new QLayerFilter with the specified \a parent. */ QLayerFilter::QLayerFilter(QNode *parent) @@ -98,7 +98,7 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent) } /*! - \property Qt3D::QLayerFilter::layers + \property Qt3DRender::QLayerFilter::layers */ @@ -123,6 +123,6 @@ QStringList QLayerFilter::layers() const } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qlayerfilter.h b/src/render/frontend/framegraph-components/qlayerfilter.h index 83b97b1e0..7e177e322 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.h +++ b/src/render/frontend/framegraph-components/qlayerfilter.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYERFILTER_H -#define QT3D_QLAYERFILTER_H +#ifndef QT3DRENDER_QLAYERFILTER_H +#define QT3DRENDER_QLAYERFILTER_H #include <Qt3DRenderer/qframegraphnode.h> #include <QStringList> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerFilterPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(QNode *parent = 0); + explicit QLayerFilter(Qt3D::QNode *parent = 0); ~QLayerFilter(); void setLayers(const QStringList &layers); @@ -61,16 +61,16 @@ Q_SIGNALS: void layersChanged(); protected: - QLayerFilter(QLayerFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayerFilter) QT3D_CLONEABLE(QLayerFilter) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYERFILTER_H +#endif // QT3DRENDER_QLAYERFILTER_H diff --git a/src/render/frontend/framegraph-components/qlayerfilter_p.h b/src/render/frontend/framegraph-components/qlayerfilter_p.h index d998652e4..e1abb7cf8 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter_p.h +++ b/src/render/frontend/framegraph-components/qlayerfilter_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYERFILTER_P_H -#define QT3D_QLAYERFILTER_P_H +#ifndef QT3DRENDER_QLAYERFILTER_P_H +#define QT3DRENDER_QLAYERFILTER_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerFilter; @@ -55,8 +55,8 @@ public: QStringList m_layers; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYERFILTER_P_H +#endif // QT3DRENDER_QLAYERFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qnodraw.cpp b/src/render/frontend/framegraph-components/qnodraw.cpp index ed695145d..294bdba5f 100644 --- a/src/render/frontend/framegraph-components/qnodraw.cpp +++ b/src/render/frontend/framegraph-components/qnodraw.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! * \class Qt3D::QNoDraw::QNoDraw @@ -48,8 +48,8 @@ namespace Qt3D { * * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render * states or clear some buffers without requiring any mesh to be drawn. It has - * the same effect as having a Qt3D::QRenderPassFilter that matches none of - * available Qt3D::QRenderPass instances of the scene without the overhead cost + * the same effect as having a Qt3DRender::QRenderPassFilter that matches none of + * available Qt3DRender::QRenderPass instances of the scene without the overhead cost * of actually performing the filtering. * * \since 5.5 @@ -65,6 +65,6 @@ QNoDraw::~QNoDraw() QNode::cleanup(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qnodraw.h b/src/render/frontend/framegraph-components/qnodraw.h index 99174573b..361bbfdc4 100644 --- a/src/render/frontend/framegraph-components/qnodraw.h +++ b/src/render/frontend/framegraph-components/qnodraw.h @@ -34,28 +34,28 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODRAW_H -#define QT3D_QNODRAW_H +#ifndef QT3DRENDER_QNODRAW_H +#define QT3DRENDER_QNODRAW_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(QNode *parent = 0); + explicit QNoDraw(Qt3D::QNode *parent = 0); ~QNoDraw(); private: QT3D_CLONEABLE(QNoDraw) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QNODRAW_H +#endif // QT3DRENDER_QNODRAW_H diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp index a0c845b00..bc72ed652 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderPassFilterPrivate + \class Qt3DRender::QRenderPassFilterPrivate \internal */ @@ -154,6 +156,6 @@ QList<QParameter *> QRenderPassFilter::parameters() const return d->m_parameters; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h index e0f71a78b..edab54406 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASSFILTER_H -#define QT3D_QRENDERPASSFILTER_H +#ifndef QT3DRENDER_QRENDERPASSFILTER_H +#define QT3DRENDER_QRENDERPASSFILTER_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPassFilterPrivate; class QAnnotation; @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(QNode *parent = 0); + explicit QRenderPassFilter(Qt3D::QNode *parent = 0); ~QRenderPassFilter(); QList<QAnnotation *> includes() const; @@ -67,16 +67,16 @@ public: QList<QParameter *> parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPassFilter) QT3D_CLONEABLE(QRenderPassFilter) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERPASSFILTER_H +#endif // QT3DRENDER_QRENDERPASSFILTER_H diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h index a849bf0c2..a1f3a4afa 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASSFILTER_P_H -#define QT3D_QRENDERPASSFILTER_P_H +#ifndef QT3DRENDER_QRENDERPASSFILTER_P_H +#define QT3DRENDER_QRENDERPASSFILTER_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPassFilter; @@ -58,8 +58,8 @@ public: QList<QParameter *> m_parameters; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERPASSFILTER_P_H +#endif // QT3DRENDER_QRENDERPASSFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/frontend/framegraph-components/qrendertargetselector.cpp index 069252766..fc87cadc9 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp +++ b/src/render/frontend/framegraph-components/qrendertargetselector.cpp @@ -42,10 +42,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderTargetSelectorPrivate + \class Qt3DRender::QRenderTargetSelectorPrivate \internal */ QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate() @@ -96,9 +98,9 @@ QRenderTarget *QRenderTargetSelector::target() const /*! * \internal * Sets the draw buffers \a buffers to be used. The draw buffers should be - * matching the Qt3D::QRenderAttachment::RenderAttachmentType - * defined in the attachments of the Qt3D::QRenderTarget associated to the - * Qt3D::QRenderTargetSelector instance. + * matching the Qt3DRender::QRenderAttachment::RenderAttachmentType + * defined in the attachments of the Qt3DRender::QRenderTarget associated to the + * Qt3DRender::QRenderTargetSelector instance. * * \note At render time, if no draw buffer has been specified, the renderer will * default to using all the attachments' draw buffers. @@ -120,7 +122,7 @@ void QRenderTargetSelector::setDrawBuffers(const QList<QRenderAttachment::Render } /*! - * Returns the list of draw buffers for the current Qt3D::QRenderTargetSelector instance. + * Returns the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance. */ QList<QRenderAttachment::RenderAttachmentType> QRenderTargetSelector::drawBuffers() const { @@ -133,6 +135,6 @@ QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Q { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.h b/src/render/frontend/framegraph-components/qrendertargetselector.h index 33529d4d9..c05f4584f 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector.h +++ b/src/render/frontend/framegraph-components/qrendertargetselector.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGETSELECTOR_H -#define QT3D_QRENDERTARGETSELECTOR_H +#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_H +#define QT3DRENDER_QRENDERTARGETSELECTOR_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qnode.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetSelectorPrivate; class QRenderTarget; @@ -52,9 +52,9 @@ class QRenderTarget; class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(Qt3D::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(QNode *parent = 0); + explicit QRenderTargetSelector(Qt3D::QNode *parent = 0); ~QRenderTargetSelector(); void setTarget(QRenderTarget *target); @@ -67,18 +67,18 @@ Q_SIGNALS: void targetChanged(); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTargetSelector) QT3D_CLONEABLE(QRenderTargetSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(QList<Qt3D::QRenderAttachment::RenderAttachmentType>) +Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderAttachment::RenderAttachmentType>) -#endif // QT3D_QRENDERTARGETSELECTOR_H +#endif // QT3DRENDER_QRENDERTARGETSELECTOR_H diff --git a/src/render/frontend/framegraph-components/qrendertargetselector_p.h b/src/render/frontend/framegraph-components/qrendertargetselector_p.h index 10a27ee3a..fa4d4aff2 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector_p.h +++ b/src/render/frontend/framegraph-components/qrendertargetselector_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGETSELECTOR_P_H -#define QT3D_QRENDERTARGETSELECTOR_P_H +#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_P_H +#define QT3DRENDER_QRENDERTARGETSELECTOR_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetSelector; class QRenderTarget; @@ -56,8 +56,8 @@ public: QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERTARGETSELECTOR_P_H +#endif // QT3DRENDER_QRENDERTARGETSELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qsortcriterion.cpp b/src/render/frontend/framegraph-components/qsortcriterion.cpp index a85608df9..2c09a552c 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion.cpp +++ b/src/render/frontend/framegraph-components/qsortcriterion.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! \class Qt3D::QSortCriterionPrivate @@ -91,6 +91,6 @@ QSortCriterion::QSortCriterion(QSortCriterionPrivate &dd, QNode *parent) { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortcriterion.h b/src/render/frontend/framegraph-components/qsortcriterion.h index 81371aa7e..d4e12a7a8 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion.h +++ b/src/render/frontend/framegraph-components/qsortcriterion.h @@ -34,24 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTCRITERION_H -#define QT3D_QSORTCRITERION_H +#ifndef QT3DRENDER_QSORTCRITERION_H +#define QT3DRENDER_QSORTCRITERION_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortCriterionPrivate; -class QT3DRENDERERSHARED_EXPORT QSortCriterion : public QNode +class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) + Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(QNode *parent = 0); + explicit QSortCriterion(Qt3D::QNode *parent = 0); ~QSortCriterion(); enum SortType { @@ -68,15 +68,15 @@ Q_SIGNALS: void sortChanged(); protected: - QSortCriterion(QSortCriterionPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QSortCriterion) Q_DECLARE_PRIVATE(QSortCriterion) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortcriterion_p.h b/src/render/frontend/framegraph-components/qsortcriterion_p.h index 7e75c9a59..d4701aa24 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion_p.h +++ b/src/render/frontend/framegraph-components/qsortcriterion_p.h @@ -34,17 +34,17 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTCRITERION_P_H -#define QT3D_QSORTCRITERION_P_H +#ifndef QT3DRENDER_QSORTCRITERION_P_H +#define QT3DRENDER_QSORTCRITERION_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/qsortcriterion.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QSortCriterionPrivate : public QNodePrivate +class QSortCriterionPrivate : public Qt3D::QNodePrivate { public: QSortCriterionPrivate(); @@ -53,8 +53,8 @@ public: QSortCriterion::SortType m_sort; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTCRITERION_P_H +#endif // QT3DRENDER_QSORTCRITERION_P_H diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/frontend/framegraph-components/qsortmethod.cpp index 824c8d198..c103fbe47 100644 --- a/src/render/frontend/framegraph-components/qsortmethod.cpp +++ b/src/render/frontend/framegraph-components/qsortmethod.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! \class Qt3D::QSortMethodPrivate @@ -113,6 +115,6 @@ QList<QSortCriterion *> QSortMethod::criteria() const return d->m_criteria; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortmethod.h b/src/render/frontend/framegraph-components/qsortmethod.h index c0f17fdd4..5eb5ee85e 100644 --- a/src/render/frontend/framegraph-components/qsortmethod.h +++ b/src/render/frontend/framegraph-components/qsortmethod.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTMETHOD_H -#define QT3D_QSORTMETHOD_H +#ifndef QT3DRENDER_QSORTMETHOD_H +#define QT3DRENDER_QSORTMETHOD_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortCriterion; class QSortMethodPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(QNode *parent = 0); + explicit QSortMethod(Qt3D::QNode *parent = 0); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,16 +59,16 @@ public: QList<QSortCriterion *> criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSortMethod) QT3D_CLONEABLE(QSortMethod) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTMETHOD_H +#endif // QT3DRENDER_QSORTMETHOD_H diff --git a/src/render/frontend/framegraph-components/qsortmethod_p.h b/src/render/frontend/framegraph-components/qsortmethod_p.h index 4ee604463..5cc7944ea 100644 --- a/src/render/frontend/framegraph-components/qsortmethod_p.h +++ b/src/render/frontend/framegraph-components/qsortmethod_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTMETHOD_P_H -#define QT3D_QSORTMETHOD_P_H +#ifndef QT3DRENDER_QSORTMETHOD_P_H +#define QT3DRENDER_QSORTMETHOD_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortMethod; class QSortCriterion; @@ -54,8 +54,8 @@ public: QList<QSortCriterion *> m_criteria; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTMETHOD_P_H +#endif // QT3DRENDER_QSORTMETHOD_P_H diff --git a/src/render/frontend/framegraph-components/qstateset.cpp b/src/render/frontend/framegraph-components/qstateset.cpp index aad72596c..cd7646d7b 100644 --- a/src/render/frontend/framegraph-components/qstateset.cpp +++ b/src/render/frontend/framegraph-components/qstateset.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QStateSetPrivate::QStateSetPrivate() : QFrameGraphNodePrivate() @@ -58,14 +60,14 @@ QStateSetPrivate::QStateSetPrivate() * branch. * * States set on a Qt3D::QStateSet are set globally, contrary to the per - * Material states that can be set on a Qt3D::QRenderPass. By default an empty + * Material states that can be set on a Qt3DRender::QRenderPass. By default an empty * Qt3D::QStateSet will result in all render states being disabled when * executed. Adding a Qt3D::QRenderState state explicitly enables that render * state at runtime. * * \since 5.5 * - * \sa Qt3D::QRenderState, Qt3D::QRenderPass + * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass */ QStateSet::QStateSet(QNode *parent) @@ -141,6 +143,6 @@ QList<QRenderState *> QStateSet::renderStates() const return d->m_renderStates; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qstateset.h b/src/render/frontend/framegraph-components/qstateset.h index 24c8609ed..c9d6eb68d 100644 --- a/src/render/frontend/framegraph-components/qstateset.h +++ b/src/render/frontend/framegraph-components/qstateset.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTATESET_H -#define QT3D_QSTATESET_H +#ifndef QT3DRENDER_QSTATESET_H +#define QT3DRENDER_QSTATESET_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStateSetPrivate; class QRenderState; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode Q_OBJECT public: - explicit QStateSet(QNode *parent = 0); + explicit QStateSet(Qt3D::QNode *parent = 0); ~QStateSet(); void addRenderState(QRenderState *state); @@ -59,16 +59,16 @@ public: QList<QRenderState *> renderStates() const; protected: - QStateSet(QStateSetPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStateSet) QT3D_CLONEABLE(QStateSet) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTATESET_H +#endif // QT3DRENDER_QSTATESET_H diff --git a/src/render/frontend/framegraph-components/qstateset_p.h b/src/render/frontend/framegraph-components/qstateset_p.h index 290578bec..69e743fd0 100644 --- a/src/render/frontend/framegraph-components/qstateset_p.h +++ b/src/render/frontend/framegraph-components/qstateset_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTATESET_P_H -#define QT3D_QSTATESET_P_H +#ifndef QT3DRENDER_QSTATESET_P_H +#define QT3DRENDER_QSTATESET_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStateSet; class QRenderState; @@ -55,9 +55,9 @@ public: QList<QRenderState *> m_renderStates; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTATESET_P_H +#endif // QT3DRENDER_QSTATESET_P_H diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp index 1a1efc553..6092fb870 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp +++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QTechniqueFilterPrivate + \class Qt3DRender::QTechniqueFilterPrivate \internal */ QTechniqueFilterPrivate::QTechniqueFilterPrivate() @@ -158,6 +160,6 @@ QList<QParameter *> QTechniqueFilter::parameters() const return d->m_parameters; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/frontend/framegraph-components/qtechniquefilter.h index eae99d231..8b8a115f8 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter.h +++ b/src/render/frontend/framegraph-components/qtechniquefilter.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUEFILTER_H -#define QT3D_QTECHNIQUEFILTER_H +#ifndef QT3DRENDER_QTECHNIQUEFILTER_H +#define QT3DRENDER_QTECHNIQUEFILTER_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechniqueFilterPrivate; class QAnnotation; @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(QNode *parent = 0); + explicit QTechniqueFilter(Qt3D::QNode *parent = 0); ~QTechniqueFilter(); QList<QAnnotation *> criteria() const; @@ -64,16 +64,16 @@ public: QList<QParameter *> parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechniqueFilter) QT3D_CLONEABLE(QTechniqueFilter) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUEFILTER_H +#endif // QT3DRENDER_QTECHNIQUEFILTER_H diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/frontend/framegraph-components/qtechniquefilter_p.h index 1b87f4e12..219e50b9a 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h +++ b/src/render/frontend/framegraph-components/qtechniquefilter_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUEFILTER_P_H -#define QT3D_QTECHNIQUEFILTER_P_H +#ifndef QT3DRENDER_QTECHNIQUEFILTER_P_H +#define QT3DRENDER_QTECHNIQUEFILTER_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechniqueFilter; @@ -55,8 +55,8 @@ public : QList<QParameter *> m_parameters; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUEFILTER_P_H +#endif // QT3DRENDER_QTECHNIQUEFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/frontend/framegraph-components/qviewport.cpp index 6197dcd52..4f821b58f 100644 --- a/src/render/frontend/framegraph-components/qviewport.cpp +++ b/src/render/frontend/framegraph-components/qviewport.cpp @@ -41,10 +41,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QViewportPrivate + \class Qt3DRender::QViewportPrivate \internal */ QViewportPrivate::QViewportPrivate() @@ -106,6 +106,6 @@ void QViewport::setClearColor(const QColor &color) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qviewport.h b/src/render/frontend/framegraph-components/qviewport.h index 7390e85ae..3f427d044 100644 --- a/src/render/frontend/framegraph-components/qviewport.h +++ b/src/render/frontend/framegraph-components/qviewport.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QVIEWPORT_H -#define QT3D_QVIEWPORT_H +#ifndef QT3DRENDER_QVIEWPORT_H +#define QT3DRENDER_QVIEWPORT_H #include <Qt3DRenderer/qframegraphnode.h> #include <QRectF> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QViewportPrivate; @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: - explicit QViewport(QNode *parent = 0); + explicit QViewport(Qt3D::QNode *parent = 0); ~QViewport(); QRectF rect() const; @@ -68,16 +68,16 @@ Q_SIGNALS: void clearColorChanged(); protected: - QViewport(QViewportPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QViewport) QT3D_CLONEABLE(QViewport) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QVIEWPORT_H +#endif // QT3DRENDER_QVIEWPORT_H diff --git a/src/render/frontend/framegraph-components/qviewport_p.h b/src/render/frontend/framegraph-components/qviewport_p.h index 4e42887d7..bb1cd1a26 100644 --- a/src/render/frontend/framegraph-components/qviewport_p.h +++ b/src/render/frontend/framegraph-components/qviewport_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QVIEWPORT_P_H -#define QT3D_QVIEWPORT_P_H +#ifndef QT3DRENDER_QVIEWPORT_P_H +#define QT3DRENDER_QVIEWPORT_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QViewport; @@ -55,8 +55,8 @@ public : QColor m_clearColor; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QVIEWPORT_P_H +#endif // QT3DRENDER_QVIEWPORT_P_H diff --git a/src/render/frontend/qabstractlight.cpp b/src/render/frontend/qabstractlight.cpp index 053841ee8..82e1826be 100644 --- a/src/render/frontend/qabstractlight.cpp +++ b/src/render/frontend/qabstractlight.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D +namespace Qt3DRender { /*! @@ -155,6 +155,6 @@ QShaderData::TransformType QAbstractLight::positionTransformed() const return QShaderData::ModelToEye; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qabstractlight.h b/src/render/frontend/qabstractlight.h index c5db0e67c..6f30fe955 100644 --- a/src/render/frontend/qabstractlight.h +++ b/src/render/frontend/qabstractlight.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTLIGHT_H -#define QT3D_QABSTRACTLIGHT_H +#ifndef QT3DRENDER_QABSTRACTLIGHT_H +#define QT3DRENDER_QABSTRACTLIGHT_H #include <Qt3DRenderer/qshaderdata.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D -{ +namespace Qt3DRender { class QAbstractLightPrivate; @@ -59,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT) public : - explicit QAbstractLight(QNode *parent = 0); + explicit QAbstractLight(Qt3D::QNode *parent = 0); QColor color() const; void setColor(const QColor &color); @@ -73,8 +72,8 @@ public : TransformType positionTransformed() const; protected : - QAbstractLight(QAbstractLightPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: void colorChanged(); @@ -85,8 +84,8 @@ private: Q_DECLARE_PRIVATE(QAbstractLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_LIGHT_H +#endif // QT3DRENDER_LIGHT_H diff --git a/src/render/frontend/qabstractlight_p.h b/src/render/frontend/qabstractlight_p.h index 1d90a398a..9d70d4bb9 100644 --- a/src/render/frontend/qabstractlight_p.h +++ b/src/render/frontend/qabstractlight_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTLIGHT_P_H -#define QT3D_QABSTRACTLIGHT_P_H +#ifndef QT3DRENDER_QABSTRACTLIGHT_P_H +#define QT3DRENDER_QABSTRACTLIGHT_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <private/qshaderdata_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractLight; @@ -61,4 +61,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTLIGHT_P_H +#endif // QT3DRENDER_QABSTRACTLIGHT_P_H diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/frontend/qabstractsceneloader.cpp index 539fdcf5e..d0e9a8838 100644 --- a/src/render/frontend/qabstractsceneloader.cpp +++ b/src/render/frontend/qabstractsceneloader.cpp @@ -42,12 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - -namespace Render { +namespace Qt3DRender { /*! - \class Qt3D::Render::QAbstractSceneLoaderPrivate + \class Qt3DRender::Render::QAbstractSceneLoaderPrivate \internal */ QAbstractSceneLoaderPrivate::QAbstractSceneLoaderPrivate() @@ -70,7 +68,7 @@ QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent) QAbstractSceneLoader::~QAbstractSceneLoader() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor"); } void QAbstractSceneLoader::copy(const QNode *ref) @@ -109,8 +107,6 @@ void QAbstractSceneLoader::setStatus(QAbstractSceneLoader::Status status) } } -} // Render - -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/frontend/qabstractsceneloader.h index 368eb4bc6..88af95577 100644 --- a/src/render/frontend/qabstractsceneloader.h +++ b/src/render/frontend/qabstractsceneloader.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTSCENELOADER_H -#define QT3D_QABSTRACTSCENELOADER_H +#ifndef QT3DRENDER_QABSTRACTSCENELOADER_H +#define QT3DRENDER_QABSTRACTSCENELOADER_H #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> @@ -44,19 +44,18 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { -namespace Render { +namespace Qt3DRender { class QAbstractSceneLoader; class QAbstractSceneLoaderPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public QComponent +class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3D::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QAbstractSceneLoader(QNode *parent = 0); + explicit QAbstractSceneLoader(Qt3D::QNode *parent = 0); ~QAbstractSceneLoader(); enum Status { @@ -77,17 +76,15 @@ Q_SIGNALS: void statusChanged(); protected: - QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAbstractSceneLoader) }; -} // Render - -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QABSTRACTSCENELOADER_H +#endif // QT3DRENDER_QABSTRACTSCENELOADER_H diff --git a/src/render/frontend/qabstractsceneloader_p.h b/src/render/frontend/qabstractsceneloader_p.h index c76f5d854..3377c730c 100644 --- a/src/render/frontend/qabstractsceneloader_p.h +++ b/src/render/frontend/qabstractsceneloader_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTSCENELOADER_P_H -#define QT3D_QABSTRACTSCENELOADER_P_H +#ifndef QT3DRENDER_QABSTRACTSCENELOADER_P_H +#define QT3DRENDER_QABSTRACTSCENELOADER_P_H #include <private/qcomponent_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,14 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class AbstractSceneParser; -namespace Render { - - -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3D::QComponentPrivate { public: QAbstractSceneLoaderPrivate(); @@ -61,10 +58,8 @@ public: QAbstractSceneLoader::Status m_status; }; -} // Render - -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QABSTRACTSCENE_P_H +#endif // QT3DRENDER_QABSTRACTSCENE_P_H diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp index f02cf1002..5f44090d4 100644 --- a/src/render/frontend/qabstracttextureimage.cpp +++ b/src/render/frontend/qabstracttextureimage.cpp @@ -40,7 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! \class Qt3D::QAbstractTextureImagePrivate @@ -89,7 +91,7 @@ QAbstractTextureImage::QAbstractTextureImage(QNode *parent) */ QAbstractTextureImage::~QAbstractTextureImage() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor"); } @@ -217,6 +219,6 @@ QAbstractTextureImage::QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Q { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qabstracttextureimage.h b/src/render/frontend/qabstracttextureimage.h index e73e823d1..24efd2508 100644 --- a/src/render/frontend/qabstracttextureimage.h +++ b/src/render/frontend/qabstracttextureimage.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTTEXTUREIMAGE_H -#define QT3D_QABSTRACTTEXTUREIMAGE_H +#ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_H +#define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H #include <Qt3DCore/qabstractfunctor.h> #include <Qt3DRenderer/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { // TO DO TexImageDataPtr -> QImageDataPtr + d_ptr // We might also get rid of the layer, face, mipmap level from // TexImageDataPtr and store that in the functor directly // or use the QTextureImage instead -class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public QAbstractFunctor +class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3D::QAbstractFunctor { public: virtual ~QTextureDataFunctor() {} @@ -60,14 +60,14 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr; class QAbstractTextureImagePrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public QNode +class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged) Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) - Q_PROPERTY(Qt3D::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) public: - explicit QAbstractTextureImage(QNode *parent = 0); + explicit QAbstractTextureImage(Qt3D::QNode *parent = 0); virtual ~QAbstractTextureImage(); int mipmapLevel() const; @@ -87,17 +87,17 @@ Q_SIGNALS: void cubeMapFaceChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; - QAbstractTextureImage(QAbstractTextureImagePrivate &dd, QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3D::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QAbstractTextureImage) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QTextureDataFunctorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QTextureDataFunctorPtr) -#endif // QT3D_QABSTRACTTEXTUREIMAGE_H +#endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_H diff --git a/src/render/frontend/qabstracttextureimage_p.h b/src/render/frontend/qabstracttextureimage_p.h index fd795f18a..a56cd7573 100644 --- a/src/render/frontend/qabstracttextureimage_p.h +++ b/src/render/frontend/qabstracttextureimage_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTTEXTUREIMAGE_P_H -#define QT3D_QABSTRACTTEXTUREIMAGE_P_H +#ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H +#define QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRenderer/private/qt3drenderer_global_p.h> @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureImage; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public QNodePrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3D::QNodePrivate { public: QAbstractTextureImagePrivate() @@ -65,9 +65,9 @@ public: QAbstractTextureProvider::CubeMapFace m_face; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QABSTRACTTEXTUREIMAGE_P_H +#endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H diff --git a/src/render/frontend/qabstracttextureprovider.cpp b/src/render/frontend/qabstracttextureprovider.cpp index 8d858da38..34259b511 100644 --- a/src/render/frontend/qabstracttextureprovider.cpp +++ b/src/render/frontend/qabstracttextureprovider.cpp @@ -41,10 +41,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QAbstractTextureProviderPrivate + \class Qt3DRender::QAbstractTextureProviderPrivate \internal */ QAbstractTextureProviderPrivate::QAbstractTextureProviderPrivate() @@ -88,12 +90,12 @@ void QAbstractTextureProvider::copy(const QNode *ref) } /*! - \class Qt3D::QAbstractTextureProvider + \class Qt3DRender::QAbstractTextureProvider \inmodule Qt3DRender \since 5.5 \brief A base class to be used to provide textures. - Qt3D::QAbstractTextureProvider shouldn't be used directly but rather + Qt3DRender::QAbstractTextureProvider shouldn't be used directly but rather through one of its subclasses. Each subclass implements a given texture target (2D, 2DArray, 3D, CubeMap ...) Each subclass provides a set of functors for each layer, cube map face and mipmap level. In turn the @@ -137,7 +139,7 @@ void QAbstractTextureProvider::setSize(int w, int h, int d) } /*! - \property Qt3D::QAbstractTextureProvider::width + \property Qt3DRender::QAbstractTextureProvider::width Holds the width of the texture provider. */ @@ -151,7 +153,7 @@ void QAbstractTextureProvider::setWidth(int width) } /*! - \property Qt3D::QAbstractTextureProvider::height + \property Qt3DRender::QAbstractTextureProvider::height Holds the height of the texture provider. */ @@ -165,7 +167,7 @@ void QAbstractTextureProvider::setHeight(int height) } /*! - \property Qt3D::QAbstractTextureProvider::depth + \property Qt3DRender::QAbstractTextureProvider::depth Holds the depth of the texture provider. */ @@ -197,7 +199,7 @@ int QAbstractTextureProvider::depth() const } /*! - \property Qt3D::QAbstractTextureProvider::maximumLayers + \property Qt3DRender::QAbstractTextureProvider::maximumLayers Holds the maximum layer count of the texture provider. By default, the maximum layer count is 1. @@ -227,7 +229,7 @@ int QAbstractTextureProvider::maximumLayers() const } /*! - \property Qt3D::QAbstractTextureProvider::unique + \property Qt3DRender::QAbstractTextureProvider::unique Sets whether this texture provider should be unique by reading \a unique. By default this is false. @@ -260,7 +262,7 @@ bool QAbstractTextureProvider::isUnique() const } /*! - \property Qt3D::QAbstractTextureProvider::format + \property Qt3DRender::QAbstractTextureProvider::format Holds the format of the texture provider. */ @@ -283,7 +285,7 @@ QAbstractTextureProvider::TextureFormat QAbstractTextureProvider::format() const } /*! - \property Qt3D::QAbstractTextureProvider::status readonly + \property Qt3DRender::QAbstractTextureProvider::status readonly Holds the current status of the texture provider. */ @@ -303,7 +305,7 @@ QAbstractTextureProvider::Status QAbstractTextureProvider::status() const } /*! - \property Qt3D::QAbstractTextureProvider::target readonly + \property Qt3DRender::QAbstractTextureProvider::target readonly Holds the target format of the texture provider. @@ -319,7 +321,7 @@ QAbstractTextureProvider::Target QAbstractTextureProvider::target() const Adds a new Qt3D::QAbstractTextureImage \a textureImage to the texture provider. \note Qt3D::QAbstractTextureImage should never be shared between multiple - Qt3D::QAbstractTextureProvider instances. + Qt3DRender::QAbstractTextureProvider instances. */ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureImage) { @@ -372,7 +374,7 @@ QList<QAbstractTextureImage *> QAbstractTextureProvider::textureImages() const } /*! - \property Qt3D::QAbstractTextureProvider::generateMipMaps + \property Qt3DRender::QAbstractTextureProvider::generateMipMaps Holds whether the texture provider should auto generate mipmaps. */ @@ -392,7 +394,7 @@ bool QAbstractTextureProvider::generateMipMaps() const } /*! - \property Qt3D::QAbstractTextureProvider::minificationFilter + \property Qt3DRender::QAbstractTextureProvider::minificationFilter Holds the minification filter of the texture provider. */ @@ -406,7 +408,7 @@ void QAbstractTextureProvider::setMinificationFilter(Filter f) } /*! - \property Qt3D::QAbstractTextureProvider::magnificationFilter + \property Qt3DRender::QAbstractTextureProvider::magnificationFilter Holds the magnification filter of the texture provider. */ @@ -432,7 +434,7 @@ QAbstractTextureProvider::Filter QAbstractTextureProvider::magnificationFilter() } /*! - \property Qt3D::QAbstractTextureProvider::wrapMode + \property Qt3DRender::QAbstractTextureProvider::wrapMode Holds the wrap mode of the texture provider. */ @@ -469,7 +471,7 @@ QTextureWrapMode *QAbstractTextureProvider::wrapMode() } /*! - \property Qt3D::QAbstractTextureProvider::maximumAnisotropy + \property Qt3DRender::QAbstractTextureProvider::maximumAnisotropy Holds the maximum anisotropy of the texture provider. */ @@ -489,7 +491,7 @@ float QAbstractTextureProvider::maximumAnisotropy() const } /*! - \property Qt3D::QAbstractTextureProvider::comparisonFunction + \property Qt3DRender::QAbstractTextureProvider::comparisonFunction Holds the comparison function of the texture provider. */ @@ -509,7 +511,7 @@ QAbstractTextureProvider::ComparisonFunction QAbstractTextureProvider::compariso } /*! - \property Qt3D::QAbstractTextureProvider::comparisonMode + \property Qt3DRender::QAbstractTextureProvider::comparisonMode Holds the comparison mode of the texture provider. */ @@ -528,6 +530,6 @@ QAbstractTextureProvider::ComparisonMode QAbstractTextureProvider::comparisonMod return d->m_comparisonMode; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/frontend/qabstracttextureprovider.h index 436e3f84c..4a8e3adde 100644 --- a/src/render/frontend/qabstracttextureprovider.h +++ b/src/render/frontend/qabstracttextureprovider.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTTEXTUREPROVIDER_H -#define QT3D_QABSTRACTTEXTUREPROVIDER_H +#ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H +#define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H #include <Qt3DRenderer/texturedata.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,19 +43,19 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureProviderPrivate; class QTextureWrapMode; class QAbstractTextureImage; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public QNode +class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(Target target READ target CONSTANT) Q_PROPERTY(TextureFormat format READ format WRITE setFormat NOTIFY formatChanged) Q_PROPERTY(bool generateMipMaps READ generateMipMaps WRITE setGenerateMipMaps NOTIFY generateMipMapsChanged) - Q_PROPERTY(Qt3D::QTextureWrapMode *wrapMode READ wrapMode CONSTANT) + Q_PROPERTY(Qt3DRender::QTextureWrapMode *wrapMode READ wrapMode CONSTANT) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) @@ -326,10 +326,10 @@ Q_SIGNALS: void uniqueChanged(); protected: - explicit QAbstractTextureProvider(QNode *parent = 0); - explicit QAbstractTextureProvider(Target target, QNode *parent = 0); - QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + explicit QAbstractTextureProvider(Qt3D::QNode *parent = 0); + explicit QAbstractTextureProvider(Target target, Qt3D::QNode *parent = 0); + QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; void setStatus(Status status); private: @@ -337,8 +337,8 @@ private: QT3D_CLONEABLE(QAbstractTextureProvider) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QABSTRACTTEXTUREPROVIDER_H +#endif // QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H diff --git a/src/render/frontend/qabstracttextureprovider_p.h b/src/render/frontend/qabstracttextureprovider_p.h index b9f216e5c..c6516904c 100644 --- a/src/render/frontend/qabstracttextureprovider_p.h +++ b/src/render/frontend/qabstracttextureprovider_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTTEXTUREPROVIDER_P_H -#define QT3D_QABSTRACTTEXTUREPROVIDER_P_H +#ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H +#define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/private/qnode_p.h> @@ -44,9 +44,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QAbstractTextureProviderPrivate : public QNodePrivate +class QAbstractTextureProviderPrivate : public Qt3D::QNodePrivate { public : QAbstractTextureProviderPrivate(); @@ -76,5 +76,5 @@ public : QT_END_NAMESPACE -#endif // QT3D_QABSTRACTTEXTUREPROVIDER_P_H +#endif // QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H diff --git a/src/render/frontend/qalphacoverage.cpp b/src/render/frontend/qalphacoverage.cpp index 2075b2704..7a8fea6bb 100644 --- a/src/render/frontend/qalphacoverage.cpp +++ b/src/render/frontend/qalphacoverage.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAlphaCoveragePrivate : public QRenderStatePrivate { @@ -62,6 +62,6 @@ QAlphaCoverage::~QAlphaCoverage() QNode::cleanup(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qalphacoverage.h b/src/render/frontend/qalphacoverage.h index 7ac1c7765..753b28919 100644 --- a/src/render/frontend/qalphacoverage.h +++ b/src/render/frontend/qalphacoverage.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QALPHACOVERAGE_H -#define QT3D_QALPHACOVERAGE_H +#ifndef QT3DRENDER_QALPHACOVERAGE_H +#define QT3DRENDER_QALPHACOVERAGE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAlphaCoveragePrivate; @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: - explicit QAlphaCoverage(QNode *parent = 0); + explicit QAlphaCoverage(Qt3D::QNode *parent = 0); ~QAlphaCoverage(); private: @@ -58,8 +58,8 @@ private: QT3D_CLONEABLE(QAlphaCoverage) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QALPHACOVERAGE_H +#endif // QT3DRENDER_QALPHACOVERAGE_H diff --git a/src/render/frontend/qalphatest.cpp b/src/render/frontend/qalphatest.cpp index 1fb92db3a..34071c52d 100644 --- a/src/render/frontend/qalphatest.cpp +++ b/src/render/frontend/qalphatest.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAlphaTestPrivate : public QRenderStatePrivate { @@ -107,6 +107,6 @@ void QAlphaTest::setClamp(float clamp) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qalphatest.h b/src/render/frontend/qalphatest.h index 4e8e86ca6..d59340ec7 100644 --- a/src/render/frontend/qalphatest.h +++ b/src/render/frontend/qalphatest.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QALPHATEST_H -#define QT3D_QALPHATEST_H +#ifndef QT3DRENDER_QALPHATEST_H +#define QT3DRENDER_QALPHATEST_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAlphaTestPrivate; @@ -65,7 +65,7 @@ public: }; Q_ENUM(AlphaFunc) - explicit QAlphaTest(QNode *parent = 0); + explicit QAlphaTest(Qt3D::QNode *parent = 0); ~QAlphaTest(); AlphaFunc func() const; @@ -79,15 +79,15 @@ Q_SIGNALS: void clampChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAlphaTest) QT3D_CLONEABLE(QAlphaTest) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QALPHATEST_H +#endif // QT3DRENDER_QALPHATEST_H diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp index 1c0a2c583..85a46fcbe 100644 --- a/src/render/frontend/qannotation.cpp +++ b/src/render/frontend/qannotation.cpp @@ -41,11 +41,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QAnnotationPrivate + \class Qt3DRender::QAnnotationPrivate \internal */ QAnnotationPrivate::QAnnotationPrivate() @@ -54,7 +54,7 @@ QAnnotationPrivate::QAnnotationPrivate() } /*! - \class QAnnotation + \class Qt3DRender::QAnnotation \inmodule Qt3DRenderer \since 5.5 \brief The QAnnotation class provides ... @@ -62,7 +62,7 @@ QAnnotationPrivate::QAnnotationPrivate() /*! \qmltype Annotation - \instantiates Qt3D::QAnnotation + \instantiates Qt3DRender::QAnnotation \inherits Node \inqmlmodule Qt3D.Renderer \since 5.5 @@ -141,6 +141,6 @@ QString QAnnotation::name() const return d->m_name; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qannotation.h b/src/render/frontend/qannotation.h index f38402fb3..158ebdc77 100644 --- a/src/render/frontend/qannotation.h +++ b/src/render/frontend/qannotation.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QANNOTATION_H -#define QT3D_QANNOTATION_H +#ifndef QT3DRENDER_QANNOTATION_H +#define QT3DRENDER_QANNOTATION_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qnode.h> @@ -43,17 +43,17 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAnnotationPrivate; -class QT3DRENDERERSHARED_EXPORT QAnnotation : public QNode +class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - explicit QAnnotation(QNode *parent = 0); + explicit QAnnotation(Qt3D::QNode *parent = 0); ~QAnnotation(); void setValue(const QVariant &value); @@ -67,15 +67,15 @@ Q_SIGNALS: void valueChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAnnotation) QT3D_CLONEABLE(QAnnotation) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QANNOTATION_H +#endif // QT3DRENDER_QANNOTATION_H diff --git a/src/render/frontend/qannotation_p.h b/src/render/frontend/qannotation_p.h index d0bd44dc5..e61ee0c35 100644 --- a/src/render/frontend/qannotation_p.h +++ b/src/render/frontend/qannotation_p.h @@ -34,17 +34,17 @@ ** ****************************************************************************/ -#ifndef QT3D_QANNOTATION_P_H -#define QT3D_QANNOTATION_P_H +#ifndef QT3DRENDER_QANNOTATION_P_H +#define QT3DRENDER_QANNOTATION_P_H #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRenderer/qannotation.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QAnnotationPrivate : public QNodePrivate +class QAnnotationPrivate : public Qt3D::QNodePrivate { public: QAnnotationPrivate(); @@ -54,8 +54,8 @@ public: QVariant m_value; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QANNOTATION_P_H +#endif // QT3DRENDER_QANNOTATION_P_H diff --git a/src/render/frontend/qblendequation.cpp b/src/render/frontend/qblendequation.cpp index 1631a74dd..bee40fc67 100644 --- a/src/render/frontend/qblendequation.cpp +++ b/src/render/frontend/qblendequation.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QBlendEquationPrivate : public QRenderStatePrivate { @@ -88,6 +88,6 @@ void QBlendEquation::setMode(QBlendEquation::BlendMode mode) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qblendequation.h b/src/render/frontend/qblendequation.h index 78df85183..94735fdb6 100644 --- a/src/render/frontend/qblendequation.h +++ b/src/render/frontend/qblendequation.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QBLENDEQUATION_H -#define QT3D_QBLENDEQUATION_H +#ifndef QT3DRENDER_QBLENDEQUATION_H +#define QT3DRENDER_QBLENDEQUATION_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QBlendEquationPrivate; @@ -62,7 +62,7 @@ public: }; Q_ENUM(BlendMode) - explicit QBlendEquation(QNode *parent = 0); + explicit QBlendEquation(Qt3D::QNode *parent = 0); ~QBlendEquation(); BlendMode mode() const; @@ -72,15 +72,15 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QBlendEquation) QT3D_CLONEABLE(QBlendEquation) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QBLENDEQUATION_H +#endif // QT3DRENDER_QBLENDEQUATION_H diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp index e3344c0cc..7f7a8d680 100644 --- a/src/render/frontend/qblendstate.cpp +++ b/src/render/frontend/qblendstate.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QBlendStatePrivate : public QRenderStatePrivate { @@ -260,6 +260,6 @@ QBlendStateSeparate::QBlendStateSeparate(QNode *parent) { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qblendstate.h b/src/render/frontend/qblendstate.h index 7f3901f22..25072f449 100644 --- a/src/render/frontend/qblendstate.h +++ b/src/render/frontend/qblendstate.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QBLENDSTATE_H -#define QT3D_QBLENDSTATE_H +#ifndef QT3DRENDER_QBLENDSTATE_H +#define QT3DRENDER_QBLENDSTATE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QBlendStatePrivate; @@ -80,7 +80,7 @@ public: }; Q_ENUM(Blending) - explicit QBlendState(QNode *parent = 0); + explicit QBlendState(Qt3D::QNode *parent = 0); ~QBlendState(); Blending srcRGB() const; @@ -102,8 +102,8 @@ Q_SIGNALS: void dstAlphaChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; - QBlendState(QRenderState::Type type, QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QBlendState) @@ -114,11 +114,11 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: - explicit QBlendStateSeparate(QNode *parent = 0); + explicit QBlendStateSeparate(Qt3D::QNode *parent = 0); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QBLENDSTATE_H +#endif // QT3DRENDER_QBLENDSTATE_H diff --git a/src/render/frontend/qclipplane.cpp b/src/render/frontend/qclipplane.cpp index 61f406187..d3f2fadb3 100644 --- a/src/render/frontend/qclipplane.cpp +++ b/src/render/frontend/qclipplane.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClipPlanePrivate : public QRenderStatePrivate { @@ -120,6 +120,6 @@ void QClipPlane::copy(const QNode *ref) d_func()->m_plane = refClip->plane(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qclipplane.h b/src/render/frontend/qclipplane.h index a1d6c0db3..7afa6c5e7 100644 --- a/src/render/frontend/qclipplane.h +++ b/src/render/frontend/qclipplane.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QCLIPPLANE_H -#define QT3D_QCLIPPLANE_H +#ifndef QT3DRENDER_QCLIPPLANE_H +#define QT3DRENDER_QCLIPPLANE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClipPlanePrivate; @@ -50,14 +50,14 @@ class QT3DRENDERERSHARED_EXPORT QClipPlane : public QRenderState Q_OBJECT Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged) public: - explicit QClipPlane(QNode *parent = 0); + explicit QClipPlane(Qt3D::QNode *parent = 0); ~QClipPlane(); int plane() const; void setPlane(int); protected: - void copy(const QNode *ref) Q_DECL_FINAL; + void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; Q_SIGNALS: void planeChanged(); @@ -67,8 +67,8 @@ private: QT3D_CLONEABLE(QClipPlane) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCLIPPLANE_H +#endif // QT3DRENDER_QCLIPPLANE_H diff --git a/src/render/frontend/qcolormask.cpp b/src/render/frontend/qcolormask.cpp index 3c2057c08..9f61825ea 100644 --- a/src/render/frontend/qcolormask.cpp +++ b/src/render/frontend/qcolormask.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QColorMaskPrivate : public QRenderStatePrivate { @@ -173,7 +173,7 @@ void QColorMask::copy(const QNode *ref) d_func()->m_alpha = refState->d_func()->m_alpha; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qcolormask.h b/src/render/frontend/qcolormask.h index b58f4f569..886feebbb 100644 --- a/src/render/frontend/qcolormask.h +++ b/src/render/frontend/qcolormask.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOLORMASK_H -#define QT3D_QCOLORMASK_H +#ifndef QT3DRENDER_QCOLORMASK_H +#define QT3DRENDER_QCOLORMASK_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QColorMaskPrivate; @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState Q_PROPERTY(bool alpha READ isAlpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QColorMask(QNode *parent = Q_NULLPTR); + explicit QColorMask(Qt3D::QNode *parent = Q_NULLPTR); ~QColorMask(); bool isRed() const; @@ -74,15 +74,15 @@ Q_SIGNALS: void alphaChanged(); protected: - void copy(const QNode *ref) Q_DECL_FINAL; + void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QColorMask) QT3D_CLONEABLE(QColorMask) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCOLORMASK_H +#endif // QT3DRENDER_QCOLORMASK_H diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/frontend/qcuboidmesh.cpp index 9e26d8400..85435c893 100644 --- a/src/render/frontend/qcuboidmesh.cpp +++ b/src/render/frontend/qcuboidmesh.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { @@ -398,7 +398,7 @@ private: }; /*! - \class Qt3D::QCuboidMeshPrivate + \class Qt3DRender::QCuboidMeshPrivate \internal */ class CuboidGeometry : public QGeometry @@ -690,7 +690,7 @@ QSize QCuboidMesh::xyMeshResolution() const return static_cast<CuboidGeometry *>(geometry())->xyMeshResolution(); } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qcuboidmesh.h b/src/render/frontend/qcuboidmesh.h index 8e4578795..293c948d0 100644 --- a/src/render/frontend/qcuboidmesh.h +++ b/src/render/frontend/qcuboidmesh.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CUBOIDMESH_H -#define QT3D_CUBOIDMESH_H +#ifndef QT3DRENDER_CUBOIDMESH_H +#define QT3DRENDER_CUBOIDMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer { @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged) public: - explicit QCuboidMesh(QNode *parent = 0); + explicit QCuboidMesh(Qt3D::QNode *parent = 0); ~QCuboidMesh(); void setXExtent(float xExtent); @@ -103,8 +103,8 @@ private: void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_CUBOIDMESH_H +#endif // QT3DRENDER_CUBOIDMESH_H diff --git a/src/render/frontend/qcullface.cpp b/src/render/frontend/qcullface.cpp index 4bd885c34..ce71aaa59 100644 --- a/src/render/frontend/qcullface.cpp +++ b/src/render/frontend/qcullface.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QCullFacePrivate : public QRenderStatePrivate { @@ -89,6 +89,6 @@ void QCullFace::setMode(QCullFace::CullingMode mode) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qcullface.h b/src/render/frontend/qcullface.h index 646df0811..d8832bcd6 100644 --- a/src/render/frontend/qcullface.h +++ b/src/render/frontend/qcullface.h @@ -36,14 +36,14 @@ ****************************************************************************/ -#ifndef QT3D_QCULLFACE_H -#define QT3D_QCULLFACE_H +#ifndef QT3DRENDER_QCULLFACE_H +#define QT3DRENDER_QCULLFACE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QCullFacePrivate; @@ -62,7 +62,7 @@ public: }; Q_ENUM(CullingMode) - explicit QCullFace(QNode *parent = 0); + explicit QCullFace(Qt3D::QNode *parent = 0); ~QCullFace(); CullingMode mode() const; @@ -72,15 +72,15 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QCullFace) QT3D_CLONEABLE(QCullFace) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCULLFACE_H +#endif // QT3DRENDER_QCULLFACE_H diff --git a/src/render/frontend/qcylindergeometry.cpp b/src/render/frontend/qcylindergeometry.cpp index 328c34deb..a1fff8a5f 100644 --- a/src/render/frontend/qcylindergeometry.cpp +++ b/src/render/frontend/qcylindergeometry.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { @@ -447,6 +447,6 @@ float QCylinderGeometry::length() const return d->m_length; } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qcylindergeometry.h b/src/render/frontend/qcylindergeometry.h index 28b542ebe..3f381c609 100644 --- a/src/render/frontend/qcylindergeometry.h +++ b/src/render/frontend/qcylindergeometry.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QCYLINDERGEOMETRY_H -#define QT3D_QCYLINDERGEOMETRY_H +#ifndef QT3DRENDER_QCYLINDERGEOMETRY_H +#define QT3DRENDER_QCYLINDERGEOMETRY_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometry.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QCylinderGeometryPrivate; @@ -84,8 +84,8 @@ private: QT3D_CLONEABLE(QCylinderGeometry) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCYLINDERGEOMETRY_H +#endif // QT3DRENDER_QCYLINDERGEOMETRY_H diff --git a/src/render/frontend/qcylindergeometry_p.h b/src/render/frontend/qcylindergeometry_p.h index b6fa67b2b..4fea1b5ba 100644 --- a/src/render/frontend/qcylindergeometry_p.h +++ b/src/render/frontend/qcylindergeometry_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QCYLINDERGEOMETRY_P_H -#define QT3D_QCYLINDERGEOMETRY_P_H +#ifndef QT3DRENDER_QCYLINDERGEOMETRY_P_H +#define QT3DRENDER_QCYLINDERGEOMETRY_P_H #include <Qt3DRenderer/private/qgeometry_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAttribute; class QBuffer; @@ -67,9 +67,9 @@ public: QBuffer *m_indexBuffer; }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCYLINDERGEOMETRY_P_H +#endif // QT3DRENDER_QCYLINDERGEOMETRY_P_H diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp index c944f0977..8d9783493 100644 --- a/src/render/frontend/qcylindermesh.cpp +++ b/src/render/frontend/qcylindermesh.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { QCylinderMesh::QCylinderMesh(QNode *parent) : QGeometryRenderer(parent) @@ -108,6 +108,6 @@ float QCylinderMesh::length() const return static_cast<QCylinderGeometry *>(geometry())->length(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qcylindermesh.h b/src/render/frontend/qcylindermesh.h index 1334dc306..648ebf2de 100644 --- a/src/render/frontend/qcylindermesh.h +++ b/src/render/frontend/qcylindermesh.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCYLINDERMESH_H -#define QT3D_QCYLINDERMESH_H +#ifndef QT3DRENDER_QCYLINDERMESH_H +#define QT3DRENDER_QCYLINDERMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer { @@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: - explicit QCylinderMesh(QNode *parent = 0); + explicit QCylinderMesh(Qt3D::QNode *parent = 0); ~QCylinderMesh(); void setRings(int rings); @@ -86,8 +86,8 @@ private: void setPrimitiveType(PrimitiveType primitiveType); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCYLINDERMESH_H +#endif // QT3DRENDER_QCYLINDERMESH_H diff --git a/src/render/frontend/qdepthmask.cpp b/src/render/frontend/qdepthmask.cpp index df95b08d7..76e5339d0 100644 --- a/src/render/frontend/qdepthmask.cpp +++ b/src/render/frontend/qdepthmask.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDepthMaskPrivate : public QRenderStatePrivate { @@ -89,6 +89,6 @@ void QDepthMask::setMask(bool mask) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qdepthmask.h b/src/render/frontend/qdepthmask.h index d8f33d651..fdd02b4d3 100644 --- a/src/render/frontend/qdepthmask.h +++ b/src/render/frontend/qdepthmask.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QDEPTHMASK_H -#define QT3D_QDEPTHMASK_H +#ifndef QT3DRENDER_QDEPTHMASK_H +#define QT3DRENDER_QDEPTHMASK_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDepthMaskPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDepthMask : public QRenderState Q_OBJECT Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged) public: - explicit QDepthMask(QNode *parent = 0); + explicit QDepthMask(Qt3D::QNode *parent = 0); ~QDepthMask(); bool mask() const; @@ -61,15 +61,15 @@ Q_SIGNALS: void maskChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthMask) QT3D_CLONEABLE(QDepthMask) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QDEPTHMASK_H +#endif // QT3DRENDER_QDEPTHMASK_H diff --git a/src/render/frontend/qdepthtest.cpp b/src/render/frontend/qdepthtest.cpp index 716544dac..017b7ce00 100644 --- a/src/render/frontend/qdepthtest.cpp +++ b/src/render/frontend/qdepthtest.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDepthTest; @@ -91,6 +91,6 @@ void QDepthTest::setFunc(QDepthTest::DepthFunc func) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qdepthtest.h b/src/render/frontend/qdepthtest.h index e58dc25e7..e9b4275b6 100644 --- a/src/render/frontend/qdepthtest.h +++ b/src/render/frontend/qdepthtest.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QDEPTHTEST_H -#define QT3D_QDEPTHTEST_H +#ifndef QT3DRENDER_QDEPTHTEST_H +#define QT3DRENDER_QDEPTHTEST_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDepthTestPrivate; @@ -64,7 +64,7 @@ public: }; Q_ENUM(DepthFunc) - explicit QDepthTest(QNode *parent = 0); + explicit QDepthTest(Qt3D::QNode *parent = 0); ~QDepthTest(); DepthFunc func() const; @@ -74,15 +74,15 @@ Q_SIGNALS: void funcChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthTest) QT3D_CLONEABLE(QDepthTest) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QDEPTHTEST_H +#endif // QT3DRENDER_QDEPTHTEST_H diff --git a/src/render/frontend/qdirectionallight.cpp b/src/render/frontend/qdirectionallight.cpp index 515ddfae0..ebdc1e170 100644 --- a/src/render/frontend/qdirectionallight.cpp +++ b/src/render/frontend/qdirectionallight.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! * @@ -105,6 +105,6 @@ QVector3D QDirectionalLight::direction() const return d->m_direction; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qdirectionallight.h b/src/render/frontend/qdirectionallight.h index a6e3f8bcc..f626d4f6a 100644 --- a/src/render/frontend/qdirectionallight.h +++ b/src/render/frontend/qdirectionallight.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QDIRECTIONALLIGHT_H -#define QT3D_QDIRECTIONALLIGHT_H +#ifndef QT3DRENDER_QDIRECTIONALLIGHT_H +#define QT3DRENDER_QDIRECTIONALLIGHT_H #include <Qt3DRenderer/qabstractlight.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDirectionalLightPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged) public: - explicit QDirectionalLight(QNode *parent = 0); + explicit QDirectionalLight(Qt3D::QNode *parent = 0); void setDirection(const QVector3D &direction); QVector3D direction() const; @@ -60,16 +60,16 @@ Q_SIGNALS: void directionChanged(); protected: - QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QDirectionalLight(QDirectionalLightPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDirectionalLight) QT3D_CLONEABLE(QDirectionalLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QDIRECTIONALLIGHT_H +#endif // QT3DRENDER_QDIRECTIONALLIGHT_H diff --git a/src/render/frontend/qdirectionallight_p.h b/src/render/frontend/qdirectionallight_p.h index bfe24211c..4cff5e192 100644 --- a/src/render/frontend/qdirectionallight_p.h +++ b/src/render/frontend/qdirectionallight_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QDIRECTIONALLIGHT_P_H -#define QT3D_QDIRECTIONALLIGHT_P_H +#ifndef QT3DRENDER_QDIRECTIONALLIGHT_P_H +#define QT3DRENDER_QDIRECTIONALLIGHT_P_H #include <private/qabstractlight_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDirectionalLight; @@ -54,8 +54,8 @@ public: QVector3D m_direction; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QDIRECTIONALLIGHT_P_H +#endif // QT3DRENDER_QDIRECTIONALLIGHT_P_H diff --git a/src/render/frontend/qdithering.cpp b/src/render/frontend/qdithering.cpp index c82272644..fd8ce1c2f 100644 --- a/src/render/frontend/qdithering.cpp +++ b/src/render/frontend/qdithering.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDitheringPrivate : public QRenderStatePrivate { @@ -64,6 +64,6 @@ QDithering::~QDithering() QNode::cleanup(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qdithering.h b/src/render/frontend/qdithering.h index 5f41dc3d6..37794e372 100644 --- a/src/render/frontend/qdithering.h +++ b/src/render/frontend/qdithering.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QDITHERING_H -#define QT3D_QDITHERING_H +#ifndef QT3DRENDER_QDITHERING_H +#define QT3DRENDER_QDITHERING_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDitheringPrivate; @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: - explicit QDithering(QNode *parent = 0); + explicit QDithering(Qt3D::QNode *parent = 0); ~QDithering(); private: @@ -58,8 +58,8 @@ private: QT3D_CLONEABLE(QDithering) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QDITHERING_H +#endif // QT3DRENDER_QDITHERING_H diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp index 2dc5a5def..443571872 100644 --- a/src/render/frontend/qeffect.cpp +++ b/src/render/frontend/qeffect.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QEffectPrivate + \class Qt3DRender::QEffectPrivate \internal */ QEffectPrivate::QEffectPrivate() @@ -177,6 +179,6 @@ QList<QTechnique *> QEffect::techniques() const } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qeffect.h b/src/render/frontend/qeffect.h index 59a34f238..164a6392a 100644 --- a/src/render/frontend/qeffect.h +++ b/src/render/frontend/qeffect.h @@ -34,26 +34,26 @@ ** ****************************************************************************/ -#ifndef QT3D_QEFFECT_H -#define QT3D_QEFFECT_H +#ifndef QT3DRENDER_QEFFECT_H +#define QT3DRENDER_QEFFECT_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; class QTechnique; class QEffectPrivate; class QT3DRENDERERSHARED_EXPORT QEffect - : public QNode + : public Qt3D::QNode { Q_OBJECT public: - explicit QEffect(QNode *parent = 0); + explicit QEffect(Qt3D::QNode *parent = 0); ~QEffect(); void addParameter(QParameter *parameter); @@ -65,16 +65,16 @@ public: QList<QTechnique *> techniques() const; protected: - QEffect(QEffectPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QEffect) QT3D_CLONEABLE(QEffect) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QEFFECT_H +#endif // QT3DRENDER_QEFFECT_H diff --git a/src/render/frontend/qeffect_p.h b/src/render/frontend/qeffect_p.h index 53485c6cd..7b9ca5b99 100644 --- a/src/render/frontend/qeffect_p.h +++ b/src/render/frontend/qeffect_p.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3D_QEFFECT_P_H -#define QT3D_QEFFECT_P_H +#ifndef QT3DRENDER_QEFFECT_P_H +#define QT3DRENDER_QEFFECT_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QEffect; class QParameter; class QTechnique; -class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public QNodePrivate +class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3D::QNodePrivate { public : QEffectPrivate(); @@ -58,8 +58,8 @@ public : QList<QTechnique *> m_techniques; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QEFFECT_P_H +#endif // QT3DRENDER_QEFFECT_P_H diff --git a/src/render/frontend/qfrontface.cpp b/src/render/frontend/qfrontface.cpp index b56cce619..4ec5043a4 100644 --- a/src/render/frontend/qfrontface.cpp +++ b/src/render/frontend/qfrontface.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrontFacePrivate : public QRenderStatePrivate { @@ -89,6 +89,6 @@ void QFrontFace::setDirection(QFrontFace::FaceDir direction) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qfrontface.h b/src/render/frontend/qfrontface.h index ad52685c4..0a2c8cac9 100644 --- a/src/render/frontend/qfrontface.h +++ b/src/render/frontend/qfrontface.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRONTFACE_H -#define QT3D_QFRONTFACE_H +#ifndef QT3DRENDER_QFRONTFACE_H +#define QT3DRENDER_QFRONTFACE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrontFacePrivate; @@ -59,7 +59,7 @@ public: }; Q_ENUM(FaceDir) - explicit QFrontFace(QNode *parent = 0); + explicit QFrontFace(Qt3D::QNode *parent = 0); ~QFrontFace(); FaceDir direction() const; @@ -69,15 +69,15 @@ Q_SIGNALS: void directionChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrontFace) QT3D_CLONEABLE(QFrontFace) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRONTFACE_H +#endif // QT3DRENDER_QFRONTFACE_H diff --git a/src/render/frontend/qgeometry.cpp b/src/render/frontend/qgeometry.cpp index ac030bbf2..e59e195a1 100644 --- a/src/render/frontend/qgeometry.cpp +++ b/src/render/frontend/qgeometry.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QGeometry::QGeometry(QNode *parent) : QNode(*new QGeometryPrivate(), parent) @@ -59,7 +61,7 @@ QGeometry::~QGeometry() QNode::cleanup(); } -void QGeometry::addAttribute(QAbstractAttribute *attribute) +void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute) { Q_D(QGeometry); if (!d->m_attributes.contains(attribute)) { @@ -81,7 +83,7 @@ void QGeometry::addAttribute(QAbstractAttribute *attribute) } } -void QGeometry::removeAttribute(QAbstractAttribute *attribute) +void QGeometry::removeAttribute(Qt3D::QAbstractAttribute *attribute) { Q_D(QGeometry); if (d->m_changeArbiter != Q_NULLPTR) { @@ -123,6 +125,6 @@ void QGeometry::copy(const QNode *ref) d_func()->m_attributes.append(qobject_cast<QAbstractAttribute *>(QNode::clone(attribute))); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qgeometry.h b/src/render/frontend/qgeometry.h index 5578f41f7..f8774aba6 100644 --- a/src/render/frontend/qgeometry.h +++ b/src/render/frontend/qgeometry.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QGEOMETRY_H -#define QT3D_QGEOMETRY_H +#ifndef QT3DRENDER_QGEOMETRY_H +#define QT3DRENDER_QGEOMETRY_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,24 +43,27 @@ QT_BEGIN_NAMESPACE namespace Qt3D { +class QAbstractAttribute; +} + +namespace Qt3DRender { class QGeometryPrivate; -class QAbstractAttribute; -typedef QVector<QAbstractAttribute *> QAttributeList; +typedef QVector<Qt3D::QAbstractAttribute *> QAttributeList; -class QT3DRENDERERSHARED_EXPORT QGeometry : public QNode +class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) public: - explicit QGeometry(QNode *parent = 0); + explicit QGeometry(Qt3D::QNode *parent = 0); ~QGeometry(); QAttributeList attributes() const; - void addAttribute(QAbstractAttribute *attribute); - void removeAttribute(QAbstractAttribute *attribute); + void addAttribute(Qt3D::QAbstractAttribute *attribute); + void removeAttribute(Qt3D::QAbstractAttribute *attribute); void setVerticesPerPatch(int verticesPerPatch); int verticesPerPatch() const; @@ -69,16 +72,16 @@ Q_SIGNALS: void verticesPerPatchChanged(); protected: - QGeometry(QGeometryPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QGeometry(QGeometryPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QGeometry) QT3D_CLONEABLE(QGeometry) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QGEOMETRY_H +#endif // QT3DRENDER_QGEOMETRY_H diff --git a/src/render/frontend/qgeometry_p.h b/src/render/frontend/qgeometry_p.h index 24dad3c86..9f298585b 100644 --- a/src/render/frontend/qgeometry_p.h +++ b/src/render/frontend/qgeometry_p.h @@ -41,9 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QGeometryPrivate : public QNodePrivate +class QGeometryPrivate : public Qt3D::QNodePrivate { public: Q_DECLARE_PUBLIC(QGeometry) @@ -56,7 +56,7 @@ public: int m_verticesPerPatch; }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qgeometryrenderer.cpp b/src/render/frontend/qgeometryrenderer.cpp index a74fcc579..8ba50b1b1 100644 --- a/src/render/frontend/qgeometryrenderer.cpp +++ b/src/render/frontend/qgeometryrenderer.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QGeometryRendererPrivate::QGeometryRendererPrivate() : QComponentPrivate() @@ -254,7 +256,7 @@ void QGeometryRenderer::copy(const QNode *ref) d_func()->m_functor = other->d_func()->m_functor; } -void QGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e) +void QGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { Q_D(QGeometryRenderer); QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e); @@ -269,6 +271,6 @@ void QGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e) -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qgeometryrenderer.h b/src/render/frontend/qgeometryrenderer.h index 78a74d798..5bf581111 100644 --- a/src/render/frontend/qgeometryrenderer.h +++ b/src/render/frontend/qgeometryrenderer.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QGEOMETRYRENDERER_H -#define QT3D_QGEOMETRYRENDERER_H +#ifndef QT3DRENDER_QGEOMETRYRENDERER_H +#define QT3DRENDER_QGEOMETRYRENDERER_H #include <Qt3DCore/qcomponent.h> #include <Qt3DRenderer/qgeometry.h> @@ -43,14 +43,14 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QGeometryRendererPrivate; class QGeometryFunctor; typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public QComponent +class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) @@ -59,11 +59,11 @@ class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public QComponent Q_PROPERTY(int baseInstance READ baseInstance WRITE setBaseInstance NOTIFY baseInstanceChanged) Q_PROPERTY(int restartIndex READ restartIndex WRITE setRestartIndex NOTIFY restartIndexChanged) Q_PROPERTY(bool primitiveRestart READ primitiveRestart WRITE setPrimitiveRestart NOTIFY primitiveRestartChanged) - Q_PROPERTY(Qt3D::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) + Q_PROPERTY(Qt3DRender::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) public: - explicit QGeometryRenderer(QNode *parent = 0); + explicit QGeometryRenderer(Qt3D::QNode *parent = 0); ~QGeometryRenderer(); enum PrimitiveType { @@ -116,17 +116,17 @@ Q_SIGNALS: void primitiveTypeChanged(); protected: - QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QGeometryRenderer) QT3D_CLONEABLE(QGeometryRenderer) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QGEOMETRYRENDERER_H +#endif // QT3DRENDER_QGEOMETRYRENDERER_H diff --git a/src/render/frontend/qgeometryrenderer_p.h b/src/render/frontend/qgeometryrenderer_p.h index ef6dc5c64..5989382c5 100644 --- a/src/render/frontend/qgeometryrenderer_p.h +++ b/src/render/frontend/qgeometryrenderer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QGEOMETRYRENDERER_P_H -#define QT3D_QGEOMETRYRENDERER_P_H +#ifndef QT3DRENDER_QGEOMETRYRENDERER_P_H +#define QT3DRENDER_QGEOMETRYRENDERER_P_H #include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,9 +43,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QGeometryRendererPrivate : public QComponentPrivate +class QGeometryRendererPrivate : public Qt3D::QComponentPrivate { public: QGeometryRendererPrivate(); @@ -62,10 +62,10 @@ public: QGeometryFunctorPtr m_functor; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QGEOMETRYRENDERER_P_H +#endif // QT3DRENDER_QGEOMETRYRENDERER_P_H diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index 540d341e0..f8437d1c9 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -41,7 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { void variantToBytes(void* dest, const QVariant& v, GLint type) { @@ -109,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type) namespace { -QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) +Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) { switch (dataType) { @@ -347,6 +349,6 @@ QItemModelBuffer::RoleMapping::RoleMapping(QByteArray rnm, QString nm, int ty) : byteSize = Render::QGraphicsContext::byteSizeFromType(ty); } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h index d33ee76c9..1a4193868 100644 --- a/src/render/frontend/qitemmodelbuffer.h +++ b/src/render/frontend/qitemmodelbuffer.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QITEMMODELBUFFER_H -#define QT3D_QITEMMODELBUFFER_H +#ifndef QT3DRENDER_QITEMMODELBUFFER_H +#define QT3DRENDER_QITEMMODELBUFFER_H #include <QObject> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QItemModelBuffer : public QObject { @@ -98,8 +98,8 @@ private: bool validateRoles(); }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QITEMMODELBUFFER_H +#endif // QT3DRENDER_QITEMMODELBUFFER_H diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index 76a83f992..ce3486555 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QLayerPrivate + \class Qt3DRender::QLayerPrivate \internal */ QLayerPrivate::QLayerPrivate() @@ -59,7 +59,7 @@ QLayerPrivate::QLayerPrivate() /*! \qmltype Layer - \instantiates Qt3D::QLayer + \instantiates Qt3DRender::QLayer \inherits Component3D \inqmlmodule Qt3D.Renderer \since 5.5 @@ -67,7 +67,7 @@ QLayerPrivate::QLayerPrivate() */ -/*! \fn void Qt3D::QLayer::copy(const QNode *ref) +/*! \fn void Qt3DRender::QLayer::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QLayer::copy(const QNode *ref) @@ -77,7 +77,7 @@ void QLayer::copy(const QNode *ref) d_func()->m_names = layer->d_func()->m_names; } -/*! \fn Qt3D::QLayer::QLayer(QObject *parent) +/*! \fn Qt3DRender::QLayer::QLayer(QObject *parent) Constructs a new QLayer with the specified \a parent. */ @@ -98,7 +98,7 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent) } /*! - \property Qt3D::QLayer::names + \property Qt3DRender::QLayer::names */ @@ -122,6 +122,6 @@ void QLayer::setNames(const QStringList &names) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 7075eb592..10499d7ba 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYER_H -#define QT3D_QLAYER_H +#ifndef QT3DRENDER_QLAYER_H +#define QT3DRENDER_QLAYER_H #include <Qt3DCore/qcomponent.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerPrivate; -class QT3DRENDERERSHARED_EXPORT QLayer : public QComponent +class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3D::QComponent { Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) public: - explicit QLayer(QNode *parent = 0); + explicit QLayer(Qt3D::QNode *parent = 0); ~QLayer(); QStringList names() const; @@ -62,16 +62,16 @@ Q_SIGNALS: void namesChanged(); protected: - QLayer(QLayerPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QLayer(QLayerPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayer) QT3D_CLONEABLE(QLayer) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYER_H +#endif // QT3DRENDER_QLAYER_H diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h index affd71bb4..feb403803 100644 --- a/src/render/frontend/qlayer_p.h +++ b/src/render/frontend/qlayer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYER_P_H -#define QT3D_QLAYER_P_H +#ifndef QT3DRENDER_QLAYER_P_H +#define QT3DRENDER_QLAYER_P_H #include <private/qcomponent_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,9 +43,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QLayerPrivate : QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3D::QComponentPrivate { public: QLayerPrivate(); @@ -54,8 +54,8 @@ public: QStringList m_names; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYER_P_H +#endif // QT3DRENDER_QLAYER_P_H diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp index 1000e3179..b3c833556 100644 --- a/src/render/frontend/qmaterial.cpp +++ b/src/render/frontend/qmaterial.cpp @@ -43,8 +43,9 @@ #include <Qt3DCore/qscenepropertychange.h> /*! - * \class Qt3D::QMaterial + * \class Qt3DRender::QMaterial * \inmodule Qt3DRenderer + * * \inherits Component * * \brief Provides an abstract class that should be the base of all @@ -61,10 +62,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QMaterialPrivate + \class Qt3DRender::QMaterialPrivate \internal */ QMaterialPrivate::QMaterialPrivate() @@ -199,6 +202,6 @@ void QMaterial::setTextureParameter(QString name, QAbstractTextureProvider *tex) d->m_textures[name] = tex; } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index c8cc89ab5..ca44901c1 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QMATERIAL_H -#define QT3D_QMATERIAL_H +#ifndef QT3DRENDER_QMATERIAL_H +#define QT3DRENDER_QMATERIAL_H #include <QVariant> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureProvider; class QParameter; @@ -52,13 +52,13 @@ class QMaterialPrivate; class QEffect; typedef QMap<QString, QAbstractTextureProvider*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public QComponent +class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent { Q_OBJECT - Q_PROPERTY(Qt3D::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) + Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(QNode *parent = 0); + explicit QMaterial(Qt3D::QNode *parent = 0); ~QMaterial(); void setEffect(QEffect *effect); @@ -76,8 +76,8 @@ Q_SIGNALS: void effectChanged(); protected: - QMaterial(QMaterialPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMaterial) @@ -88,4 +88,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QMATERIAL_H +#endif // QT3DRENDER_QMATERIAL_H diff --git a/src/render/frontend/qmaterial_p.h b/src/render/frontend/qmaterial_p.h index e11e7258d..1ef84e05d 100644 --- a/src/render/frontend/qmaterial_p.h +++ b/src/render/frontend/qmaterial_p.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QT3D_QMATERIAL_P_H -#define QT3D_QMATERIAL_P_H +#ifndef QT3DRENDER_QMATERIAL_P_H +#define QT3DRENDER_QMATERIAL_P_H #include <private/qcomponent_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; class QEffect; -class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3D::QComponentPrivate { public: QMaterialPrivate(); @@ -58,8 +58,8 @@ public: QEffect *m_effect; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QMATERIAL_P_H +#endif // QT3DRENDER_QMATERIAL_P_H diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp index 4f8042d07..e35ee1dd0 100644 --- a/src/render/frontend/qmesh.cpp +++ b/src/render/frontend/qmesh.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class MeshFunctor : public QGeometryFunctor { @@ -63,7 +63,7 @@ private: /*! - \class Qt3D::QMeshPrivate + \class Qt3DRender::QMeshPrivate \internal */ QMeshPrivate::QMeshPrivate() @@ -125,7 +125,7 @@ QGeometry *MeshFunctor::operator()() // TO DO: Handle file download if remote url - QString filePath = QUrlHelper::urlToLocalFileOrQrc(m_sourcePath); + QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath); if (loader.load(filePath)) return loader.geometry(); @@ -141,6 +141,6 @@ bool MeshFunctor::operator ==(const QGeometryFunctor &other) const return false; } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qmesh.h b/src/render/frontend/qmesh.h index ff50a80a6..fd5b686f6 100644 --- a/src/render/frontend/qmesh.h +++ b/src/render/frontend/qmesh.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QMESH_H -#define QT3D_QMESH_H +#ifndef QT3DRENDER_QMESH_H +#define QT3DRENDER_QMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QMeshPrivate; @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QMesh(QNode *parent = 0); + explicit QMesh(Qt3D::QNode *parent = 0); ~QMesh(); void setSource(const QUrl &source); @@ -67,7 +67,7 @@ Q_SIGNALS: void sourceChanged(); protected: - QMesh(QMeshPrivate &dd, QNode *parent = 0); + QMesh(QMeshPrivate &dd, Qt3D::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QMesh) @@ -77,4 +77,4 @@ private: QT_END_NAMESPACE -#endif // of QT3D_QMESH_H +#endif // of QT3DRENDER_QMESH_H diff --git a/src/render/frontend/qmesh_p.h b/src/render/frontend/qmesh_p.h index 5246cfb54..0adadaa3f 100644 --- a/src/render/frontend/qmesh_p.h +++ b/src/render/frontend/qmesh_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QMESH_P_H -#define QT3D_QMESH_P_H +#ifndef QT3DRENDER_QMESH_P_H +#define QT3DRENDER_QMESH_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/private/qgeometryrenderer_p.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QMesh; @@ -57,8 +57,8 @@ public: QUrl m_source; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QMESH_P_H +#endif // QT3DRENDER_QMESH_P_H diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp index 6efd47955..3bc20a84d 100644 --- a/src/render/frontend/qopenglfilter.cpp +++ b/src/render/frontend/qopenglfilter.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QOpenGLFilterPrivate : public QObjectPrivate { @@ -64,7 +64,7 @@ public: }; /*! - \class QOpenGLFilter + \class Qt3DRender::QOpenGLFilter \inmodule Qt3DRenderer \since 5.5 \brief The QOpenGLFilter class provides ... @@ -72,14 +72,14 @@ public: /*! \qmltype OpenGLFilter - \instantiates Qt3D::QOpenGLFilter + \instantiates Qt3DRender::QOpenGLFilter \inherits QtObject \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ -/*! \fn Qt3D::QOpenGLFilter::QOpenGLFilter(QObject *parent) +/*! \fn Qt3DRender::QOpenGLFilter::QOpenGLFilter(QObject *parent) Constructs a new QOpenGLFilter with the specified \a parent. */ QOpenGLFilter::QOpenGLFilter(QObject *parent) @@ -87,7 +87,7 @@ QOpenGLFilter::QOpenGLFilter(QObject *parent) { } -/*! \fn void Qt3D::QOpenGLFilter::copy(const QOpenGLFilter &ref) +/*! \fn void Qt3DRender::QOpenGLFilter::copy(const QOpenGLFilter &ref) Copies the \a ref instance into this one. */ void QOpenGLFilter::copy(const QOpenGLFilter &ref) @@ -102,7 +102,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref) } /*! - \enum Qt3D::QOpenGLFilter::Api + \enum Qt3DRender::QOpenGLFilter::Api \value ES QSurfaceFormat::OpenGLES \value Desktop QSurfaceFormat::OpenGL @@ -110,7 +110,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref) */ /*! - \enum Qt3D::QOpenGLFilter::Profile + \enum Qt3DRender::QOpenGLFilter::Profile \value None QSurfaceFormat::NoProfile \value Core QSurfaceFormat::CoreProfile @@ -119,7 +119,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref) */ /*! - \property Qt3D::QOpenGLFilter::api + \property Qt3DRender::QOpenGLFilter::api */ @@ -138,7 +138,7 @@ QOpenGLFilter::Api QOpenGLFilter::api() const } /*! - \property Qt3D::QOpenGLFilter::profile + \property Qt3DRender::QOpenGLFilter::profile */ @@ -157,7 +157,7 @@ QOpenGLFilter::Profile QOpenGLFilter::profile() const } /*! - \property Qt3D::QOpenGLFilter::minorVersion + \property Qt3DRender::QOpenGLFilter::minorVersion */ @@ -173,7 +173,7 @@ int QOpenGLFilter::minorVersion() const } /*! - \property Qt3D::QOpenGLFilter::majorVersion + \property Qt3DRender::QOpenGLFilter::majorVersion */ @@ -189,7 +189,7 @@ int QOpenGLFilter::majorVersion() const } /*! - \property Qt3D::QOpenGLFilter::extensions + \property Qt3DRender::QOpenGLFilter::extensions */ @@ -205,7 +205,7 @@ QStringList QOpenGLFilter::extensions() const } /*! - \property Qt3D::QOpenGLFilter::vendor + \property Qt3DRender::QOpenGLFilter::vendor */ @@ -281,7 +281,7 @@ void QOpenGLFilter::setVendor(const QString &vendor) } /*! \fn bool Qt3D::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) - \relates Qt3D::QOpenGLFilter + \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are equivalent. */ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) @@ -303,7 +303,7 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) } /*! \fn bool Qt3D::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) - \relates Qt3D::QOpenGLFilter + \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are different. */ bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) @@ -311,9 +311,9 @@ bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) return !(reference == sample); } -/*! \fn void Qt3D::QOpenGLFilter::openGLFilterChanged() +/*! \fn void Qt3DRender::QOpenGLFilter::openGLFilterChanged() This signal is emitted when the value of any property is changed. */ -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qopenglfilter.h b/src/render/frontend/qopenglfilter.h index 6ff43c417..9c4b729bd 100644 --- a/src/render/frontend/qopenglfilter.h +++ b/src/render/frontend/qopenglfilter.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOPENGLFILTER_H -#define QT3D_QOPENGLFILTER_H +#ifndef QT3DRENDER_QOPENGLFILTER_H +#define QT3DRENDER_QOPENGLFILTER_H #include <QObject> #include <QStringList> @@ -44,15 +44,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QOpenGLFilterPrivate; class QT3DRENDERERSHARED_EXPORT QOpenGLFilter : public QObject { Q_OBJECT - Q_PROPERTY(Qt3D::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged) - Q_PROPERTY(Qt3D::QOpenGLFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged) + Q_PROPERTY(Qt3DRender::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged) + Q_PROPERTY(Qt3DRender::QOpenGLFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged) Q_PROPERTY(int minorVersion READ minorVersion WRITE setMinorVersion NOTIFY minorVersionChanged) Q_PROPERTY(int majorVersion READ majorVersion WRITE setMajorVersion NOTIFY majorVersionChanged) Q_PROPERTY(QStringList extensions READ extensions WRITE setExtensions NOTIFY extensionsChanged) @@ -109,8 +109,8 @@ private: bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample); bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample); -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QOPENGLFILTER_H +#endif // QT3DRENDER_QOPENGLFILTER_H diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp index 95d35d5c2..96d1205df 100644 --- a/src/render/frontend/qparameter.cpp +++ b/src/render/frontend/qparameter.cpp @@ -42,11 +42,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { /*! - \class Qt3D::QParameterPrivate + \class Qt3DRender::QParameterPrivate \internal */ QParameterPrivate::QParameterPrivate() @@ -144,6 +145,6 @@ QVariant QParameter::value() const return d->m_value; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qparameter.h b/src/render/frontend/qparameter.h index 4ef6f22c4..03883f5f1 100644 --- a/src/render/frontend/qparameter.h +++ b/src/render/frontend/qparameter.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QPARAMETER_H -#define QT3D_QPARAMETER_H +#ifndef QT3DRENDER_QPARAMETER_H +#define QT3DRENDER_QPARAMETER_H #include <QVariant> #include <Qt3DCore/qnode.h> @@ -43,22 +43,22 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameterPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QParameter : public QNode +class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(QNode *parent = 0); + explicit QParameter(Qt3D::QNode *parent = 0); ~QParameter(); - QParameter(const QString& name, const QVariant& value, QNode* parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, QNode *parent = 0); + QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0); void setName(const QString &name); QString name() const; @@ -75,16 +75,16 @@ Q_SIGNALS: void nameChanged(); protected: - QParameter(QParameterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameter) QT3D_CLONEABLE(QParameter) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_PARAMETER_H +#endif // QT3DRENDER_PARAMETER_H diff --git a/src/render/frontend/qparameter_p.h b/src/render/frontend/qparameter_p.h index bc7fe7f30..0d3603d66 100644 --- a/src/render/frontend/qparameter_p.h +++ b/src/render/frontend/qparameter_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QPARAMETER_P_H -#define QT3D_QPARAMETER_P_H +#ifndef QT3DRENDER_QPARAMETER_P_H +#define QT3DRENDER_QPARAMETER_P_H #include <private/qnode_p.h> #include <private/qt3drenderer_global_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public QNodePrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3D::QNodePrivate { public: QParameterPrivate(); @@ -60,8 +60,8 @@ public: QString m_meshName; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPARAMETER_P_H +#endif // QT3DRENDER_QPARAMETER_P_H diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp index 057ea0bdd..3890bf8b2 100644 --- a/src/render/frontend/qparametermapping.cpp +++ b/src/render/frontend/qparametermapping.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QParameterMappingPrivate + \class Qt3DRender::QParameterMappingPrivate \internal */ QParameterMappingPrivate::QParameterMappingPrivate() @@ -51,7 +51,7 @@ QParameterMappingPrivate::QParameterMappingPrivate() { } /*! - \class QParameterMapping + \class Qt3DRender::QParameterMapping \inmodule Qt3DRenderer \since 5.5 \brief The QParameterMapping class provides ... @@ -59,14 +59,14 @@ QParameterMappingPrivate::QParameterMappingPrivate() /*! \qmltype ParameterMapping - \instantiates Qt3D::QParameterMapping + \instantiates Qt3DRender::QParameterMapping \inherits Node \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ -/*! \fn void Qt3D::QParameterMapping::copy(const QNode *ref) +/*! \fn void Qt3DRender::QParameterMapping::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QParameterMapping::copy(const QNode *ref) @@ -78,7 +78,7 @@ void QParameterMapping::copy(const QNode *ref) d_func()->m_bindingType = mapper->d_func()->m_bindingType; } -/*! \fn Qt3D::QParameterMapping::QParameterMapping(QNode *parent) +/*! \fn Qt3DRender::QParameterMapping::QParameterMapping(QNode *parent) Constructs a new QParameterMapping with the specified \a parent. */ QParameterMapping::QParameterMapping(QNode *parent) @@ -87,7 +87,7 @@ QParameterMapping::QParameterMapping(QNode *parent) } /*! - \enum Qt3D::QParameterMapping::Binding + \enum Qt3DRender::QParameterMapping::Binding \value Uniform \value Attribute @@ -121,7 +121,7 @@ QParameterMapping::~QParameterMapping() } /*! - \property Qt3D::QParameterMapping::parameterName + \property Qt3DRender::QParameterMapping::parameterName */ @@ -140,7 +140,7 @@ void QParameterMapping::setParameterName(const QString &name) } /*! - \property Qt3D::QParameterMapping::shaderVariableName + \property Qt3DRender::QParameterMapping::shaderVariableName */ @@ -159,7 +159,7 @@ void QParameterMapping::setShaderVariableName(const QString &name) } /*! - \property Qt3D::QParameterMapping::bindingType + \property Qt3DRender::QParameterMapping::bindingType */ @@ -198,6 +198,6 @@ QParameterMapping::Binding QParameterMapping::bindingType() const return d->m_bindingType; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qparametermapping.h b/src/render/frontend/qparametermapping.h index 25fcfc809..f4e209abd 100644 --- a/src/render/frontend/qparametermapping.h +++ b/src/render/frontend/qparametermapping.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QPARAMETERMAPPING_H -#define QT3D_QPARAMETERMAPPING_H +#ifndef QT3DRENDER_QPARAMETERMAPPING_H +#define QT3DRENDER_QPARAMETERMAPPING_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameterMappingPrivate; -class QT3DRENDERERSHARED_EXPORT QParameterMapping : public QNode +class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged) @@ -62,8 +62,8 @@ public: }; Q_ENUM(Binding) - explicit QParameterMapping(QNode *parent = 0); - QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, QNode *parent = 0); + explicit QParameterMapping(Qt3D::QNode *parent = 0); + QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0); ~QParameterMapping(); void setParameterName(const QString &name); @@ -80,16 +80,16 @@ Q_SIGNALS: void bindingTypeChanged(); protected: - QParameterMapping(QParameterMappingPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameterMapping) QT3D_CLONEABLE(QParameterMapping) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPARAMETERBINDER_H +#endif // QT3DRENDER_QPARAMETERBINDER_H diff --git a/src/render/frontend/qparametermapping_p.h b/src/render/frontend/qparametermapping_p.h index 6f0234c69..0fe32cb0f 100644 --- a/src/render/frontend/qparametermapping_p.h +++ b/src/render/frontend/qparametermapping_p.h @@ -34,17 +34,17 @@ ** ****************************************************************************/ -#ifndef QT3D_QPARAMETERMAPPING_P_H -#define QT3D_QPARAMETERMAPPING_P_H +#ifndef QT3DRENDER_QPARAMETERMAPPING_P_H +#define QT3DRENDER_QPARAMETERMAPPING_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/QParameterMapping> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QParameterMappingPrivate : public QNodePrivate +class QParameterMappingPrivate : public Qt3D::QNodePrivate { public: QParameterMappingPrivate(); @@ -56,8 +56,8 @@ public: QParameterMapping::Binding m_bindingType; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPARAMETERMAPPING_P_H +#endif // QT3DRENDER_QPARAMETERMAPPING_P_H diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/frontend/qplanemesh.cpp index 569a8ffed..40a057a50 100644 --- a/src/render/frontend/qplanemesh.cpp +++ b/src/render/frontend/qplanemesh.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { @@ -396,7 +396,7 @@ QSize QPlaneMesh::meshResolution() const return static_cast<PlaneGeometry *>(geometry())->resolution(); } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qplanemesh.h b/src/render/frontend/qplanemesh.h index 2c9e66db2..70d9c8518 100644 --- a/src/render/frontend/qplanemesh.h +++ b/src/render/frontend/qplanemesh.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QPLANEMESH_H -#define QT3D_QPLANEMESH_H +#ifndef QT3DRENDER_QPLANEMESH_H +#define QT3DRENDER_QPLANEMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer { @@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged) public: - explicit QPlaneMesh(QNode *parent = 0); + explicit QPlaneMesh(Qt3D::QNode *parent = 0); ~QPlaneMesh(); void setWidth(float width); @@ -84,8 +84,8 @@ private: void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPLANEMESH_H +#endif // QT3DRENDER_QPLANEMESH_H diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp index c474c1285..94653ee41 100644 --- a/src/render/frontend/qpointlight.cpp +++ b/src/render/frontend/qpointlight.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /* Expected Shader struct @@ -59,7 +59,7 @@ namespace Qt3D { */ /*! - \class Qt3D::QPointLightPrivate + \class Qt3DRender::QPointLightPrivate \internal */ QPointLightPrivate::QPointLightPrivate() @@ -76,7 +76,7 @@ QPointLightPrivate::QPointLightPrivate() /*! \qmltype PointLight - \instantiates Qt3D::QPointLight + \instantiates Qt3DRender::QPointLight \inherits AbstractLight \inqmlmodule Qt3D.Renderer \since 5.5 @@ -84,7 +84,7 @@ QPointLightPrivate::QPointLightPrivate() */ /*! - \fn Qt3D::QPointLight::QPointLight(QNode *parent) + \fn Qt3DRender::QPointLight::QPointLight(QNode *parent) Constructs a new QPointLight with the specified \a parent. */ QPointLight::QPointLight(QNode *parent) @@ -98,6 +98,6 @@ QPointLight::QPointLight(QPointLightPrivate &dd, QNode *parent) { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qpointlight.h b/src/render/frontend/qpointlight.h index 9cb652a29..076f8b3cd 100644 --- a/src/render/frontend/qpointlight.h +++ b/src/render/frontend/qpointlight.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QPOINTLIGHT_H -#define QT3D_QPOINTLIGHT_H +#ifndef QT3DRENDER_QPOINTLIGHT_H +#define QT3DRENDER_QPOINTLIGHT_H #include <Qt3DRenderer/qabstractlight.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QPointLightPrivate; @@ -50,16 +50,16 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight Q_OBJECT public: - explicit QPointLight(QNode *parent = 0); + explicit QPointLight(Qt3D::QNode *parent = 0); protected: Q_DECLARE_PRIVATE(QPointLight) - QPointLight(QPointLightPrivate &dd, QNode *parent); + QPointLight(QPointLightPrivate &dd, Qt3D::QNode *parent); QT3D_CLONEABLE(QPointLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPOINTLIGHT_H +#endif // QT3DRENDER_QPOINTLIGHT_H diff --git a/src/render/frontend/qpointlight_p.h b/src/render/frontend/qpointlight_p.h index 0e98319ed..f39daabee 100644 --- a/src/render/frontend/qpointlight_p.h +++ b/src/render/frontend/qpointlight_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QPOINTLIGHT_P_H -#define QT3D_QPOINTLIGHT_P_H +#ifndef QT3DRENDER_QPOINTLIGHT_P_H +#define QT3DRENDER_QPOINTLIGHT_P_H #include <private/qabstractlight_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QPointLight; @@ -53,7 +53,7 @@ public: Q_DECLARE_PUBLIC(QPointLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qpolygonoffset.cpp b/src/render/frontend/qpolygonoffset.cpp index d252d4893..27c9cde4f 100644 --- a/src/render/frontend/qpolygonoffset.cpp +++ b/src/render/frontend/qpolygonoffset.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QPolygonOffsetPrivate : public QRenderStatePrivate { @@ -105,6 +105,6 @@ void QPolygonOffset::copy(const QNode *ref) d_func()->m_units = refState->d_func()->m_units; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qpolygonoffset.h b/src/render/frontend/qpolygonoffset.h index 339437ae1..9aff94a1f 100644 --- a/src/render/frontend/qpolygonoffset.h +++ b/src/render/frontend/qpolygonoffset.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QPOLYGONOFFSET_H -#define QT3D_QPOLYGONOFFSET_H +#ifndef QT3DRENDER_QPOLYGONOFFSET_H +#define QT3DRENDER_QPOLYGONOFFSET_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QPolygonOffsetPrivate; @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QPolygonOffset : public QRenderState Q_PROPERTY(float factor READ factor WRITE setFactor NOTIFY factorChanged) Q_PROPERTY(float units READ units WRITE setUnits NOTIFY unitsChanged) public: - explicit QPolygonOffset(QNode *parent = Q_NULLPTR); + explicit QPolygonOffset(Qt3D::QNode *parent = Q_NULLPTR); ~QPolygonOffset(); float factor() const; @@ -66,15 +66,15 @@ Q_SIGNALS: void unitsChanged(float newUnits); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QPolygonOffset) QT3D_CLONEABLE(QPolygonOffset) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QPOLYGONOFFSET_H +#endif // QT3DRENDER_QPOLYGONOFFSET_H diff --git a/src/render/frontend/qrenderattachment.cpp b/src/render/frontend/qrenderattachment.cpp index 35db47cc7..e0d6c42fa 100644 --- a/src/render/frontend/qrenderattachment.cpp +++ b/src/render/frontend/qrenderattachment.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QRenderAttachmentPrivate + \class Qt3DRender::QRenderAttachmentPrivate \internal */ QRenderAttachmentPrivate::QRenderAttachmentPrivate() @@ -174,6 +174,6 @@ QString QRenderAttachment::name() const return d->m_name; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h index 15706fb1d..49c14b146 100644 --- a/src/render/frontend/qrenderattachment.h +++ b/src/render/frontend/qrenderattachment.h @@ -34,24 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERATTACHMENT_H -#define QT3D_QRENDERATTACHMENT_H +#ifndef QT3DRENDER_QRENDERATTACHMENT_H +#define QT3DRENDER_QRENDERATTACHMENT_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureProvider; class QRenderAttachmentPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public QNode +class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged) - Q_PROPERTY(Qt3D::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged) Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged) Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) Q_PROPERTY(CubeMapFace face READ face WRITE setFace NOTIFY faceChanged) @@ -91,7 +91,7 @@ public: }; Q_ENUM(CubeMapFace) - explicit QRenderAttachment(QNode *parent = 0); + explicit QRenderAttachment(Qt3D::QNode *parent = 0); ~QRenderAttachment(); void setType(RenderAttachmentType type); @@ -121,18 +121,18 @@ Q_SIGNALS: void nameChanged(); protected: - QRenderAttachment(QRenderAttachmentPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderAttachment) QT3D_CLONEABLE(QRenderAttachment) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QRenderAttachment::RenderAttachmentType) +Q_DECLARE_METATYPE(Qt3DRender::QRenderAttachment::RenderAttachmentType) -#endif // QT3D_QRENDERATTACHMENT_H +#endif // QT3DRENDER_QRENDERATTACHMENT_H diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h index 8425c36e9..8c7202cfb 100644 --- a/src/render/frontend/qrenderattachment_p.h +++ b/src/render/frontend/qrenderattachment_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERATTACHMENT_P_H -#define QT3D_QRENDERATTACHMENT_P_H +#ifndef QT3DRENDER_QRENDERATTACHMENT_P_H +#define QT3DRENDER_QRENDERATTACHMENT_P_H #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRenderer/qrenderattachment.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QAbstractTextureProvider; -class QRenderAttachmentPrivate : public QNodePrivate +class QRenderAttachmentPrivate : public Qt3D::QNodePrivate { public: QRenderAttachmentPrivate(); @@ -61,8 +61,8 @@ public: QString m_name; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERATTACHMENT_P_H +#endif // QT3DRENDER_QRENDERATTACHMENT_P_H diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index f6feba36a..efb315177 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -46,10 +46,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderPassPrivate + \class Qt3DRender::QRenderPassPrivate \internal */ QRenderPassPrivate::QRenderPassPrivate() @@ -221,7 +223,7 @@ QList<QParameterMapping *> QRenderPass::bindings() const /*! * Adds a Qt3D::QRenderState \a state to the rendering pass. That implies that * when the pass is executed at render time, the globally set render state will - * be modifed by the states defined locally by the Qt3D::QRenderPass. + * be modifed by the states defined locally by the Qt3DRender::QRenderPass. * * \note not defining any Qt3D::QRenderState in a pass will result in the pass using * the globally set render state for a given FrameGraph branch execution path. @@ -246,7 +248,7 @@ void QRenderPass::addRenderState(QRenderState *state) } /*! - * Removes \a state from the Qt3D::QRenderPass local render state. + * Removes \a state from the Qt3DRender::QRenderPass local render state. */ void QRenderPass::removeRenderState(QRenderState *state) { @@ -262,7 +264,7 @@ void QRenderPass::removeRenderState(QRenderState *state) /*! * Returns the list of Qt3D::QRenderState state objects making up the render - * state of the Qt3D::QRenderPass. + * state of the Qt3DRender::QRenderPass. */ QList<QRenderState *> QRenderPass::renderStates() const { @@ -312,6 +314,6 @@ QList<QParameter *> QRenderPass::parameters() const return d->m_parameters; } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h index 0a30a90e6..ed733ba12 100644 --- a/src/render/frontend/qrenderpass.h +++ b/src/render/frontend/qrenderpass.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASS_H -#define QT3D_QRENDERPASS_H +#ifndef QT3DRENDER_QRENDERPASS_H +#define QT3DRENDER_QRENDERPASS_H #include <Qt3DRenderer/qt3drenderer_global.h> @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; class QRenderState; @@ -58,13 +58,13 @@ typedef QList<QParameter*> ParameterList; class QRenderPassPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderPass : public QNode +class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) + Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) public: - explicit QRenderPass(QNode *parent = 0); + explicit QRenderPass(Qt3D::QNode *parent = 0); ~QRenderPass(); QString glslNameForParameter(QString paramName) const; @@ -95,8 +95,8 @@ Q_SIGNALS: void shaderProgramChanged(); protected: - QRenderPass(QRenderPassPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderPass(QRenderPassPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPass) @@ -107,4 +107,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QRENDERPASS_H +#endif // QT3DRENDER_QRENDERPASS_H diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h index cf21a23f7..ace1a54b1 100644 --- a/src/render/frontend/qrenderpass_p.h +++ b/src/render/frontend/qrenderpass_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASS_P_H -#define QT3D_QRENDERPASS_P_H +#ifndef QT3DRENDER_QRENDERPASS_P_H +#define QT3DRENDER_QRENDERPASS_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/qrenderpass.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; class QParameterMapping; @@ -57,7 +57,7 @@ namespace Render class RenderStateSet; } -class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public QNodePrivate +class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3D::QNodePrivate { public: QRenderPassPrivate(); @@ -75,7 +75,7 @@ public: QShaderProgram *m_shader; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qrenderstate.cpp b/src/render/frontend/qrenderstate.cpp index a572b5e06..831962ca4 100644 --- a/src/render/frontend/qrenderstate.cpp +++ b/src/render/frontend/qrenderstate.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! \class Qt3D::QRenderStatePrivate @@ -54,7 +54,7 @@ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type) QRenderState::~QRenderState() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QRenderState subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QRenderState subclass didn't call QNode::cleanup in its destructor"); } QRenderState::Type QRenderState::type() const @@ -69,6 +69,6 @@ QRenderState::QRenderState(QRenderStatePrivate &dd, QNode *parent) { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qrenderstate.h b/src/render/frontend/qrenderstate.h index 1dcaa05f7..6f730a432 100644 --- a/src/render/frontend/qrenderstate.h +++ b/src/render/frontend/qrenderstate.h @@ -35,19 +35,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERSTATE_H -#define QT3D_QRENDERSTATE_H +#ifndef QT3DRENDER_QRENDERSTATE_H +#define QT3DRENDER_QRENDERSTATE_H -#include <Qt3DCore/QNode> +#include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERERSHARED_EXPORT QRenderState : public QNode +class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3D::QNode { Q_OBJECT @@ -78,14 +78,14 @@ public: Type type() const; protected: - QRenderState(QRenderStatePrivate &dd, QNode *parent = Q_NULLPTR); + QRenderState(QRenderStatePrivate &dd, Qt3D::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QRenderState) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERSTATE_H +#endif // QT3DRENDER_QRENDERSTATE_H diff --git a/src/render/frontend/qrenderstate_p.h b/src/render/frontend/qrenderstate_p.h index 8ae1dd5c3..21bdd276a 100644 --- a/src/render/frontend/qrenderstate_p.h +++ b/src/render/frontend/qrenderstate_p.h @@ -35,17 +35,17 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERSTATE_P_H -#define QT3D_QRENDERSTATE_P_H +#ifndef QT3DRENDER_QRENDERSTATE_P_H +#define QT3DRENDER_QRENDERSTATE_P_H #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QRenderStatePrivate : public QNodePrivate +class QRenderStatePrivate : public Qt3D::QNodePrivate { public: QRenderStatePrivate(QRenderState::Type type); @@ -58,4 +58,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QRENDERSTATE_P_H +#endif // QT3DRENDER_QRENDERSTATE_P_H diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index d6297d7de..ed7354871 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -41,10 +41,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderTargetPrivate + \class Qt3DRender::QRenderTargetPrivate \internal */ QRenderTargetPrivate::QRenderTargetPrivate() @@ -113,6 +115,6 @@ QList<QRenderAttachment *> QRenderTarget::attachments() const return d->m_attachments; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 8b2860bca..a7b192b85 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -34,24 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGET_H -#define QT3D_QRENDERTARGET_H +#ifndef QT3DRENDER_QRENDERTARGET_H +#define QT3DRENDER_QRENDERTARGET_H #include <Qt3DCore/qcomponent.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetPrivate; class QRenderAttachment; -class QT3DRENDERERSHARED_EXPORT QRenderTarget : public QComponent +class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3D::QComponent { Q_OBJECT public: - explicit QRenderTarget(QNode *parent = 0); + explicit QRenderTarget(Qt3D::QNode *parent = 0); ~QRenderTarget(); void addAttachment(QRenderAttachment *attachment); @@ -59,16 +59,16 @@ public: QList<QRenderAttachment *> attachments() const; protected: - QRenderTarget(QRenderTargetPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderTarget(QRenderTargetPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTarget) QT3D_CLONEABLE(QRenderTarget) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERTARGET_H +#endif // QT3DRENDER_QRENDERTARGET_H diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h index 50faf7308..57cdd175e 100644 --- a/src/render/frontend/qrendertarget_p.h +++ b/src/render/frontend/qrendertarget_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGET_P_H -#define QT3D_QRENDERTARGET_P_H +#ifndef QT3DRENDER_QRENDERTARGET_P_H +#define QT3DRENDER_QRENDERTARGET_P_H #include <Qt3DCore/private/qcomponent_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderAttachment; class QRenderTarget; -class QRenderTargetPrivate : public QComponentPrivate +class QRenderTargetPrivate : public Qt3D::QComponentPrivate { public: QRenderTargetPrivate(); @@ -59,4 +59,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QRENDERTARGET_P_H +#endif // QT3DRENDER_QRENDERTARGET_P_H diff --git a/src/render/frontend/qsceneloader.cpp b/src/render/frontend/qsceneloader.cpp index eee55f813..b5b4975e7 100644 --- a/src/render/frontend/qsceneloader.cpp +++ b/src/render/frontend/qsceneloader.cpp @@ -44,10 +44,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QSceneLoader::QSceneLoader(QNode *parent) - : Render::QAbstractSceneLoader(parent) + : QAbstractSceneLoader(parent) { } @@ -57,9 +59,9 @@ QSceneLoader::~QSceneLoader() } // Called in main thread -void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &change) +void QSceneLoader::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) { - Render::QAbstractSceneLoaderPrivate *d = static_cast<Render::QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this)); + QAbstractSceneLoaderPrivate *d = static_cast<QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this)); QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change); if (e->type() == NodeUpdated) { if (e->propertyName() == QByteArrayLiteral("scene")) { @@ -84,6 +86,6 @@ void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &change) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qsceneloader.h b/src/render/frontend/qsceneloader.h index 8c0092beb..adbed1dda 100644 --- a/src/render/frontend/qsceneloader.h +++ b/src/render/frontend/qsceneloader.h @@ -34,29 +34,29 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCENELOADER_H -#define QT3D_QSCENELOADER_H +#ifndef QT3DRENDER_QSCENELOADER_H +#define QT3DRENDER_QSCENELOADER_H #include <Qt3DRenderer/qabstractsceneloader.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QSceneLoader : public Render::QAbstractSceneLoader +class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader { Q_OBJECT public: - explicit QSceneLoader(QNode *parent = 0); + explicit QSceneLoader(Qt3D::QNode *parent = 0); ~QSceneLoader(); - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; protected: QT3D_CLONEABLE(QSceneLoader) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSCENELOADER_H +#endif // QT3DRENDER_QSCENELOADER_H diff --git a/src/render/frontend/qscissortest.cpp b/src/render/frontend/qscissortest.cpp index 79ddd61bd..cc2624f41 100644 --- a/src/render/frontend/qscissortest.cpp +++ b/src/render/frontend/qscissortest.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QScissorTestPrivate : public QRenderStatePrivate { @@ -144,6 +144,6 @@ void QScissorTest::setHeight(int height) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qscissortest.h b/src/render/frontend/qscissortest.h index aae531cd3..a607bcd72 100644 --- a/src/render/frontend/qscissortest.h +++ b/src/render/frontend/qscissortest.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSCISSORTEST_H -#define QT3D_QSCISSORTEST_H +#ifndef QT3DRENDER_QSCISSORTEST_H +#define QT3DRENDER_QSCISSORTEST_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QScissorTestPrivate; @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) public: - explicit QScissorTest(QNode *parent = 0); + explicit QScissorTest(Qt3D::QNode *parent = 0); ~QScissorTest(); int left() const; @@ -77,15 +77,15 @@ Q_SIGNALS: void heightChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QScissorTest) QT3D_CLONEABLE(QScissorTest) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSCISSORTEST_H +#endif // QT3DRENDER_QSCISSORTEST_H diff --git a/src/render/frontend/qshaderdata.cpp b/src/render/frontend/qshaderdata.cpp index 0592760ac..848b54bf8 100644 --- a/src/render/frontend/qshaderdata.cpp +++ b/src/render/frontend/qshaderdata.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QShaderDataPrivate + \class Qt3DRender::QShaderDataPrivate \internal */ QShaderDataPrivate::QShaderDataPrivate() @@ -52,7 +52,7 @@ QShaderDataPrivate::QShaderDataPrivate() } /*! - \class Qt3D::QShaderDataPrivate + \class Qt3DRender::QShaderDataPrivate \internal */ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) @@ -62,14 +62,15 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) } /*! - * \class Qt3D::QShaderData + * \class Qt3DRender::QShaderData * \inmodule Qt3DRenderer + * * \brief Provides a way of specifying values of a Uniform Block or a shader * structure. * - * \note When subclassing and adding properties to Qt3D::QShaderData, please note - * that if you need to nest an inner Qt3D::QShaderData, the data type of the - * property should be Qt3D::QShaderData* instead of the name of your subclass. + * \note When subclassing and adding properties to Qt3DRender::QShaderData, please note + * that if you need to nest an inner Qt3DRender::QShaderData, the data type of the + * property should be Qt3DRender::QShaderData* instead of the name of your subclass. * * \since 5.5 */ @@ -115,6 +116,6 @@ void QShaderData::copy(const QNode *ref) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qshaderdata.h b/src/render/frontend/qshaderdata.h index 681c41439..4353581af 100644 --- a/src/render/frontend/qshaderdata.h +++ b/src/render/frontend/qshaderdata.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSHADERDATA_H -#define QT3D_QSHADERDATA_H +#ifndef QT3DRENDER_QSHADERDATA_H +#define QT3DRENDER_QSHADERDATA_H #include <Qt3DCore/qcomponent.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QShaderDataPrivate; @@ -55,11 +55,11 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERERSHARED_EXPORT QShaderData : public QComponent +class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent { Q_OBJECT public: - explicit QShaderData(QNode *parent = 0); + explicit QShaderData(Qt3D::QNode *parent = 0); ~QShaderData(); enum TransformType { @@ -71,8 +71,8 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: @@ -80,11 +80,11 @@ private: QT3D_CLONEABLE(QShaderData) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QShaderData*) -Q_DECLARE_METATYPE(QList<Qt3D::QShaderData*>) +Q_DECLARE_METATYPE(Qt3DRender::QShaderData*) +Q_DECLARE_METATYPE(QList<Qt3DRender::QShaderData*>) -#endif // QT3D_QSHADERDATA_H +#endif // QT3DRENDER_QSHADERDATA_H diff --git a/src/render/frontend/qshaderdata_p.h b/src/render/frontend/qshaderdata_p.h index cdd30aec4..eaf6847f7 100644 --- a/src/render/frontend/qshaderdata_p.h +++ b/src/render/frontend/qshaderdata_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSHADERDATA_P_H -#define QT3D_QSHADERDATA_P_H +#ifndef QT3DRENDER_QSHADERDATA_P_H +#define QT3DRENDER_QSHADERDATA_P_H #include <private/qcomponent_p.h> #include <Qt3DRenderer/qshaderdata.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { @@ -72,7 +72,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface } }; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public QComponentPrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3D::QComponentPrivate { public: QShaderDataPrivate(); @@ -82,8 +82,8 @@ public: Q_DECLARE_PUBLIC(QShaderData) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSHADERDATA_P_H +#endif // QT3DRENDER_QSHADERDATA_P_H diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp index 09e3d7f4e..6c44ee0ce 100644 --- a/src/render/frontend/qshaderprogram.cpp +++ b/src/render/frontend/qshaderprogram.cpp @@ -44,10 +44,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QShaderProgramPrivate + \class Qt3DRender::QShaderProgramPrivate \internal */ QShaderProgramPrivate::QShaderProgramPrivate() @@ -230,7 +230,7 @@ QByteArray QShaderProgram::shaderCode(ShaderType type) const QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl) { // TO DO: Handle remote path - QString filePath = QUrlHelper::urlToLocalFileOrQrc(sourceUrl); + QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(sourceUrl); QFile f(filePath); if (!f.exists()) @@ -240,6 +240,6 @@ QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl) return f.readAll(); } -} // of namespace Qt3D +} // of namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h index 1fada18b4..6695316ee 100644 --- a/src/render/frontend/qshaderprogram.h +++ b/src/render/frontend/qshaderprogram.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QSHADERPROGRAM_H -#define QT3D_QSHADERPROGRAM_H +#ifndef QT3DRENDER_QSHADERPROGRAM_H +#define QT3DRENDER_QSHADERPROGRAM_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QShaderProgramPrivate; -class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode +class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged) @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) public: - explicit QShaderProgram(QNode *parent = 0); + explicit QShaderProgram(Qt3D::QNode *parent = 0); ~QShaderProgram(); enum ShaderType { @@ -103,8 +103,8 @@ Q_SIGNALS: void computeShaderCodeChanged(); protected: - QShaderProgram(QShaderProgramPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QShaderProgram(QShaderProgramPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QShaderProgram) @@ -115,4 +115,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QSHADERPROGRAM_H +#endif // QT3DRENDER_QSHADERPROGRAM_H diff --git a/src/render/frontend/qshaderprogram_p.h b/src/render/frontend/qshaderprogram_p.h index 455436a8a..2fd50f3b0 100644 --- a/src/render/frontend/qshaderprogram_p.h +++ b/src/render/frontend/qshaderprogram_p.h @@ -34,18 +34,18 @@ ** ****************************************************************************/ -#ifndef QT3D_QSHADERPROGRAM_P_H -#define QT3D_QSHADERPROGRAM_P_H +#ifndef QT3DRENDER_QSHADERPROGRAM_P_H +#define QT3DRENDER_QSHADERPROGRAM_P_H #include <private/qnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QShaderProgram; -class QShaderProgramPrivate : public QNodePrivate +class QShaderProgramPrivate : public Qt3D::QNodePrivate { public: QShaderProgramPrivate(); @@ -65,8 +65,8 @@ public: QByteArray m_computeShaderCode; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSHADERPROGRAM_P_H +#endif // QT3DRENDER_QSHADERPROGRAM_P_H diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp index 66fe6f738..6e5b6ce4f 100644 --- a/src/render/frontend/qspheremesh.cpp +++ b/src/render/frontend/qspheremesh.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { diff --git a/src/render/frontend/qspheremesh.h b/src/render/frontend/qspheremesh.h index 8363a01bc..e96ad94e8 100644 --- a/src/render/frontend/qspheremesh.h +++ b/src/render/frontend/qspheremesh.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSPHEREMESH_H -#define QT3D_QSPHEREMESH_H +#ifndef QT3DRENDER_QSPHEREMESH_H +#define QT3DRENDER_QSPHEREMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSphereMeshPrivate; @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged) public: - explicit QSphereMesh(QNode *parent = 0); + explicit QSphereMesh(Qt3D::QNode *parent = 0); ~QSphereMesh(); void setRings(int rings); @@ -87,8 +87,8 @@ private: void setPrimitiveType(PrimitiveType primitiveType); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSPHEREMESH_H +#endif // QT3DRENDER_QSPHEREMESH_H diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp index 58901b4fd..191be0e62 100644 --- a/src/render/frontend/qspotlight.cpp +++ b/src/render/frontend/qspotlight.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /* @@ -168,6 +168,6 @@ void QSpotLight::setCutOffAngle(float cutOffAngle) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qspotlight.h b/src/render/frontend/qspotlight.h index 9a1123f14..c22ef62e5 100644 --- a/src/render/frontend/qspotlight.h +++ b/src/render/frontend/qspotlight.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSPOTLIGHT_H -#define QT3D_QSPOTLIGHT_H +#ifndef QT3DRENDER_QSPOTLIGHT_H +#define QT3DRENDER_QSPOTLIGHT_H #include <Qt3DRenderer/qabstractlight.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSpotLightPrivate; @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged) public: - explicit QSpotLight(QNode *parent = 0); + explicit QSpotLight(Qt3D::QNode *parent = 0); QVector3D direction() const; float cutOffAngle() const; @@ -65,16 +65,16 @@ Q_SIGNALS: void cutOffAngleChanged(); protected: - QSpotLight(QSpotLightPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSpotLight(QSpotLightPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSpotLight) QT3D_CLONEABLE(QSpotLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSPOTLIGHT_H +#endif // QT3DRENDER_QSPOTLIGHT_H diff --git a/src/render/frontend/qspotlight_p.h b/src/render/frontend/qspotlight_p.h index d05ec446d..673438a33 100644 --- a/src/render/frontend/qspotlight_p.h +++ b/src/render/frontend/qspotlight_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSPOTLIGHT_P_H -#define QT3D_QSPOTLIGHT_P_H +#ifndef QT3DRENDER_QSPOTLIGHT_P_H +#define QT3DRENDER_QSPOTLIGHT_P_H #include <private/qabstractlight_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QSpotLightPrivate : public QAbstractLightPrivate { @@ -53,8 +53,8 @@ public: QVector3D m_direction; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSPOTLIGHT_P_H +#endif // QT3DRENDER_QSPOTLIGHT_P_H diff --git a/src/render/frontend/qstencilmask.cpp b/src/render/frontend/qstencilmask.cpp index 79a436e5b..44098296a 100644 --- a/src/render/frontend/qstencilmask.cpp +++ b/src/render/frontend/qstencilmask.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilMaskPrivate : public QRenderStatePrivate { @@ -106,6 +106,6 @@ void QStencilMask::copy(const QNode *ref) d_func()->m_backMask = otherRef->backMask(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qstencilmask.h b/src/render/frontend/qstencilmask.h index 58da93891..6e11cff68 100644 --- a/src/render/frontend/qstencilmask.h +++ b/src/render/frontend/qstencilmask.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTENCILMASK_H -#define QT3D_QSTENCILMASK_H +#ifndef QT3DRENDER_QSTENCILMASK_H +#define QT3DRENDER_QSTENCILMASK_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilMaskPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStencilMask : public QRenderState Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged) Q_PROPERTY(uint backMask READ backMask WRITE setBackMask NOTIFY backMaskChanged) public: - explicit QStencilMask(QNode *parent = 0); + explicit QStencilMask(Qt3D::QNode *parent = 0); ~QStencilMask(); void setFrontMask(uint mask); @@ -64,15 +64,15 @@ Q_SIGNALS: void backMaskChanged(); protected: - void copy(const QNode *ref) Q_DECL_FINAL; + void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilMask) QT3D_CLONEABLE(QStencilMask) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTENCILMASK_H +#endif // QT3DRENDER_QSTENCILMASK_H diff --git a/src/render/frontend/qstencilop.cpp b/src/render/frontend/qstencilop.cpp index 54aa4a1bc..67a571202 100644 --- a/src/render/frontend/qstencilop.cpp +++ b/src/render/frontend/qstencilop.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilOpPrivate : public QRenderStatePrivate { @@ -90,6 +90,6 @@ void QStencilOp::copy(const QNode *ref) d_func()->m_front->setStencilDepthPass(refState->d_func()->m_front->stencilDepthPass()); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qstencilop.h b/src/render/frontend/qstencilop.h index 83baebaed..bc212af48 100644 --- a/src/render/frontend/qstencilop.h +++ b/src/render/frontend/qstencilop.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTENCILOP_H -#define QT3D_QSTENCILOP_H +#ifndef QT3DRENDER_QSTENCILOP_H +#define QT3DRENDER_QSTENCILOP_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparate; @@ -49,26 +49,26 @@ class QStencilOpSeparate; class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState { Q_OBJECT - Q_PROPERTY(Qt3D::QStencilOpSeparate *front READ front CONSTANT) - Q_PROPERTY(Qt3D::QStencilOpSeparate *back READ back CONSTANT) + Q_PROPERTY(Qt3DRender::QStencilOpSeparate *front READ front CONSTANT) + Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT) public: - explicit QStencilOp(QNode *parent = 0); + explicit QStencilOp(Qt3D::QNode *parent = 0); ~QStencilOp(); QStencilOpSeparate *front() const; QStencilOpSeparate *back() const; protected: - void copy(const QNode *ref) Q_DECL_FINAL; + void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilOp) QT3D_CLONEABLE(QStencilOp) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTENCILOP_H +#endif // QT3DRENDER_QSTENCILOP_H diff --git a/src/render/frontend/qstencilopseparate.cpp b/src/render/frontend/qstencilopseparate.cpp index 2a778a398..ec2c4e40c 100644 --- a/src/render/frontend/qstencilopseparate.cpp +++ b/src/render/frontend/qstencilopseparate.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilOpSeparatePrivate : public QObjectPrivate { @@ -120,6 +120,6 @@ QStencilOpSeparate::StencilOp QStencilOpSeparate::stencilDepthPass() const return d->m_stencilDepthPassOp; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qstencilopseparate.h b/src/render/frontend/qstencilopseparate.h index 341a0495c..44561131c 100644 --- a/src/render/frontend/qstencilopseparate.h +++ b/src/render/frontend/qstencilopseparate.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTENCILOPSEPARATE_H -#define QT3D_QSTENCILOPSEPARATE_H +#ifndef QT3DRENDER_QSTENCILOPSEPARATE_H +#define QT3DRENDER_QSTENCILOPSEPARATE_H #include <QObject> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparatePrivate; @@ -103,8 +103,8 @@ private: friend class QStencilOpPrivate; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTENCILOPSEPARATE_H +#endif // QT3DRENDER_QSTENCILOPSEPARATE_H diff --git a/src/render/frontend/qstenciltest.cpp b/src/render/frontend/qstenciltest.cpp index 2f315deab..2533d71a9 100644 --- a/src/render/frontend/qstenciltest.cpp +++ b/src/render/frontend/qstenciltest.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilTestPrivate : public QRenderStatePrivate { @@ -96,6 +96,6 @@ void QStencilTest::copy(const QNode *ref) } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qstenciltest.h b/src/render/frontend/qstenciltest.h index a31e072eb..51469f69c 100644 --- a/src/render/frontend/qstenciltest.h +++ b/src/render/frontend/qstenciltest.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTENCILTEST_H -#define QT3D_QSTENCILTEST_H +#ifndef QT3DRENDER_QSTENCILTEST_H +#define QT3DRENDER_QSTENCILTEST_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparate; @@ -50,27 +50,27 @@ class QStencilTestSeparate; class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState { Q_OBJECT - Q_PROPERTY(Qt3D::QStencilTestSeparate *front READ front CONSTANT) - Q_PROPERTY(Qt3D::QStencilTestSeparate *back READ back CONSTANT) + Q_PROPERTY(Qt3DRender::QStencilTestSeparate *front READ front CONSTANT) + Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT) public: - explicit QStencilTest(QNode *parent = 0); + explicit QStencilTest(Qt3D::QNode *parent = 0); ~QStencilTest(); QStencilTestSeparate *front() const; QStencilTestSeparate *back() const; protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStencilTest) QT3D_CLONEABLE(QStencilTest) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTENCILTEST_H +#endif // QT3DRENDER_QSTENCILTEST_H diff --git a/src/render/frontend/qstenciltestseparate.cpp b/src/render/frontend/qstenciltestseparate.cpp index 5d10e4db7..87b9fc798 100644 --- a/src/render/frontend/qstenciltestseparate.cpp +++ b/src/render/frontend/qstenciltestseparate.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilTestSeparatePrivate : public QObjectPrivate { @@ -121,6 +121,6 @@ QStencilTestSeparate::StencilFaceMode QStencilTestSeparate::faceMode() const return d->m_face; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qstenciltestseparate.h b/src/render/frontend/qstenciltestseparate.h index 0322fc1de..5689a1cfb 100644 --- a/src/render/frontend/qstenciltestseparate.h +++ b/src/render/frontend/qstenciltestseparate.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTENCILTESTSEPARATE_H -#define QT3D_QSTENCILTESTSEPARATE_H +#ifndef QT3DRENDER_QSTENCILTESTSEPARATE_H +#define QT3DRENDER_QSTENCILTESTSEPARATE_H #include <QObject> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparatePrivate; @@ -104,8 +104,8 @@ private: Q_DECLARE_PRIVATE(QStencilTestSeparate) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTENCILTESTSEPARATE_H +#endif // QT3DRENDER_QSTENCILTESTSEPARATE_H diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp index 01699715e..52578e267 100644 --- a/src/render/frontend/qtechnique.cpp +++ b/src/render/frontend/qtechnique.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QTechniquePrivate + \class Qt3DRender::QTechniquePrivate \internal */ QTechniquePrivate::QTechniquePrivate() @@ -244,7 +246,7 @@ QOpenGLFilter *QTechnique::openGLFilter() return &d->m_openGLFilter; } -} // of namespace Qt3D +} // of namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h index b1df01dd3..d45892991 100644 --- a/src/render/frontend/qtechnique.h +++ b/src/render/frontend/qtechnique.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUE_H -#define QT3D_QTECHNIQUE_H +#ifndef QT3DRENDER_QTECHNIQUE_H +#define QT3DRENDER_QTECHNIQUE_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qnode.h> @@ -46,19 +46,19 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QParameter; class QTechniquePrivate; class QOpenGLFilter; -class QT3DRENDERERSHARED_EXPORT QTechnique : public QNode +class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QOpenGLFilter *openGLFilter READ openGLFilter) + Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter) public: - explicit QTechnique(QNode *parent = 0); + explicit QTechnique(Qt3D::QNode *parent = 0); ~QTechnique(); void addAnnotation(QAnnotation *criterion); @@ -76,8 +76,8 @@ public: QOpenGLFilter *openGLFilter(); protected: - QTechnique(QTechniquePrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QTechnique(QTechniquePrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechnique) @@ -89,4 +89,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUE_H +#endif // QT3DRENDER_QTECHNIQUE_H diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h index 6ae35f1e1..87fa18647 100644 --- a/src/render/frontend/qtechnique_p.h +++ b/src/render/frontend/qtechnique_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUE_P_H -#define QT3D_QTECHNIQUE_P_H +#ifndef QT3DRENDER_QTECHNIQUE_P_H +#define QT3DRENDER_QTECHNIQUE_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/qopenglfilter.h> @@ -43,14 +43,14 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechnique; class QAnnotation; class QParameter; class QRenderPass; -class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public QNodePrivate +class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3D::QNodePrivate { public: QTechniquePrivate(); @@ -66,8 +66,8 @@ private: void _q_openGLFilterChanged(); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUE_P_H +#endif // QT3DRENDER_QTECHNIQUE_P_H diff --git a/src/render/frontend/qtexture.h b/src/render/frontend/qtexture.h index 68b18aa02..d794f5b08 100644 --- a/src/render/frontend/qtexture.h +++ b/src/render/frontend/qtexture.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTEXTURE_H -#define QT3D_QTEXTURE_H +#ifndef QT3DRENDER_QTEXTURE_H +#define QT3DRENDER_QTEXTURE_H #include <QOpenGLTexture> #include <Qt3DRenderer/texturedata.h> @@ -53,4 +53,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -#endif // QT3D_QTEXTURE_H +#endif // QT3DRENDER_QTEXTURE_H diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp index c61703f5f..3d8a58b3e 100644 --- a/src/render/frontend/qtextureimage.cpp +++ b/src/render/frontend/qtextureimage.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTextureImagePrivate: public QAbstractTextureImagePrivate { @@ -67,7 +67,7 @@ public: { TexImageDataPtr dataPtr; if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) { - QString source = QUrlHelper::urlToLocalFileOrQrc(m_url); + QString source = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_url); dataPtr.reset(new TexImageData()); if (dataPtr->setCompressedFile(source)) return dataPtr; @@ -109,7 +109,7 @@ private: /*! \qmltype TextureImage - \instantiates Qt3D::QTextureImage + \instantiates Qt3DRender::QTextureImage \inherits AbstractTextureImage \inqmlmodule Qt3D.Renderer \since 5.5 @@ -118,7 +118,7 @@ private: */ /*! - Constructs a new Qt3D::QTextureImage instance with \a parent as parent. + Constructs a new Qt3DRender::QTextureImage instance with \a parent as parent. */ QTextureImage::QTextureImage(QNode *parent) : QAbstractTextureImage(*new QTextureImagePrivate, parent) @@ -143,7 +143,7 @@ QUrl QTextureImage::source() const } /*! - \property Qt3D::QTextureImage::source + \property Qt3DRender::QTextureImage::source This property holdsthe source url from which data for the texture image will be loaded. @@ -171,7 +171,7 @@ void QTextureImage::setSource(const QUrl &source) } /*! - Returns the Qt3D::QTextureDataFunctorPtr functor to be used by the + Returns the Qt3DRender::QTextureDataFunctorPtr functor to be used by the backend to load the texture image data into an OpenGL texture object. */ QTextureDataFunctorPtr QTextureImage::dataFunctor() const @@ -189,7 +189,7 @@ void QTextureImage::copy(const QNode *ref) d_func()->m_source = img->source(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qtextureimage.h b/src/render/frontend/qtextureimage.h index cf08f7b2b..f77c2d47e 100644 --- a/src/render/frontend/qtextureimage.h +++ b/src/render/frontend/qtextureimage.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QTEXTUREIMAGE_H -#define QT3D_QTEXTUREIMAGE_H +#ifndef QT3DRENDER_QTEXTUREIMAGE_H +#define QT3DRENDER_QTEXTUREIMAGE_H #include <QUrl> #include <Qt3DRenderer/qabstracttextureimage.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTextureImagePrivate; @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QTextureImage(QNode *parent = 0); + explicit QTextureImage(Qt3D::QNode *parent = 0); ~QTextureImage(); QUrl source() const; @@ -64,15 +64,15 @@ Q_SIGNALS: void sourceChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTextureImage) QT3D_CLONEABLE(QTextureImage) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTEXTUREIMAGE_H +#endif // QT3DRENDER_QTEXTUREIMAGE_H diff --git a/src/render/frontend/qtextureproviders.cpp b/src/render/frontend/qtextureproviders.cpp index 0292c19a5..62c8f66c7 100644 --- a/src/render/frontend/qtextureproviders.cpp +++ b/src/render/frontend/qtextureproviders.cpp @@ -38,17 +38,17 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QTexture1D + \class Qt3DRender::QTexture1D \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target1D target format. */ /*! - Constructs a new Qt3D::QTexture1D instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture1D instance with \a parent as parent. */ QTexture1D::QTexture1D(QNode *parent) : QAbstractTextureProvider(Target1D, parent) @@ -60,14 +60,14 @@ QTexture1D::~QTexture1D() } /*! - \class Qt3D::QTexture1DArray + \class Qt3DRender::QTexture1DArray \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target1DArray target format. */ /*! - Constructs a new Qt3D::QTexture1DArray instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture1DArray instance with \a parent as parent. */ QTexture1DArray::QTexture1DArray(QNode *parent) : QAbstractTextureProvider(Target1DArray, parent) @@ -79,14 +79,14 @@ QTexture1DArray::~QTexture1DArray() } /*! - \class Qt3D::QTexture2D + \class Qt3DRender::QTexture2D \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target2D target format. */ /*! - Constructs a new Qt3D::QTexture2D instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture2D instance with \a parent as parent. */ QTexture2D::QTexture2D(QNode *parent) : QAbstractTextureProvider(Target2D, parent) @@ -98,14 +98,14 @@ QTexture2D::~QTexture2D() } /*! - \class Qt3D::QTexture2DArray + \class Qt3DRender::QTexture2DArray \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target2DArray target format. */ /*! - Constructs a new Qt3D::QTexture2DArray instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture2DArray instance with \a parent as parent. */ QTexture2DArray::QTexture2DArray(QNode *parent) : QAbstractTextureProvider(Target2DArray, parent) @@ -118,14 +118,14 @@ QTexture2DArray::~QTexture2DArray() /*! - \class Qt3D::QTexture3D + \class Qt3DRender::QTexture3D \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target3D target format. */ /*! - Constructs a new Qt3D::QTexture3D instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture3D instance with \a parent as parent. */ QTexture3D::QTexture3D(QNode *parent) : QAbstractTextureProvider(Target2D, parent) @@ -137,14 +137,14 @@ QTexture3D::~QTexture3D() } /*! - \class Qt3D::QTextureCubeMap + \class Qt3DRender::QTextureCubeMap \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a TargetCubeMap target format. */ /*! - Constructs a new Qt3D::QTextureCubeMap instance with \a parent as parent. + Constructs a new Qt3DRender::QTextureCubeMap instance with \a parent as parent. */ QTextureCubeMap::QTextureCubeMap(QNode *parent) : QAbstractTextureProvider(TargetCubeMap, parent) @@ -156,14 +156,14 @@ QTextureCubeMap::~QTextureCubeMap() } /*! - \class Qt3D::QTextureCubeMapArray + \class Qt3DRender::QTextureCubeMapArray \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a TargetCubeMapArray target format. */ /*! - Constructs a new Qt3D::QTextureCubeMapArray instance with \a parent as parent. + Constructs a new Qt3DRender::QTextureCubeMapArray instance with \a parent as parent. */ QTextureCubeMapArray::QTextureCubeMapArray(QNode *parent) : QAbstractTextureProvider(TargetCubeMapArray, parent) @@ -176,14 +176,14 @@ QTextureCubeMapArray::~QTextureCubeMapArray() } /*! - \class Qt3D::QTexture2DMultisample + \class Qt3DRender::QTexture2DMultisample \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target2DMultisample target format. */ /*! - Constructs a new Qt3D::QTexture2DMultisample instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture2DMultisample instance with \a parent as parent. */ QTexture2DMultisample::QTexture2DMultisample(QNode *parent) : QAbstractTextureProvider(Target2DMultisample, parent) @@ -195,14 +195,14 @@ QTexture2DMultisample::~QTexture2DMultisample() } /*! - \class Qt3D::QTexture2DMultisampleArray + \class Qt3DRender::QTexture2DMultisampleArray \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a Target2DMultisampleArray target format. */ /*! - Constructs a new Qt3D::QTexture2DMultisampleArray instance with \a parent as parent. + Constructs a new Qt3DRender::QTexture2DMultisampleArray instance with \a parent as parent. */ QTexture2DMultisampleArray::QTexture2DMultisampleArray(QNode *parent) : QAbstractTextureProvider(Target2DMultisampleArray, parent) @@ -214,14 +214,14 @@ QTexture2DMultisampleArray::~QTexture2DMultisampleArray() } /*! - \class Qt3D::QTextureRectangle + \class Qt3DRender::QTextureRectangle \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a TargetRectangle target format. */ /*! - Constructs a new Qt3D::QTextureRectangle instance with \a parent as parent. + Constructs a new Qt3DRender::QTextureRectangle instance with \a parent as parent. */ QTextureRectangle::QTextureRectangle(QNode *parent) : QAbstractTextureProvider(TargetRectangle, parent) @@ -233,14 +233,14 @@ QTextureRectangle::~QTextureRectangle() } /*! - \class Qt3D::QTextureBuffer + \class Qt3DRender::QTextureBuffer \inmodule Qt3DRenderer \since 5.5 \brief A QAbstractTextureProvider with a TargetBuffer target format. */ /*! - Constructs a new Qt3D::QTextureBuffer instance with \a parent as parent. + Constructs a new Qt3DRender::QTextureBuffer instance with \a parent as parent. */ QTextureBuffer::QTextureBuffer(QNode *parent) : QAbstractTextureProvider(TargetBuffer, parent) @@ -251,7 +251,7 @@ QTextureBuffer::~QTextureBuffer() { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qtextureproviders.h b/src/render/frontend/qtextureproviders.h index 4f5ed03f8..dc54b7999 100644 --- a/src/render/frontend/qtextureproviders.h +++ b/src/render/frontend/qtextureproviders.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QTEXTUREPROVIDERS_H -#define QT3D_QTEXTUREPROVIDERS_H +#ifndef QT3DRENDER_QTEXTUREPROVIDERS_H +#define QT3DRENDER_QTEXTUREPROVIDERS_H #include <Qt3DRenderer/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider { @@ -131,8 +131,8 @@ public: ~QTextureBuffer(); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTEXTUREPROVIDERS_H +#endif // QT3DRENDER_QTEXTUREPROVIDERS_H diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/frontend/qtorusmesh.cpp index cb0f8c536..fcd10b24e 100644 --- a/src/render/frontend/qtorusmesh.cpp +++ b/src/render/frontend/qtorusmesh.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace { @@ -396,7 +396,7 @@ float QTorusMesh::minorRadius() const return static_cast<TorusGeometry *>(geometry())->minorRadius(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qtorusmesh.h b/src/render/frontend/qtorusmesh.h index 746951266..b1cca55f9 100644 --- a/src/render/frontend/qtorusmesh.h +++ b/src/render/frontend/qtorusmesh.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QTORUSMESH_H -#define QT3D_QTORUSMESH_H +#ifndef QT3DRENDER_QTORUSMESH_H +#define QT3DRENDER_QTORUSMESH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qgeometryrenderer.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer { @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: - explicit QTorusMesh(QNode *parent = 0); + explicit QTorusMesh(Qt3D::QNode *parent = 0); ~QTorusMesh(); void setRings(int rings); @@ -85,8 +85,8 @@ private: void setPrimitiveType(PrimitiveType primitiveType); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTORUSMESH_H +#endif // QT3DRENDER_QTORUSMESH_H diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp index 2f2ba80f1..3b6c3786e 100644 --- a/src/render/frontend/qwindow.cpp +++ b/src/render/frontend/qwindow.cpp @@ -47,7 +47,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QWindowPrivate::QWindowPrivate() : ::QWindowPrivate() @@ -125,13 +127,13 @@ QFrameGraph *QWindow::frameGraph() const return d->m_frameGraph; } -QCamera *QWindow::defaultCamera() +Qt3D::QCamera *QWindow::defaultCamera() { Q_D(const QWindow); return d->m_defaultCamera; } -void QWindow::registerAspect(QAbstractAspect *aspect) +void QWindow::registerAspect(Qt3D::QAbstractAspect *aspect) { Q_ASSERT(!isVisible()); Q_D(QWindow); @@ -145,7 +147,7 @@ void QWindow::registerAspect(const QString &name) d->m_engine->registerAspect(name); } -void QWindow::setRootEntity(QEntity *root) +void QWindow::setRootEntity(Qt3D::QEntity *root) { Q_ASSERT(!isVisible()); Q_D(QWindow); @@ -178,6 +180,6 @@ void QWindow::show() ::QWindow::show(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h index a2df2c8d8..b1acb2ba1 100644 --- a/src/render/frontend/qwindow.h +++ b/src/render/frontend/qwindow.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QWINDOW_H -#define QT3D_QWINDOW_H +#ifndef QT3DRENDER_QWINDOW_H +#define QT3DRENDER_QWINDOW_H #include <QtGui/qwindow.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,12 +43,15 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - +class QAbstractAspect; +class QCamera; class QEntity; +} + +namespace Qt3DRender { + class QWindowPrivate; class QFrameGraph; -class QAbstractAspect; -class QCamera; class QT3DRENDERERSHARED_EXPORT QWindow : public ::QWindow { @@ -58,12 +61,12 @@ public: void setFrameGraph(QFrameGraph *frameGraph); QFrameGraph *frameGraph() const; - QCamera *defaultCamera(); + Qt3D::QCamera *defaultCamera(); - void registerAspect(QAbstractAspect *aspect); + void registerAspect(Qt3D::QAbstractAspect *aspect); void registerAspect(const QString &name); - void setRootEntity(QEntity *root); + void setRootEntity(Qt3D::QEntity *root); void show(); protected: @@ -74,8 +77,8 @@ private: Q_DECLARE_PRIVATE(QWindow) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QWINDOW_H +#endif // QT3DRENDER_QWINDOW_H diff --git a/src/render/frontend/qwindow_p.h b/src/render/frontend/qwindow_p.h index c7029e2fb..bb5c0d091 100644 --- a/src/render/frontend/qwindow_p.h +++ b/src/render/frontend/qwindow_p.h @@ -34,21 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3D_QWINDOW_P_H -#define QT3D_QWINDOW_P_H +#ifndef QT3DRENDER_QWINDOW_P_H +#define QT3DRENDER_QWINDOW_P_H #include <QtGui/private/qwindow_p.h> QT_BEGIN_NAMESPACE namespace Qt3D { +class QAspectEngine; +class QCamera; +class QEntity; +} + +namespace Qt3DRender { class QWindow; -class QEntity; class QFrameGraph; -class QAspectEngine; class QRenderAspect; -class QCamera; class QWindowPrivate : public ::QWindowPrivate { @@ -56,18 +59,18 @@ public: QWindowPrivate(); Q_DECLARE_PUBLIC(QWindow) - QEntity *m_root; - QEntity * m_userRoot; - QCamera *m_defaultCamera; + Qt3D::QEntity *m_root; + Qt3D::QEntity * m_userRoot; + Qt3D::QCamera *m_defaultCamera; QFrameGraph *m_frameGraph; - QScopedPointer<QAspectEngine> m_engine; + QScopedPointer<Qt3D::QAspectEngine> m_engine; QRenderAspect *m_renderAspect; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QWINDOW_P_H +#endif // QT3DRENDER_QWINDOW_P_H diff --git a/src/render/frontend/qwrapmode.cpp b/src/render/frontend/qwrapmode.cpp index d25a2f11e..2e5ace4d2 100644 --- a/src/render/frontend/qwrapmode.cpp +++ b/src/render/frontend/qwrapmode.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTextureWrapModePrivate : public QObjectPrivate { @@ -59,11 +59,11 @@ public: }; /*! - \class Qt3D::QTextureWrapMode + \class Qt3DRender::QTextureWrapMode \inmodule Qt3DRenderer \since 5.5 - \brief Defines the wrap mode a Qt3D::QAbstractTextureProvider + \brief Defines the wrap mode a Qt3DRender::QAbstractTextureProvider should apply to a texture. */ @@ -76,7 +76,7 @@ QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent) } /*! - Contrusts a new Qt3D::QTextureWrapMode instance with the wrap mode to apply to + Contrusts a new Qt3DRender::QTextureWrapMode instance with the wrap mode to apply to each dimension \a x, \a y \a z of the texture and \a parent as parent. */ QTextureWrapMode::QTextureWrapMode(WrapMode x,WrapMode y, WrapMode z, QObject *parent) @@ -152,6 +152,6 @@ QTextureWrapMode::WrapMode QTextureWrapMode::z() const return d->m_z; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/qwrapmode.h b/src/render/frontend/qwrapmode.h index e6c1e24f1..6254fe5bf 100644 --- a/src/render/frontend/qwrapmode.h +++ b/src/render/frontend/qwrapmode.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QWRAPMODE_H -#define QT3D_QWRAPMODE_H +#ifndef QT3DRENDER_QWRAPMODE_H +#define QT3DRENDER_QWRAPMODE_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <QObject> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTextureWrapModePrivate; @@ -83,8 +83,8 @@ private: Q_DECLARE_PRIVATE(QTextureWrapMode) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QWRAPMODE_H +#endif // QT3DRENDER_QWRAPMODE_H diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp index 0c7620dcf..a8b9cd6de 100644 --- a/src/render/frontend/sphere.cpp +++ b/src/render/frontend/sphere.cpp @@ -50,7 +50,7 @@ namespace { // Intersects ray r = p + td, |d| = 1, with sphere s and, if intersecting, // returns true and intersection point q; false otherwise -bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3D::Sphere &s, QVector3D *q = Q_NULLPTR) +bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR) { const QVector3D p = ray.origin(); const QVector3D d = ray.direction(); @@ -121,7 +121,7 @@ inline QPair<int, int> findExtremePoints(const QVector<QVector3D> &points) return extremeIndices; } -inline void sphereFromExtremePoints(Qt3D::Sphere &s, const QVector<QVector3D> &points) +inline void sphereFromExtremePoints(Qt3DRender::Sphere &s, const QVector<QVector3D> &points) { // Find two most separated points on any of the basis vectors QPair<int, int> extremeIndices = findExtremePoints(points); @@ -134,7 +134,7 @@ inline void sphereFromExtremePoints(Qt3D::Sphere &s, const QVector<QVector3D> &p s.setRadius((q - c).length()); } -inline void constructRitterSphere(Qt3D::Sphere &s, const QVector<QVector3D> &points) +inline void constructRitterSphere(Qt3DRender::Sphere &s, const QVector<QVector3D> &points) { // Calculate the sphere encompassing two axially extreme points sphereFromExtremePoints(s, points); @@ -145,7 +145,7 @@ inline void constructRitterSphere(Qt3D::Sphere &s, const QVector<QVector3D> &poi } // anonymous namespace -namespace Qt3D { +namespace Qt3DRender { const float Sphere::ms_epsilon = 1.0e-7f; @@ -211,17 +211,17 @@ Sphere Sphere::transformed(const QMatrix4x4 &mat) return Sphere(c, sqrt(rSquared)); } -QNodeId Sphere::id() const +Qt3D::QNodeId Sphere::id() const { return m_id; } -bool Sphere::intersects(const QRay3D &ray, QVector3D *q) const +bool Sphere::intersects(const Qt3D::QRay3D &ray, QVector3D *q) const { return intersectRaySphere(ray, *this, q); } -QBoundingVolume::Type Sphere::type() const +Qt3D::QBoundingVolume::Type Sphere::type() const { return QBoundingVolume::Sphere; } diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h index 8d01b4771..e14ecc38b 100644 --- a/src/render/frontend/sphere.h +++ b/src/render/frontend/sphere.h @@ -46,18 +46,18 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT Sphere : public QBoundingSphere +class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere { public: - inline Sphere(const QNodeId &i = QNodeId()) + inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId()) : m_center() , m_radius(0.0f) , m_id(i) {} - inline Sphere(const QVector3D &c, float r, const QNodeId &i = QNodeId()) + inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId()) : m_center(c) , m_radius(r) , m_id(i) @@ -89,8 +89,8 @@ public: return *this; } - QNodeId id() const Q_DECL_FINAL; - bool intersects(const QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; + Qt3D::QNodeId id() const Q_DECL_FINAL; + bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; Type type() const Q_DECL_FINAL; static Sphere fromPoints(const QVector<QVector3D> &points); @@ -98,7 +98,7 @@ public: private: QVector3D m_center; float m_radius; - QNodeId m_id; + Qt3D::QNodeId m_id; static const float ms_epsilon; }; @@ -145,6 +145,6 @@ inline bool intersects(const Sphere &a, const Sphere &b) QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Sphere) +Q_DECLARE_METATYPE(Qt3DRender::Sphere) #endif // SPHERE_H |