diff options
Diffstat (limited to 'src/render/renderstates')
22 files changed, 54 insertions, 54 deletions
diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 753b28919..5ba0a5506 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: - explicit QAlphaCoverage(Qt3D::QNode *parent = 0); + explicit QAlphaCoverage(Qt3DCore::QNode *parent = 0); ~QAlphaCoverage(); private: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index d59340ec7..44d107529 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -65,7 +65,7 @@ public: }; Q_ENUM(AlphaFunc) - explicit QAlphaTest(Qt3D::QNode *parent = 0); + explicit QAlphaTest(Qt3DCore::QNode *parent = 0); ~QAlphaTest(); AlphaFunc func() const; @@ -79,7 +79,7 @@ Q_SIGNALS: void clampChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAlphaTest) diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index 94735fdb6..e6ca15fb7 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(BlendMode) - explicit QBlendEquation(Qt3D::QNode *parent = 0); + explicit QBlendEquation(Qt3DCore::QNode *parent = 0); ~QBlendEquation(); BlendMode mode() const; @@ -72,7 +72,7 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QBlendEquation) diff --git a/src/render/renderstates/qblendstate.cpp b/src/render/renderstates/qblendstate.cpp index 7f7a8d680..76e945372 100644 --- a/src/render/renderstates/qblendstate.cpp +++ b/src/render/renderstates/qblendstate.cpp @@ -65,7 +65,7 @@ public: }; /*! - \class Qt3D::QBlendState + \class Qt3DCore::QBlendState \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates blending information. @@ -73,7 +73,7 @@ public: /*! \qmltype BlendState - \instantiates Qt3D::QBlendState + \instantiates Qt3DCore::QBlendState \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 @@ -116,7 +116,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent) } /*! - \enum Qt3D::QBlendState::Blending + \enum Qt3DCore::QBlendState::Blending \value Zero 0 \value One 1 @@ -145,7 +145,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent) */ /*! - \property Qt3D::QBlendState::srcRGB + \property Qt3DCore::QBlendState::srcRGB */ QBlendState::Blending QBlendState::srcRGB() const @@ -169,7 +169,7 @@ void QBlendState::setSrcRGB(QBlendState::Blending srcRGB) */ /*! - \property Qt3D::QBlendState::dstRGB + \property Qt3DCore::QBlendState::dstRGB */ QBlendState::Blending QBlendState::dstRGB() const @@ -193,7 +193,7 @@ void QBlendState::setDstRGB(QBlendState::Blending dstRGB) */ /*! - \property Qt3D::QBlendState::srcAlpha + \property Qt3DCore::QBlendState::srcAlpha */ QBlendState::Blending QBlendState::srcAlpha() const @@ -217,7 +217,7 @@ void QBlendState::setSrcAlpha(QBlendState::Blending srcAlpha) */ /*! - \property Qt3D::QBlendState::dstAlpha + \property Qt3DCore::QBlendState::dstAlpha */ QBlendState::Blending QBlendState::dstAlpha() const @@ -244,7 +244,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha) /*! \qmltype BlendStateSeparate - \instantiates Qt3D::QBlendStateSeparate + \instantiates Qt3DCore::QBlendStateSeparate \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h index 25072f449..2ae8b06bc 100644 --- a/src/render/renderstates/qblendstate.h +++ b/src/render/renderstates/qblendstate.h @@ -80,7 +80,7 @@ public: }; Q_ENUM(Blending) - explicit QBlendState(Qt3D::QNode *parent = 0); + explicit QBlendState(Qt3DCore::QNode *parent = 0); ~QBlendState(); Blending srcRGB() const; @@ -102,8 +102,8 @@ Q_SIGNALS: void dstAlphaChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + QBlendState(QRenderState::Type type, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QBlendState) @@ -114,7 +114,7 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: - explicit QBlendStateSeparate(Qt3D::QNode *parent = 0); + explicit QBlendStateSeparate(Qt3DCore::QNode *parent = 0); }; } // namespace Qt3DRender diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index d3f2fadb3..eb327c0e4 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -53,21 +53,21 @@ public: }; /*! - \class Qt3D::QClipPlane + \class Qt3DCore::QClipPlane \inmodule Qt3DRenderer \since 5.5 \brief Enables an additional OpenGL clipping plane that can be in shaders using gl_ClipDistance By default, OpenGL supports up to 8 additional clipping planes. - Qt3D::QClipPlane allows to enable one of these additional planes. These + Qt3DCore::QClipPlane allows to enable one of these additional planes. These planes can then be manipulated in the shaders using gl_ClipDistance[i] where i varies between 0 and 8. */ /*! \qmltype ClipPlane - \instantiates Qt3D::QClipPlane + \instantiates Qt3DCore::QClipPlane \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 7afa6c5e7..40ebfd9a5 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -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(Qt3D::QNode *parent = 0); + explicit QClipPlane(Qt3DCore::QNode *parent = 0); ~QClipPlane(); int plane() const; void setPlane(int); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; Q_SIGNALS: void planeChanged(); diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index 9f61825ea..e52a5d067 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -61,7 +61,7 @@ public: }; /*! - \class Qt3D::QColorMask + \class Qt3DCore::QColorMask \inmodule Qt3DRenderer \brief Allows specifying which color components should be written to the @@ -75,7 +75,7 @@ public: /*! - Constructs a new Qt3D::QColorMask instance with \a parent as parent. + Constructs a new Qt3DCore::QColorMask instance with \a parent as parent. */ QColorMask::QColorMask(QNode *parent) : QRenderState(*new QColorMaskPrivate, parent) @@ -112,7 +112,7 @@ bool QColorMask::isAlpha() const } /*! - \property Qt3D::QColorMask::red + \property Qt3DCore::QColorMask::red Holds whether the red color component should be written to the frame buffer. */ void QColorMask::setRed(bool red) @@ -125,7 +125,7 @@ void QColorMask::setRed(bool red) } /*! - \property Qt3D::QColorMask::green + \property Qt3DCore::QColorMask::green Holds whether the green color component should be written to the frame buffer. */ void QColorMask::setGreen(bool green) @@ -138,7 +138,7 @@ void QColorMask::setGreen(bool green) } /*! - \property Qt3D::QColorMask::blue + \property Qt3DCore::QColorMask::blue Holds whether the blue color component should be written to the frame buffer. */ void QColorMask::setBlue(bool blue) @@ -151,7 +151,7 @@ void QColorMask::setBlue(bool blue) } /*! - \property Qt3D::QColorMask::alpha + \property Qt3DCore::QColorMask::alpha Holds whether the alpha component should be written to the frame buffer. */ void QColorMask::setAlpha(bool alpha) diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index 886feebbb..fcbfac88b 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState Q_PROPERTY(bool alpha READ isAlpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QColorMask(Qt3D::QNode *parent = Q_NULLPTR); + explicit QColorMask(Qt3DCore::QNode *parent = Q_NULLPTR); ~QColorMask(); bool isRed() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void alphaChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QColorMask) diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index d8832bcd6..d6329d205 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(CullingMode) - explicit QCullFace(Qt3D::QNode *parent = 0); + explicit QCullFace(Qt3DCore::QNode *parent = 0); ~QCullFace(); CullingMode mode() const; @@ -72,7 +72,7 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QCullFace) diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h index fdd02b4d3..8d0ea920a 100644 --- a/src/render/renderstates/qdepthmask.h +++ b/src/render/renderstates/qdepthmask.h @@ -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(Qt3D::QNode *parent = 0); + explicit QDepthMask(Qt3DCore::QNode *parent = 0); ~QDepthMask(); bool mask() const; @@ -61,7 +61,7 @@ Q_SIGNALS: void maskChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthMask) diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index e9b4275b6..bedec55e3 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -64,7 +64,7 @@ public: }; Q_ENUM(DepthFunc) - explicit QDepthTest(Qt3D::QNode *parent = 0); + explicit QDepthTest(Qt3DCore::QNode *parent = 0); ~QDepthTest(); DepthFunc func() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void funcChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthTest) diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 37794e372..6fcf83786 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: - explicit QDithering(Qt3D::QNode *parent = 0); + explicit QDithering(Qt3DCore::QNode *parent = 0); ~QDithering(); private: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 0a2c8cac9..95fe3f0c5 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -59,7 +59,7 @@ public: }; Q_ENUM(FaceDir) - explicit QFrontFace(Qt3D::QNode *parent = 0); + explicit QFrontFace(Qt3DCore::QNode *parent = 0); ~QFrontFace(); FaceDir direction() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void directionChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrontFace) diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index 9aff94a1f..dde7dca43 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -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(Qt3D::QNode *parent = Q_NULLPTR); + explicit QPolygonOffset(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPolygonOffset(); float factor() const; @@ -66,7 +66,7 @@ Q_SIGNALS: void unitsChanged(float newUnits); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QPolygonOffset) diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index 831962ca4..821ec7e9e 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::QRenderStatePrivate + \class Qt3DCore::QRenderStatePrivate \internal */ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type) @@ -54,7 +54,7 @@ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type) QRenderState::~QRenderState() { - 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"); + Q_ASSERT_X(Qt3DCore::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 diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 6f730a432..790c89e83 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT @@ -78,7 +78,7 @@ public: Type type() const; protected: - QRenderState(QRenderStatePrivate &dd, Qt3D::QNode *parent = Q_NULLPTR); + QRenderState(QRenderStatePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QRenderState) diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index 261629e8b..ed22d5d92 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QRenderStatePrivate : public Qt3D::QNodePrivate +class QRenderStatePrivate : public Qt3DCore::QNodePrivate { public: QRenderStatePrivate(QRenderState::Type type); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index a607bcd72..2e09fff64 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) public: - explicit QScissorTest(Qt3D::QNode *parent = 0); + explicit QScissorTest(Qt3DCore::QNode *parent = 0); ~QScissorTest(); int left() const; @@ -77,7 +77,7 @@ Q_SIGNALS: void heightChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QScissorTest) diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index 6e11cff68..b4414e148 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -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(Qt3D::QNode *parent = 0); + explicit QStencilMask(Qt3DCore::QNode *parent = 0); ~QStencilMask(); void setFrontMask(uint mask); @@ -64,7 +64,7 @@ Q_SIGNALS: void backMaskChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilMask) diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h index bc212af48..881ea1354 100644 --- a/src/render/renderstates/qstencilop.h +++ b/src/render/renderstates/qstencilop.h @@ -53,14 +53,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT) public: - explicit QStencilOp(Qt3D::QNode *parent = 0); + explicit QStencilOp(Qt3DCore::QNode *parent = 0); ~QStencilOp(); QStencilOpSeparate *front() const; QStencilOpSeparate *back() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilOp) diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index 51469f69c..2c538d186 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -54,14 +54,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT) public: - explicit QStencilTest(Qt3D::QNode *parent = 0); + explicit QStencilTest(Qt3DCore::QNode *parent = 0); ~QStencilTest(); QStencilTestSeparate *front() const; QStencilTestSeparate *back() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStencilTest) |