diff options
Diffstat (limited to 'src/render/materialsystem')
43 files changed, 170 insertions, 170 deletions
diff --git a/src/render/materialsystem/annotation.cpp b/src/render/materialsystem/annotation.cpp index 2d725316a..ed0c6cea2 100644 --- a/src/render/materialsystem/annotation.cpp +++ b/src/render/materialsystem/annotation.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -58,7 +58,7 @@ void Annotation::cleanup() { } -void Annotation::updateFromPeer(Qt3D::QNode *peer) +void Annotation::updateFromPeer(Qt3DCore::QNode *peer) { QAnnotation *criterion = static_cast<QAnnotation *>(peer); @@ -76,7 +76,7 @@ QString Annotation::criterionName() const return m_name; } -void Annotation::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Annotation::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("value")) diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h index b864d02d5..564fe1671 100644 --- a/src/render/materialsystem/annotation_p.h +++ b/src/render/materialsystem/annotation_p.h @@ -61,17 +61,17 @@ namespace Render { class CriterionManager; -class Annotation : public Qt3D::QBackendNode +class Annotation : public Qt3DCore::QBackendNode { public: Annotation(); ~Annotation(); void cleanup(); - void updateFromPeer(Qt3D::QNode *criterion) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *criterion) Q_DECL_OVERRIDE; QVariant criterionValue() const; QString criterionName() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool operator ==(const Annotation &other); bool operator !=(const Annotation &other); diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 37b73ffa6..bf0e64a58 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -64,7 +64,7 @@ void Effect::cleanup() { } -void Effect::updateFromPeer(Qt3D::QNode *peer) +void Effect::updateFromPeer(Qt3DCore::QNode *peer) { QEffect *effect = static_cast<QEffect *>(peer); @@ -78,7 +78,7 @@ void Effect::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QVariant propertyValue = propertyChange->value(); @@ -103,18 +103,18 @@ void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -void Effect::appendRenderTechnique(const Qt3D::QNodeId &technique) +void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique) { if (!m_techniques.contains(technique)) m_techniques.append(technique); } -QList<Qt3D::QNodeId> Effect::techniques() const +QList<Qt3DCore::QNodeId> Effect::techniques() const { return m_techniques; } -QList<Qt3D::QNodeId> Effect::parameters() const +QList<Qt3DCore::QNodeId> Effect::parameters() const { return m_parameterPack.parameters(); } diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h index 841f2996a..0d307d0c5 100644 --- a/src/render/materialsystem/effect_p.h +++ b/src/render/materialsystem/effect_p.h @@ -62,22 +62,22 @@ class QTechnique; namespace Render { -class Effect : public Qt3D::QBackendNode +class Effect : public Qt3DCore::QBackendNode { public: Effect(); ~Effect(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderTechnique(const Qt3D::QNodeId &t); + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void appendRenderTechnique(const Qt3DCore::QNodeId &t); - QList<Qt3D::QNodeId> techniques() const; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> techniques() const; + QList<Qt3DCore::QNodeId> parameters() const; private: - QList<Qt3D::QNodeId> m_techniques; + QList<Qt3DCore::QNodeId> m_techniques; ParameterPack m_parameterPack; }; diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index c096c1a98..faf934d3e 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <QOpenGLShaderProgram> -using namespace Qt3D; +using namespace Qt3DCore; QT_BEGIN_NAMESPACE @@ -69,7 +69,7 @@ void Material::cleanup() m_parameterPack.clear(); } -void Material::updateFromPeer(Qt3D::QNode *node) +void Material::updateFromPeer(Qt3DCore::QNode *node) { QMaterial *mat = static_cast<QMaterial *>(node); m_parameterPack.clear(); @@ -80,7 +80,7 @@ void Material::updateFromPeer(Qt3D::QNode *node) m_parameterPack.appendParameter(p->id()); } -void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -111,12 +111,12 @@ void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QList<Qt3D::QNodeId> Material::parameters() const +QList<Qt3DCore::QNodeId> Material::parameters() const { return m_parameterPack.parameters(); } -Qt3D::QNodeId Material::effect() const +Qt3DCore::QNodeId Material::effect() const { return m_effectUuid; } diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h index 06cd4f285..f45912ab6 100644 --- a/src/render/materialsystem/material_p.h +++ b/src/render/materialsystem/material_p.h @@ -69,23 +69,23 @@ class Technique; class Effect; class MaterialManager; -class Q_AUTOTEST_EXPORT Material : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Material : public Qt3DCore::QBackendNode { public: Material(); ~Material(); void cleanup(); - void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } - QList<Qt3D::QNodeId> parameters() const; - Qt3D::QNodeId effect() const; + QList<Qt3DCore::QNodeId> parameters() const; + Qt3DCore::QNodeId effect() const; private: ParameterPack m_parameterPack; - Qt3D::QNodeId m_effectUuid; + Qt3DCore::QNodeId m_effectUuid; bool m_enabled; }; diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index afc44ed58..34eb395f7 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,14 +56,14 @@ Parameter::Parameter() { } -void Parameter::updateFromPeer(Qt3D::QNode *mat) +void Parameter::updateFromPeer(Qt3DCore::QNode *mat) { QParameter *param = static_cast<QParameter *>(mat); m_name = param->name(); m_value = toBackendValue(param->value()); } -void Parameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h index f8728c04b..a40af65ee 100644 --- a/src/render/materialsystem/parameter_p.h +++ b/src/render/materialsystem/parameter_p.h @@ -61,13 +61,13 @@ class ParameterManager; class ShaderDataManager; class TextureManager; -class Parameter : public Qt3D::QBackendNode +class Parameter : public Qt3DCore::QBackendNode { public: Parameter(); - void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QString name() const; QVariant value() const; diff --git a/src/render/materialsystem/parametermapping.cpp b/src/render/materialsystem/parametermapping.cpp index a05d11b66..bc6ea8baf 100644 --- a/src/render/materialsystem/parametermapping.cpp +++ b/src/render/materialsystem/parametermapping.cpp @@ -47,7 +47,7 @@ ParameterMapping::ParameterMapping() } ParameterMapping::ParameterMapping(QParameterMapping *mapping) - : m_id(mapping ? mapping->id() : Qt3D::QNodeId()) + : m_id(mapping ? mapping->id() : Qt3DCore::QNodeId()) , m_parameterName(mapping ? mapping->parameterName() : QString()) , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString()) , m_bindingType(mapping ? mapping->bindingType() : QParameterMapping::Uniform) @@ -59,7 +59,7 @@ bool ParameterMapping::isValid() const return !m_id.isNull(); } -Qt3D::QNodeId ParameterMapping::id() const +Qt3DCore::QNodeId ParameterMapping::id() const { return m_id; } diff --git a/src/render/materialsystem/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h index 21e9fb7ec..7c5df3c31 100644 --- a/src/render/materialsystem/parametermapping_p.h +++ b/src/render/materialsystem/parametermapping_p.h @@ -64,13 +64,13 @@ public: bool isValid() const; - Qt3D::QNodeId id() const; + Qt3DCore::QNodeId id() const; QString parameterName() const; QString shaderVariableName() const; QParameterMapping::Binding bindingType() const; private: - Qt3D::QNodeId m_id; + Qt3DCore::QNodeId m_id; QString m_parameterName; QString m_shaderVariableName; QParameterMapping::Binding m_bindingType; diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h index 158ebdc77..e36bfe46e 100644 --- a/src/render/materialsystem/qannotation.h +++ b/src/render/materialsystem/qannotation.h @@ -47,13 +47,13 @@ namespace Qt3DRender { class QAnnotationPrivate; -class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3DCore::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(Qt3D::QNode *parent = 0); + explicit QAnnotation(Qt3DCore::QNode *parent = 0); ~QAnnotation(); void setValue(const QVariant &value); @@ -67,7 +67,7 @@ Q_SIGNALS: void valueChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAnnotation) diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qannotation_p.h index 0763e59a4..f37004b0c 100644 --- a/src/render/materialsystem/qannotation_p.h +++ b/src/render/materialsystem/qannotation_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotationPrivate : public Qt3D::QNodePrivate +class QAnnotationPrivate : public Qt3DCore::QNodePrivate { public: QAnnotationPrivate(); diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index 443571872..d50e71f82 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 164a6392a..be1d4a21b 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -49,11 +49,11 @@ class QTechnique; class QEffectPrivate; class QT3DRENDERERSHARED_EXPORT QEffect - : public Qt3D::QNode + : public Qt3DCore::QNode { Q_OBJECT public: - explicit QEffect(Qt3D::QNode *parent = 0); + explicit QEffect(Qt3DCore::QNode *parent = 0); ~QEffect(); void addParameter(QParameter *parameter); @@ -65,8 +65,8 @@ public: QList<QTechnique *> techniques() const; protected: - QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QEffect) diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h index abb81994c..844016022 100644 --- a/src/render/materialsystem/qeffect_p.h +++ b/src/render/materialsystem/qeffect_p.h @@ -59,7 +59,7 @@ class QEffect; class QParameter; class QTechnique; -class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate { public : QEffectPrivate(); diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index b3c833556..c220b1841 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -57,12 +57,12 @@ * sound should reflect off an element, the temperature of a surface, * and so on. * - * \sa QEffect, QMesh, {Qt3D::}{QComponent} + * \sa QEffect, QMesh, {Qt3DCore::}{QComponent} */ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index ca44901c1..cfc3c0d99 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -52,13 +52,13 @@ class QMaterialPrivate; class QEffect; typedef QMap<QString, QAbstractTextureProvider*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3D::QNode *parent = 0); + explicit QMaterial(Qt3DCore::QNode *parent = 0); ~QMaterial(); void setEffect(QEffect *effect); @@ -76,8 +76,8 @@ Q_SIGNALS: void effectChanged(); protected: - QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMaterial) diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index 9be59c488..c84aeb6c1 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QParameter; class QEffect; -class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate { public: QMaterialPrivate(); diff --git a/src/render/materialsystem/qopenglfilter.cpp b/src/render/materialsystem/qopenglfilter.cpp index 3bc20a84d..fa9437e4a 100644 --- a/src/render/materialsystem/qopenglfilter.cpp +++ b/src/render/materialsystem/qopenglfilter.cpp @@ -280,7 +280,7 @@ void QOpenGLFilter::setVendor(const QString &vendor) } } -/*! \fn bool Qt3D::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) +/*! \fn bool Qt3DCore::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are equivalent. */ @@ -302,7 +302,7 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) return false; } -/*! \fn bool Qt3D::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) +/*! \fn bool Qt3DCore::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are different. */ diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index 96d1205df..fd14603a8 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 03883f5f1..b0a9c9b2e 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -48,17 +48,17 @@ namespace Qt3DRender { class QParameterPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::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(Qt3D::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = 0); ~QParameter(); - QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0); + QParameter(const QString& name, const QVariant& value, Qt3DCore::QNode* parent = 0); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0); void setName(const QString &name); QString name() const; @@ -75,8 +75,8 @@ Q_SIGNALS: void nameChanged(); protected: - QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameter) diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h index 40143edc8..01bdf63c2 100644 --- a/src/render/materialsystem/qparameter_p.h +++ b/src/render/materialsystem/qparameter_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QParameter; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate { public: QParameterPrivate(); diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h index f4e209abd..e104f4001 100644 --- a/src/render/materialsystem/qparametermapping.h +++ b/src/render/materialsystem/qparametermapping.h @@ -46,7 +46,7 @@ namespace Qt3DRender { class QParameterMappingPrivate; -class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged) @@ -62,8 +62,8 @@ public: }; Q_ENUM(Binding) - explicit QParameterMapping(Qt3D::QNode *parent = 0); - QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0); + explicit QParameterMapping(Qt3DCore::QNode *parent = 0); + QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = 0); ~QParameterMapping(); void setParameterName(const QString &name); @@ -80,8 +80,8 @@ Q_SIGNALS: void bindingTypeChanged(); protected: - QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameterMapping) diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h index 9539ba0fc..940f3983e 100644 --- a/src/render/materialsystem/qparametermapping_p.h +++ b/src/render/materialsystem/qparametermapping_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QParameterMappingPrivate : public Qt3D::QNodePrivate +class QParameterMappingPrivate : public Qt3DCore::QNodePrivate { public: QParameterMappingPrivate(); diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index efb315177..13cee24d0 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -221,11 +221,11 @@ QList<QParameterMapping *> QRenderPass::bindings() const } /*! - * Adds a Qt3D::QRenderState \a state to the rendering pass. That implies that + * Adds a Qt3DCore::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 Qt3DRender::QRenderPass. * - * \note not defining any Qt3D::QRenderState in a pass will result in the pass using + * \note not defining any Qt3DCore::QRenderState in a pass will result in the pass using * the globally set render state for a given FrameGraph branch execution path. */ void QRenderPass::addRenderState(QRenderState *state) @@ -263,7 +263,7 @@ void QRenderPass::removeRenderState(QRenderState *state) } /*! - * Returns the list of Qt3D::QRenderState state objects making up the render + * Returns the list of Qt3DCore::QRenderState state objects making up the render * state of the Qt3DRender::QRenderPass. */ QList<QRenderState *> QRenderPass::renderStates() const diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index ed733ba12..b7018e7a1 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -58,13 +58,13 @@ typedef QList<QParameter*> ParameterList; class QRenderPassPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) public: - explicit QRenderPass(Qt3D::QNode *parent = 0); + explicit QRenderPass(Qt3DCore::QNode *parent = 0); ~QRenderPass(); QString glslNameForParameter(QString paramName) const; @@ -95,8 +95,8 @@ Q_SIGNALS: void shaderProgramChanged(); protected: - QRenderPass(QRenderPassPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPass) diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h index 9be787a62..b587b7708 100644 --- a/src/render/materialsystem/qrenderpass_p.h +++ b/src/render/materialsystem/qrenderpass_p.h @@ -68,7 +68,7 @@ namespace Render class RenderStateSet; } -class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate { public: QRenderPassPrivate(); diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 4353581af..35f195f88 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -55,11 +55,11 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QShaderData(Qt3D::QNode *parent = 0); + explicit QShaderData(Qt3DCore::QNode *parent = 0); ~QShaderData(); enum TransformType { @@ -71,8 +71,8 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h index bb7c677d1..8a0c78e05 100644 --- a/src/render/materialsystem/qshaderdata_p.h +++ b/src/render/materialsystem/qshaderdata_p.h @@ -83,7 +83,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface } }; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate { public: QShaderDataPrivate(); diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 6c44ee0ce..e92a77d90 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -230,7 +230,7 @@ QByteArray QShaderProgram::shaderCode(ShaderType type) const QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl) { // TO DO: Handle remote path - QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(sourceUrl); + QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(sourceUrl); QFile f(filePath); if (!f.exists()) diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index 6695316ee..c229ad704 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -46,7 +46,7 @@ namespace Qt3DRender { class QShaderProgramPrivate; -class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged) @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) public: - explicit QShaderProgram(Qt3D::QNode *parent = 0); + explicit QShaderProgram(Qt3DCore::QNode *parent = 0); ~QShaderProgram(); enum ShaderType { @@ -103,8 +103,8 @@ Q_SIGNALS: void computeShaderCodeChanged(); protected: - QShaderProgram(QShaderProgramPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QShaderProgram) diff --git a/src/render/materialsystem/qshaderprogram_p.h b/src/render/materialsystem/qshaderprogram_p.h index 00936f0f2..078091b35 100644 --- a/src/render/materialsystem/qshaderprogram_p.h +++ b/src/render/materialsystem/qshaderprogram_p.h @@ -56,7 +56,7 @@ namespace Qt3DRender { class QShaderProgram; -class QShaderProgramPrivate : public Qt3D::QNodePrivate +class QShaderProgramPrivate : public Qt3DCore::QNodePrivate { public: QShaderProgramPrivate(); diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 52578e267..e80811603 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index d45892991..4a8863d73 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -52,13 +52,13 @@ class QParameter; class QTechniquePrivate; class QOpenGLFilter; -class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter) public: - explicit QTechnique(Qt3D::QNode *parent = 0); + explicit QTechnique(Qt3DCore::QNode *parent = 0); ~QTechnique(); void addAnnotation(QAnnotation *criterion); @@ -76,8 +76,8 @@ public: QOpenGLFilter *openGLFilter(); protected: - QTechnique(QTechniquePrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechnique) diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h index 794ce76df..669a75a56 100644 --- a/src/render/materialsystem/qtechnique_p.h +++ b/src/render/materialsystem/qtechnique_p.h @@ -61,7 +61,7 @@ class QAnnotation; class QParameter; class QRenderPass; -class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate { public: QTechniquePrivate(); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index b64b8682d..cdbf92126 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -68,7 +68,7 @@ void RenderPass::cleanup() { } -void RenderPass::updateFromPeer(Qt3D::QNode *peer) +void RenderPass::updateFromPeer(Qt3DCore::QNode *peer) { QRenderPass *pass = static_cast<QRenderPass *>(peer); @@ -88,7 +88,7 @@ void RenderPass::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -130,7 +130,7 @@ void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -Qt3D::QNodeId RenderPass::shaderProgram() const +Qt3DCore::QNodeId RenderPass::shaderProgram() const { return m_shaderUuid; } @@ -140,7 +140,7 @@ QList<ParameterMapping> RenderPass::bindings() const return m_bindings.values(); } -QList<Qt3D::QNodeId> RenderPass::annotations() const +QList<Qt3DCore::QNodeId> RenderPass::annotations() const { return m_annotationList; } @@ -150,18 +150,18 @@ QList<RenderState *> RenderPass::renderStates() const return m_renderStates.values(); } -QList<Qt3D::QNodeId> RenderPass::parameters() const +QList<Qt3DCore::QNodeId> RenderPass::parameters() const { return m_parameterPack.parameters(); } -void RenderPass::appendAnnotation(const Qt3D::QNodeId &annotationId) +void RenderPass::appendAnnotation(const Qt3DCore::QNodeId &annotationId) { if (!m_annotationList.contains(annotationId)) m_annotationList.append(annotationId); } -void RenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId) +void RenderPass::removeAnnotation(const Qt3DCore::QNodeId &annotationId) { m_annotationList.removeOne(annotationId); } @@ -172,18 +172,18 @@ void RenderPass::appendBinding(const ParameterMapping &binding) m_bindings[binding.id()] = binding; } -void RenderPass::removeBinding(const Qt3D::QNodeId &bindingId) +void RenderPass::removeBinding(const Qt3DCore::QNodeId &bindingId) { m_bindings.remove(bindingId); } -void RenderPass::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) +void RenderPass::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void RenderPass::removeRenderState(const Qt3D::QNodeId &renderStateId) +void RenderPass::removeRenderState(const Qt3DCore::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h index 70f3fdf25..2d5a2a6d8 100644 --- a/src/render/materialsystem/renderpass_p.h +++ b/src/render/materialsystem/renderpass_p.h @@ -71,7 +71,7 @@ namespace Render { class RenderPassManager; class RenderState; -class Q_AUTOTEST_EXPORT RenderPass : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT RenderPass : public Qt3DCore::QBackendNode { public: RenderPass(); @@ -79,29 +79,29 @@ public: void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - Qt3D::QNodeId shaderProgram() const; + Qt3DCore::QNodeId shaderProgram() const; QList<ParameterMapping> bindings() const; - QList<Qt3D::QNodeId> annotations() const; + QList<Qt3DCore::QNodeId> annotations() const; QList<RenderState *> renderStates() const; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> parameters() const; private: - void appendAnnotation(const Qt3D::QNodeId &criterionId); - void removeAnnotation(const Qt3D::QNodeId &criterionId); + void appendAnnotation(const Qt3DCore::QNodeId &criterionId); + void removeAnnotation(const Qt3DCore::QNodeId &criterionId); void appendBinding(const ParameterMapping &binding); - void removeBinding(const Qt3D::QNodeId &bindingId); + void removeBinding(const Qt3DCore::QNodeId &bindingId); - void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); - void removeRenderState(const Qt3D::QNodeId &renderStateId); + void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3DCore::QNodeId &renderStateId); - Qt3D::QNodeId m_shaderUuid; - QHash<Qt3D::QNodeId, ParameterMapping> m_bindings; - QHash<Qt3D::QNodeId, RenderState *> m_renderStates; - QList<Qt3D::QNodeId> m_annotationList; + Qt3DCore::QNodeId m_shaderUuid; + QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings; + QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates; + QList<Qt3DCore::QNodeId> m_annotationList; ParameterPack m_parameterPack; }; diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 1a600bfbe..f52d01543 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -85,7 +85,7 @@ void Shader::cleanup() m_uniformBlocks.clear(); } -void Shader::updateFromPeer(Qt3D::QNode *peer) +void Shader::updateFromPeer(Qt3DCore::QNode *peer) { QShaderProgram *shader = static_cast<QShaderProgram *>(peer); @@ -122,7 +122,7 @@ QVector<QByteArray> Shader::shaderCode() const return m_shaderCode; } -void Shader::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index fccef6ccd..3dd9570ac 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -69,7 +69,7 @@ class AttachmentPack; typedef uint ProgramDNA; -class Q_AUTOTEST_EXPORT Shader : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Shader : public Qt3DCore::QBackendNode { public: Shader(); @@ -77,7 +77,7 @@ public: void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void updateUniforms(GraphicsContext *ctx, const QUniformPack &pack); void setFragOutputs(const QHash<QString, int> &fragOutputs); @@ -86,7 +86,7 @@ public: QVector<QString> uniformBlockNames() const; QVector<QByteArray> shaderCode() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool isLoaded() const; ProgramDNA dna() const; diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 743ea1c60..6338df96b 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { -QList<Qt3D::QNodeId> ShaderData::m_updatedShaderData; +QList<Qt3DCore::QNodeId> ShaderData::m_updatedShaderData; ShaderData::ShaderData() : QBackendNode() @@ -66,7 +66,7 @@ ShaderData::~ShaderData() delete m_mutex; } -void ShaderData::updateFromPeer(Qt3D::QNode *peer) +void ShaderData::updateFromPeer(Qt3DCore::QNode *peer) { m_properties.clear(); const QShaderData *shaderData = static_cast<const QShaderData *>(peer); @@ -190,7 +190,7 @@ void ShaderData::addToClearUpdateList() ShaderData::m_updatedShaderData.append(peerUuid()); } -const int qNodeIdTypeId = qMetaTypeId<Qt3D::QNodeId>(); +const int qNodeIdTypeId = qMetaTypeId<Qt3DCore::QNodeId>(); void ShaderData::readPeerProperties(QShaderData *shaderData) { @@ -240,7 +240,7 @@ void ShaderData::setManager(ShaderDataManager *manager) m_manager = manager; } -void ShaderData::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (!m_propertyReader.isNull()) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -290,7 +290,7 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(ShaderDataManager *manager) { } -Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { ShaderData *backend = m_manager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -299,12 +299,12 @@ Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const return backend; } -Qt3D::QBackendNode *RenderShaderDataFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(const Qt3DCore::QNodeId &id) const { return m_manager->lookupResource(id); } -void RenderShaderDataFunctor::destroy(const Qt3D::QNodeId &id) const +void RenderShaderDataFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_manager->releaseResource(id); } diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index ebc6cec4b..c87196776 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -64,18 +64,18 @@ class GraphicsContext; class UniformBuffer; class ShaderDataManager; -class Q_AUTOTEST_EXPORT ShaderData : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT ShaderData : public Qt3DCore::QBackendNode { public: ShaderData(); ~ShaderData(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; inline QHash<QString, QVariant> properties() const { return m_properties; } inline QHash<QString, QVariant> updatedProperties() const { return m_updatedProperties; } // Called by cleanup job - inline static QList<Qt3D::QNodeId> updatedShaderDataList() { return m_updatedShaderData; } + inline static QList<Qt3DCore::QNodeId> updatedShaderDataList() { return m_updatedShaderData; } inline static void clearShaderDataList() { return m_updatedShaderData.clear(); } void clearUpdate(); @@ -86,7 +86,7 @@ public: void updateTransformedProperties(const QMatrix4x4 &nodeWordlTransform); protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: // 1 to 1 match with frontend properties, modified only by sceneChangeEvent @@ -102,7 +102,7 @@ private: QHash<QString, QShaderData::TransformType> m_transformedProperties; ShaderDataManager *m_manager; QMutex *m_mutex; - static QList<Qt3D::QNodeId> m_updatedShaderData; + static QList<Qt3DCore::QNodeId> m_updatedShaderData; QMatrix4x4 m_worldMatrix; QMatrix4x4 m_viewMatrix; @@ -112,14 +112,14 @@ private: friend class RenderShaderDataFunctor; }; -class RenderShaderDataFunctor : public Qt3D::QBackendNodeFunctor +class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit RenderShaderDataFunctor(ShaderDataManager *manager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; private: ShaderDataManager *m_manager; diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index a3315f30e..ac2e4554c 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -72,7 +72,7 @@ void Technique::cleanup() { } -void Technique::updateFromPeer(Qt3D::QNode *peer) +void Technique::updateFromPeer(Qt3DCore::QNode *peer) { m_parameterPack.clear(); m_renderPasses.clear(); @@ -94,7 +94,7 @@ void Technique::updateFromPeer(Qt3D::QNode *peer) } } -void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -141,28 +141,28 @@ void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QList<Qt3D::QNodeId> Technique::parameters() const +QList<Qt3DCore::QNodeId> Technique::parameters() const { return m_parameterPack.parameters(); } -void Technique::appendRenderPass(const Qt3D::QNodeId &renderPassId) +void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId) { if (!m_renderPasses.contains(renderPassId)) m_renderPasses.append(renderPassId); } -void Technique::removeRenderPass(const Qt3D::QNodeId &renderPassId) +void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId) { m_renderPasses.removeOne(renderPassId); } -QList<Qt3D::QNodeId> Technique::annotations() const +QList<Qt3DCore::QNodeId> Technique::annotations() const { return m_annotationList; } -QList<Qt3D::QNodeId> Technique::renderPasses() const +QList<Qt3DCore::QNodeId> Technique::renderPasses() const { return m_renderPasses; } @@ -172,13 +172,13 @@ QOpenGLFilter *Technique::openGLFilter() const return m_openglFilter; } -void Technique::appendAnnotation(const Qt3D::QNodeId &criterionId) +void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId) { if (!m_annotationList.contains(criterionId)) m_annotationList.append(criterionId); } -void Technique::removeAnnotation(const Qt3D::QNodeId &criterionId) +void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId) { m_annotationList.removeOne(criterionId); } diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index d4c8303ab..77c96d4f0 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -69,34 +69,34 @@ namespace Render { class TechniqueManager; -class Technique : public Qt3D::QBackendNode +class Technique : public Qt3DCore::QBackendNode { public: Technique(); ~Technique(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> parameters() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> parameters() const; - void appendRenderPass(const Qt3D::QNodeId &renderPassId); - void removeRenderPass(const Qt3D::QNodeId &renderPassId); + void appendRenderPass(const Qt3DCore::QNodeId &renderPassId); + void removeRenderPass(const Qt3DCore::QNodeId &renderPassId); - void appendAnnotation(const Qt3D::QNodeId &criterionId); - void removeAnnotation(const Qt3D::QNodeId &criterionId); + void appendAnnotation(const Qt3DCore::QNodeId &criterionId); + void removeAnnotation(const Qt3DCore::QNodeId &criterionId); - QList<Qt3D::QNodeId> annotations() const; - QList<Qt3D::QNodeId> renderPasses() const; + QList<Qt3DCore::QNodeId> annotations() const; + QList<Qt3DCore::QNodeId> renderPasses() const; QOpenGLFilter *openGLFilter() const; private: QOpenGLFilter *m_openglFilter; ParameterPack m_parameterPack; - QList<Qt3D::QNodeId> m_annotationList; - QList<Qt3D::QNodeId> m_renderPasses; + QList<Qt3DCore::QNodeId> m_annotationList; + QList<Qt3DCore::QNodeId> m_renderPasses; }; } // namespace Render |