diff options
37 files changed, 201 insertions, 201 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 9e1f886a7..6b6317859 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -57,7 +57,7 @@ #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qcameraselector.h> #include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/parameter.h> +#include <Qt3DRenderer/qparameter.h> #include <Qt3DRenderer/renderpasscriterion.h> #include <Qt3DRenderer/parametermapper.h> #include <Qt3DRenderer/qspheremesh.h> @@ -92,7 +92,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3D::TechniqueCriterion>(uri, 2, 0, "TechniqueCriterion"); qmlRegisterType<Qt3D::RenderPassCriterion>(uri, 2, 0, "RenderPassCriterion"); qmlRegisterType<Qt3D::Tag>(uri, 2, 0, "Tag"); - qmlRegisterType<Qt3D::Parameter>(uri, 2, 0, "Parameter"); + qmlRegisterType<Qt3D::QParameter>(uri, 2, 0, "Parameter"); qmlRegisterType<Qt3D::ParameterMapper>(uri, 2, 0, "ParameterMapper"); qmlRegisterExtendedType<Qt3D::QMaterial, Qt3D::Render::Quick::Quick3DMaterial>(uri, 2, 0, "Material"); qmlRegisterExtendedType<Qt3D::QRenderPass, Qt3D::Render::Quick::Quick3DRenderPass>(uri, 2, 0, "RenderPass"); diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drenderer/items/quick3deffect.cpp index b70db17a0..5c67da2db 100644 --- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp +++ b/src/quick3d/quick3drenderer/items/quick3deffect.cpp @@ -64,9 +64,9 @@ QQmlListProperty<QTechnique> Quick3DEffect::techniqueList() &Quick3DEffect::clearTechniqueList); } -QQmlListProperty<Parameter> Quick3DEffect::parameterList() +QQmlListProperty<QParameter> Quick3DEffect::parameterList() { - return QQmlListProperty<Qt3D::Parameter>(this, 0, + return QQmlListProperty<Qt3D::QParameter>(this, 0, &Quick3DEffect::appendParameter, &Quick3DEffect::parametersCount, &Quick3DEffect::parameterAt, @@ -108,28 +108,28 @@ void Quick3DEffect::clearTechniqueList(QQmlListProperty<QTechnique> *list) } } -void Quick3DEffect::appendParameter(QQmlListProperty<Parameter> *list, Parameter *param) +void Quick3DEffect::appendParameter(QQmlListProperty<QParameter> *list, QParameter *param) { Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object); qobject_cast<QEffect *>(effect->parentEffect())->addParameter(param); } -Parameter *Quick3DEffect::parameterAt(QQmlListProperty<Parameter> *list, int index) +QParameter *Quick3DEffect::parameterAt(QQmlListProperty<QParameter> *list, int index) { Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object); return qobject_cast<QEffect *>(effect->parentEffect())->parameters().at(index); } -int Quick3DEffect::parametersCount(QQmlListProperty<Parameter> *list) +int Quick3DEffect::parametersCount(QQmlListProperty<QParameter> *list) { Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object); return qobject_cast<QEffect *>(effect->parentEffect())->parameters().count(); } -void Quick3DEffect::clearParameterList(QQmlListProperty<Parameter> *list) +void Quick3DEffect::clearParameterList(QQmlListProperty<QParameter> *list) { Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object); - Q_FOREACH (Parameter *p, qobject_cast<QEffect *>(effect->parentEffect())->parameters()) + Q_FOREACH (QParameter *p, qobject_cast<QEffect *>(effect->parentEffect())->parameters()) qobject_cast<QEffect *>(effect->parentEffect())->removeParameter(p); } diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.h b/src/quick3d/quick3drenderer/items/quick3deffect.h index d0df32567..e61b8efd1 100644 --- a/src/quick3d/quick3drenderer/items/quick3deffect.h +++ b/src/quick3d/quick3drenderer/items/quick3deffect.h @@ -60,7 +60,7 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DEffect : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3D::QTechnique> techniques READ techniqueList) - Q_PROPERTY(QQmlListProperty<Qt3D::Parameter> parameters READ parameterList) + Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList) public: explicit Quick3DEffect(QObject *parent = 0); @@ -68,7 +68,7 @@ public: inline QAbstractEffect *parentEffect() const { return qobject_cast<QAbstractEffect*>(parent()); } QQmlListProperty<Qt3D::QTechnique> techniqueList(); - QQmlListProperty<Qt3D::Parameter> parameterList(); + QQmlListProperty<Qt3D::QParameter> parameterList(); private: static void appendTechnique(QQmlListProperty<QTechnique> *list, QTechnique *bar); @@ -76,10 +76,10 @@ private: static int techniqueCount(QQmlListProperty<QTechnique> *list); static void clearTechniqueList(QQmlListProperty<QTechnique> *list); - static void appendParameter(QQmlListProperty<Parameter> *list, Parameter *param); - static Parameter *parameterAt(QQmlListProperty<Parameter> *list, int index); - static int parametersCount(QQmlListProperty<Parameter> *list); - static void clearParameterList(QQmlListProperty<Parameter> *list); + static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param); + static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index); + static int parametersCount(QQmlListProperty<QParameter> *list); + static void clearParameterList(QQmlListProperty<QParameter> *list); }; } // Quick diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp index 0d340a958..9308efeb7 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp @@ -56,16 +56,16 @@ Quick3DMaterial::Quick3DMaterial(QObject *parent) { } -QQmlListProperty<Parameter> Quick3DMaterial::qmlParameters() +QQmlListProperty<QParameter> Quick3DMaterial::qmlParameters() { - return QQmlListProperty<Parameter>(this, 0, + return QQmlListProperty<QParameter>(this, 0, &Quick3DMaterial::appendParameter, &Quick3DMaterial::parameterCount, &Quick3DMaterial::parameterAt, &Quick3DMaterial::clearParameters); } -void Quick3DMaterial::appendParameter(QQmlListProperty<Parameter> *list, Parameter *param) +void Quick3DMaterial::appendParameter(QQmlListProperty<QParameter> *list, QParameter *param) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) { @@ -74,7 +74,7 @@ void Quick3DMaterial::appendParameter(QQmlListProperty<Parameter> *list, Paramet } } -Parameter *Quick3DMaterial::parameterAt(QQmlListProperty<Parameter> *list, int index) +QParameter *Quick3DMaterial::parameterAt(QQmlListProperty<QParameter> *list, int index) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) @@ -82,7 +82,7 @@ Parameter *Quick3DMaterial::parameterAt(QQmlListProperty<Parameter> *list, int i return 0; } -int Quick3DMaterial::parameterCount(QQmlListProperty<Parameter> *list) +int Quick3DMaterial::parameterCount(QQmlListProperty<QParameter> *list) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) @@ -90,11 +90,11 @@ int Quick3DMaterial::parameterCount(QQmlListProperty<Parameter> *list) return 0; } -void Quick3DMaterial::clearParameters(QQmlListProperty<Parameter> *list) +void Quick3DMaterial::clearParameters(QQmlListProperty<QParameter> *list) { Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object); if (mat) { - Q_FOREACH (Parameter *p, mat->parentMaterial()->parameters()) { + Q_FOREACH (QParameter *p, mat->parentMaterial()->parameters()) { mat->parentMaterial()->removeParameter(p); } } diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.h b/src/quick3d/quick3drenderer/items/quick3dmaterial.h index 04d3e069a..07b9cb325 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.h +++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.h @@ -44,7 +44,7 @@ #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> #include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/parameter.h> +#include <Qt3DRenderer/qparameter.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -61,7 +61,7 @@ namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DMaterial : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::Parameter> parameters READ qmlParameters) + Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ qmlParameters) public: explicit Quick3DMaterial(QObject *parent = 0); @@ -69,15 +69,15 @@ public: // TO DO : replace by QAbstractMaterial later on inline QMaterial *parentMaterial() const { return qobject_cast<QMaterial*>(parent()); } - QQmlListProperty<Parameter> qmlParameters(); + QQmlListProperty<QParameter> qmlParameters(); private: // FIXME - remove when we have a custom QML parser - static void appendParameter(QQmlListProperty<Parameter> *list, Parameter *bar); - static Parameter *parameterAt(QQmlListProperty<Parameter> *list, int index); - static int parameterCount(QQmlListProperty<Parameter> *list); - static void clearParameters(QQmlListProperty<Parameter> *list); + static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *bar); + static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index); + static int parameterCount(QQmlListProperty<QParameter> *list); + static void clearParameters(QQmlListProperty<QParameter> *list); }; } // Quick diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp index 4ec203596..12d60b60d 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp @@ -63,37 +63,37 @@ QQmlListProperty<Qt3D::QRenderPass> Quick3DTechnique::renderPassList() &Quick3DTechnique::clearRenderPasses); } -QQmlListProperty<Parameter> Quick3DTechnique::parameterList() +QQmlListProperty<QParameter> Quick3DTechnique::parameterList() { - return QQmlListProperty<Qt3D::Parameter>(this, 0, + return QQmlListProperty<Qt3D::QParameter>(this, 0, &Quick3DTechnique::appendParameter, &Quick3DTechnique::parametersCount, &Quick3DTechnique::parameterAt, &Quick3DTechnique::clearParameterList); } -void Quick3DTechnique::appendParameter(QQmlListProperty<Parameter> *list, Parameter *param) +void Quick3DTechnique::appendParameter(QQmlListProperty<QParameter> *list, QParameter *param) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); technique->parentTechnique()->addParameter(param); } -Parameter *Quick3DTechnique::parameterAt(QQmlListProperty<Parameter> *list, int index) +QParameter *Quick3DTechnique::parameterAt(QQmlListProperty<QParameter> *list, int index) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); return technique->parentTechnique()->parameters().at(index); } -int Quick3DTechnique::parametersCount(QQmlListProperty<Parameter> *list) +int Quick3DTechnique::parametersCount(QQmlListProperty<QParameter> *list) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); return technique->parentTechnique()->parameters().count(); } -void Quick3DTechnique::clearParameterList(QQmlListProperty<Parameter> *list) +void Quick3DTechnique::clearParameterList(QQmlListProperty<QParameter> *list) { Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object); - Q_FOREACH (Parameter *p, technique->parentTechnique()->parameters()) + Q_FOREACH (QParameter *p, technique->parentTechnique()->parameters()) technique->parentTechnique()->removeParameter(p); } diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drenderer/items/quick3dtechnique.h index 9908e44f8..c887e7b74 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h +++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.h @@ -59,13 +59,13 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public QObject Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3D::TechniqueCriterion> criteria READ criteriaList NOTIFY criteriaChanged) Q_PROPERTY(QQmlListProperty<Qt3D::QRenderPass> renderPasses READ renderPassList NOTIFY renderPassesChanged) - Q_PROPERTY(QQmlListProperty<Qt3D::Parameter> parameters READ parameterList) + Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList) public: explicit Quick3DTechnique(QObject *parent = 0); QQmlListProperty<Qt3D::TechniqueCriterion> criteriaList(); QQmlListProperty<Qt3D::QRenderPass> renderPassList(); - QQmlListProperty<Qt3D::Parameter> parameterList(); + QQmlListProperty<Qt3D::QParameter> parameterList(); // Use QAbstractTechnique when it has been properly defined inline QTechnique *parentTechnique() const { return qobject_cast<QTechnique*>(parent()); } @@ -76,10 +76,10 @@ Q_SIGNALS: private: - static void appendParameter(QQmlListProperty<Parameter> *list, Parameter *param); - static Parameter *parameterAt(QQmlListProperty<Parameter> *list, int index); - static int parametersCount(QQmlListProperty<Parameter> *list); - static void clearParameterList(QQmlListProperty<Parameter> *list); + static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param); + static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index); + static int parametersCount(QQmlListProperty<QParameter> *list); + static void clearParameterList(QQmlListProperty<QParameter> *list); static void appendCriterion(QQmlListProperty<TechniqueCriterion> *list, TechniqueCriterion *criterion); static TechniqueCriterion *criterionAt(QQmlListProperty<TechniqueCriterion> *list, int index); diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index 1c51818a5..25cc77c86 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "parameterpack.h" -#include "parameter.h" +#include "qparameter.h" #include "rendereraspect.h" #include <Qt3DCore/qaspectmanager.h> @@ -61,7 +61,7 @@ ParameterPack::~ParameterPack() { if (m_rendererAspect != Q_NULLPTR && !m_peers.empty()) { QChangeArbiter *arbiter = m_rendererAspect->aspectManager()->changeArbiter(); - Q_FOREACH (Parameter *peer, m_peers) + Q_FOREACH (QParameter *peer, m_peers) arbiter->unregisterObserver(this, peer); } } @@ -71,7 +71,7 @@ void ParameterPack::setRendererAspect(RendererAspect *rendererAspect) m_rendererAspect = rendererAspect; } -void ParameterPack::appendParameter(Parameter *param) +void ParameterPack::appendParameter(QParameter *param) { if (!m_peers.contains(param)) { m_peers << param; @@ -81,7 +81,7 @@ void ParameterPack::appendParameter(Parameter *param) } } -void ParameterPack::removeParameter(Parameter *param) +void ParameterPack::removeParameter(QParameter *param) { if (m_peers.contains(param)) { m_peers.removeOne(param); @@ -95,7 +95,7 @@ void ParameterPack::clear() { m_namedValues.clear(); QChangeArbiter *arbiter = m_rendererAspect->aspectManager()->changeArbiter(); - Q_FOREACH (Parameter *param, m_peers) { + Q_FOREACH (QParameter *param, m_peers) { arbiter->unregisterObserver(this, param); } } diff --git a/src/render/backend/parameterpack.h b/src/render/backend/parameterpack.h index e4f565cfd..9f71835dd 100644 --- a/src/render/backend/parameterpack.h +++ b/src/render/backend/parameterpack.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Parameter; +class QParameter; class RendererAspect; namespace Render { @@ -63,15 +63,15 @@ public: ParameterPack(); ~ParameterPack(); void setRendererAspect(RendererAspect *rendererAspect); - void appendParameter(Parameter *param); - void removeParameter(Parameter *param); + void appendParameter(QParameter *param); + void removeParameter(QParameter *param); void clear(); void sceneChangeEvent(const QSceneChangePtr &e); const QHash<QString, QVariant> namedValues() const; private: QHash<QString, QVariant> m_namedValues; - QList<Parameter *> m_peers; + QList<QParameter *> m_peers; RendererAspect *m_rendererAspect; }; diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp index 2af58351e..916fff173 100644 --- a/src/render/backend/qgraphicscontext.cpp +++ b/src/render/backend/qgraphicscontext.cpp @@ -46,7 +46,7 @@ #include "rendermaterial.h" #include "rendertexture.h" #include "rendercommand.h" -#include "parameter.h" +#include "qparameter.h" #include "drawstate.h" #include "qgraphicshelperinterface.h" #include "renderer.h" diff --git a/src/render/backend/rendereffect.cpp b/src/render/backend/rendereffect.cpp index 5436a22e2..2afe750ca 100644 --- a/src/render/backend/rendereffect.cpp +++ b/src/render/backend/rendereffect.cpp @@ -48,7 +48,7 @@ #include <Qt3DCore/qchangearbiter.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/parameter.h> +#include <Qt3DRenderer/qparameter.h> QT_BEGIN_NAMESPACE @@ -81,7 +81,7 @@ void RenderEffect::setPeer(QAbstractEffect *effect) m_techniques.append(m_peer->techniques()); m_parameterPack.clear(); if (qobject_cast<QEffect*>(m_peer)) - Q_FOREACH (Parameter *p, qobject_cast<QEffect*>(m_peer)->parameters()) + Q_FOREACH (QParameter *p, qobject_cast<QEffect*>(m_peer)->parameters()) m_parameterPack.appendParameter(p); } } @@ -104,7 +104,7 @@ void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e) m_techniques.append(propertyValue.value<QAbstractTechnique *>()); } else if (propertyChange->m_propertyName == QByteArrayLiteral("parameter")) { - m_parameterPack.appendParameter(propertyChange->m_value.value<Parameter*>()); + m_parameterPack.appendParameter(propertyChange->m_value.value<QParameter*>()); } break; @@ -113,7 +113,7 @@ void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e) m_techniques.removeOne(propertyValue.value<QAbstractTechnique *>()); } else if (propertyChange->m_propertyName == QByteArrayLiteral("parameter")) { - m_parameterPack.removeParameter(propertyChange->m_value.value<Parameter*>()); + m_parameterPack.removeParameter(propertyChange->m_value.value<QParameter*>()); } break; diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 12c935f47..a724d6835 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -172,18 +172,18 @@ void Renderer::buildDefaultTechnique() m_defaultTechnique->addPass(basicPass); // diffuse lighting uniforms - Parameter* lightPos = new Parameter(m_defaultTechnique, QStringLiteral("lightPos"), QVector4D(10.0f, 10.0f, 0.0f, 1.0f)); + QParameter* lightPos = new QParameter(m_defaultTechnique, QStringLiteral("lightPos"), QVector4D(10.0f, 10.0f, 0.0f, 1.0f)); m_defaultTechnique->addParameter(lightPos); basicPass->addBinding(new ParameterMapper(QStringLiteral("lightPos"), QStringLiteral("lightPosition"), ParameterMapper::Uniform)); - Parameter* lightIntensity = new Parameter(m_defaultTechnique, QStringLiteral("lightIntensity"), QVector3D(0.5f, 0.5f, 0.5f)); + QParameter* lightIntensity = new QParameter(m_defaultTechnique, QStringLiteral("lightIntensity"), QVector3D(0.5f, 0.5f, 0.5f)); m_defaultTechnique->addParameter(lightIntensity); - Parameter* kd = new Parameter(m_defaultTechnique, QStringLiteral("diffuse"), QVector3D(1.0f, 0.5f, 0.0f)); + QParameter* kd = new QParameter(m_defaultTechnique, QStringLiteral("diffuse"), QVector3D(1.0f, 0.5f, 0.0f)); m_defaultTechnique->addParameter(kd); basicPass->addBinding(new ParameterMapper(QStringLiteral("diffuse"), QStringLiteral("kd"), ParameterMapper::Uniform)); - Parameter* ka = new Parameter(m_defaultTechnique, QStringLiteral("ambient"), QVector3D(0.2f, 0.2f, 0.2f)); + QParameter* ka = new QParameter(m_defaultTechnique, QStringLiteral("ambient"), QVector3D(0.2f, 0.2f, 0.2f)); m_defaultTechnique->addParameter(ka); basicPass->addBinding(new ParameterMapper(QStringLiteral("ambient"), QStringLiteral("ka"), ParameterMapper::Uniform)); @@ -193,10 +193,10 @@ void Renderer::buildDefaultMaterial() { m_defaultMaterial = new QMaterial(); m_defaultMaterial->setObjectName(QStringLiteral("DefaultMaterial")); - m_defaultMaterial->addParameter(new Parameter(m_defaultMaterial, QStringLiteral("lightPos"), QVector4D(10.0f, 10.0f, 0.0f, 1.0f))); - m_defaultMaterial->addParameter(new Parameter(m_defaultMaterial, QStringLiteral("lightIntensity"), QVector3D(0.5f, 0.5f, 0.5f))); - m_defaultMaterial->addParameter(new Parameter(m_defaultMaterial, QStringLiteral("ambient"), QVector3D(0.2f, 0.2f, 0.2f))); - m_defaultMaterial->addParameter(new Parameter(m_defaultMaterial, QStringLiteral("diffuse"), QVector3D(1.0f, 0.5f, 0.0f))); + m_defaultMaterial->addParameter(new QParameter(m_defaultMaterial, QStringLiteral("lightPos"), QVector4D(10.0f, 10.0f, 0.0f, 1.0f))); + m_defaultMaterial->addParameter(new QParameter(m_defaultMaterial, QStringLiteral("lightIntensity"), QVector3D(0.5f, 0.5f, 0.5f))); + m_defaultMaterial->addParameter(new QParameter(m_defaultMaterial, QStringLiteral("ambient"), QVector3D(0.2f, 0.2f, 0.2f))); + m_defaultMaterial->addParameter(new QParameter(m_defaultMaterial, QStringLiteral("diffuse"), QVector3D(1.0f, 0.5f, 0.0f))); QEffect* defEff = new QEffect; defEff->addTechnique(m_defaultTechnique); diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp index 931f0f8b0..852c50bf9 100644 --- a/src/render/backend/rendermaterial.cpp +++ b/src/render/backend/rendermaterial.cpp @@ -45,7 +45,7 @@ #include "qgraphicscontext.h" #include "rendertechnique.h" #include "rendertextureprovider.h" -#include "parameter.h" +#include "qparameter.h" #include <qtechnique.h> // for Parameter #include <qmaterial.h> @@ -83,7 +83,7 @@ void RenderMaterial::setPeer(QMaterial *mat) if (m_peer) { arbiter->registerObserver(this, m_peer, ComponentUpdated); m_parameterPack.clear(); - Q_FOREACH (Parameter *p, m_peer->parameters()) { + Q_FOREACH (QParameter *p, m_peer->parameters()) { m_parameterPack.appendParameter(p); } } @@ -132,16 +132,16 @@ void RenderMaterial::sceneChangeEvent(const QSceneChangePtr &e) } // Check for shader parameter case ComponentAdded: { - Parameter *param = Q_NULLPTR; + QParameter *param = Q_NULLPTR; if (propertyChange->m_propertyName == QByteArrayLiteral("parameter") && - (param = propertyChange->m_value.value<Parameter*>()) != Q_NULLPTR) + (param = propertyChange->m_value.value<QParameter*>()) != Q_NULLPTR) m_parameterPack.appendParameter(param); break; } case ComponentRemoved: { - Parameter *param = Q_NULLPTR; + QParameter *param = Q_NULLPTR; if (propertyChange->m_propertyName == QByteArrayLiteral("parameter") && - (param = propertyChange->m_value.value<Parameter*>()) != Q_NULLPTR) + (param = propertyChange->m_value.value<QParameter*>()) != Q_NULLPTR) m_parameterPack.removeParameter(param); break; } diff --git a/src/render/backend/rendermaterial.h b/src/render/backend/rendermaterial.h index f20dddfc1..d078c8aea 100644 --- a/src/render/backend/rendermaterial.h +++ b/src/render/backend/rendermaterial.h @@ -56,7 +56,7 @@ namespace Qt3D { class QMaterial; class RendererAspect; -class Parameter; +class QParameter; namespace Render { diff --git a/src/render/backend/rendershader.h b/src/render/backend/rendershader.h index c9d3b74e5..e55e70d1c 100644 --- a/src/render/backend/rendershader.h +++ b/src/render/backend/rendershader.h @@ -46,7 +46,7 @@ // for Parameter::StandardUniforms enum - maybe should move to // somewhere common to avoid this include? -#include <Qt3DRenderer/parameter.h> +#include <Qt3DRenderer/qparameter.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp index f23b006fd..29d6de30c 100644 --- a/src/render/backend/rendertechnique.cpp +++ b/src/render/backend/rendertechnique.cpp @@ -85,7 +85,7 @@ void RenderTechnique::setPeer(QTechnique *peer) if (m_peer) { arbiter->registerObserver(this, m_peer); m_parameterPack.clear(); - Q_FOREACH (Parameter *p, m_peer->parameters()) + Q_FOREACH (QParameter *p, m_peer->parameters()) m_parameterPack.appendParameter(p); } } @@ -96,9 +96,9 @@ QTechnique *RenderTechnique::peer() const return m_peer; } -Parameter *RenderTechnique::parameterByName(QString name) const +QParameter *RenderTechnique::parameterByName(QString name) const { - foreach (Parameter* p, m_peer->parameters()) { + foreach (QParameter* p, m_peer->parameters()) { if (p->name() == name) return p; } @@ -118,7 +118,7 @@ void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e) // This will be filled when we have a proper backend RenderPass class } else if (propertyChange->m_propertyName == QByteArrayLiteral("parameter")) { - m_parameterPack.appendParameter(propertyChange->m_value.value<Parameter*>()); + m_parameterPack.appendParameter(propertyChange->m_value.value<QParameter*>()); } } break; @@ -128,7 +128,7 @@ void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e) // See above } else if (propertyChange->m_propertyName == QByteArrayLiteral("parameter")) { - m_parameterPack.removeParameter(propertyChange->m_value.value<Parameter*>()); + m_parameterPack.removeParameter(propertyChange->m_value.value<QParameter*>()); } } break; diff --git a/src/render/backend/rendertechnique.h b/src/render/backend/rendertechnique.h index 1c8eb0b48..1b9c85637 100644 --- a/src/render/backend/rendertechnique.h +++ b/src/render/backend/rendertechnique.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class QTechnique; -class Parameter; +class QParameter; namespace Render { @@ -79,7 +79,7 @@ public: QStringList glslNamesForUniformParameter(QString pName) const; // FIXME using front-end classes here, not ideal - Parameter* parameterByName(QString name) const; + QParameter* parameterByName(QString name) const; void sceneChangeEvent(const QSceneChangePtr &e); const QHash<QString, QVariant> parameters() const; diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index b741d160f..ec3571c76 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -66,7 +66,7 @@ #include "renderpassmanager.h" #include "renderrenderpass.h" #include "parametermapper.h" -#include "parameter.h" +#include "qparameter.h" #include "texturemanager.h" #include "texture.h" #include "renderlayer.h" diff --git a/src/render/backend/renderview.h b/src/render/backend/renderview.h index 97551e6fc..274a819f1 100644 --- a/src/render/backend/renderview.h +++ b/src/render/backend/renderview.h @@ -44,7 +44,7 @@ #include <Qt3DRenderer/renderer.h> #include <Qt3DRenderer/rendercamera.h> -#include <Qt3DRenderer/parameter.h> +#include <Qt3DRenderer/qparameter.h> #include <Qt3DCore/qhandle.h> #include <QVector> #include <QMutex> diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp index 3423a46f9..6b2d8bfbf 100644 --- a/src/render/frontend/qeffect.cpp +++ b/src/render/frontend/qeffect.cpp @@ -42,7 +42,7 @@ #include "qeffect.h" #include "qeffect_p.h" #include "qtechnique.h" -#include "parameter.h" +#include "qparameter.h" #include <Qt3DCore/qscenepropertychange.h> @@ -78,7 +78,7 @@ void QEffect::removeTechnique(QAbstractTechnique *t) QAbstractEffect::removeTechnique(t); } -void QEffect::addParameter(Parameter *parameter) +void QEffect::addParameter(QParameter *parameter) { Q_D(QEffect); if (!d->m_parameters.contains(parameter)) { @@ -90,7 +90,7 @@ void QEffect::addParameter(Parameter *parameter) } } -void QEffect::removeParameter(Parameter *parameter) +void QEffect::removeParameter(QParameter *parameter) { Q_D(QEffect); d->m_parameters.removeOne(parameter); @@ -100,7 +100,7 @@ void QEffect::removeParameter(Parameter *parameter) notifyObservers(change); } -QList<Parameter *> QEffect::parameters() const +QList<QParameter *> QEffect::parameters() const { Q_D(const QEffect); return d->m_parameters; diff --git a/src/render/frontend/qeffect.h b/src/render/frontend/qeffect.h index c603db726..628220a83 100644 --- a/src/render/frontend/qeffect.h +++ b/src/render/frontend/qeffect.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Parameter; +class QParameter; class QEffectPrivate; class QT3DRENDERERSHARED_EXPORT QEffect @@ -63,9 +63,9 @@ public: void addTechnique(QAbstractTechnique *t) Q_DECL_OVERRIDE; void removeTechnique(QAbstractTechnique *t) Q_DECL_OVERRIDE; - void addParameter(Parameter *parameter); - void removeParameter(Parameter *parameter); - QList<Parameter *> parameters() const; + void addParameter(QParameter *parameter); + void removeParameter(QParameter *parameter); + QList<QParameter *> parameters() const; protected: Q_DECLARE_PRIVATE(QEffect) diff --git a/src/render/frontend/qeffect_p.h b/src/render/frontend/qeffect_p.h index 2b443f424..270cb6ec4 100644 --- a/src/render/frontend/qeffect_p.h +++ b/src/render/frontend/qeffect_p.h @@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class QEffect; -class Parameter; +class QParameter; class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public QAbstractEffectPrivate { public : QEffectPrivate(QEffect *qq); - QList<Parameter *> m_parameters; + QList<QParameter *> m_parameters; Q_DECLARE_PUBLIC(QEffect) }; diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp index 2072d49da..752f5840f 100644 --- a/src/render/frontend/qmaterial.cpp +++ b/src/render/frontend/qmaterial.cpp @@ -44,7 +44,7 @@ #include <texture.h> #include <Qt3DCore/qabstracteffect.h> #include "renderlogging.h" -#include "parameter.h" +#include "qparameter.h" #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -77,7 +77,7 @@ void QMaterial::setEffect(QAbstractEffect *effect) notifyObservers(change); } -void QMaterial::addParameter(Parameter *parameter) +void QMaterial::addParameter(QParameter *parameter) { Q_D(QMaterial); if (!d->m_parameters.contains(parameter)) { @@ -89,7 +89,7 @@ void QMaterial::addParameter(Parameter *parameter) } } -void QMaterial::removeParameter(Parameter *parameter) +void QMaterial::removeParameter(QParameter *parameter) { Q_D(QMaterial); d->m_parameters.removeOne(parameter); @@ -99,7 +99,7 @@ void QMaterial::removeParameter(Parameter *parameter) notifyObservers(change); } -QList<Parameter *> QMaterial::parameters() const +QList<QParameter *> QMaterial::parameters() const { Q_D(const QMaterial); return d->m_parameters; diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index 18f7fb746..cdf25cd73 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class Texture; -class Parameter; +class QParameter; class QMaterialPrivate; typedef QMap<QString, Texture*> TextureDict; @@ -69,9 +69,9 @@ public: void setEffect(QAbstractEffect *effect) Q_DECL_OVERRIDE; - void addParameter(Parameter *parameter); - void removeParameter(Parameter *parameter); - QList<Parameter *> parameters() const; + void addParameter(QParameter *parameter); + void removeParameter(QParameter *parameter); + QList<QParameter *> parameters() const; TextureDict textureValues() const; diff --git a/src/render/frontend/qmaterial_p.h b/src/render/frontend/qmaterial_p.h index 636bdafbe..1ebad4df4 100644 --- a/src/render/frontend/qmaterial_p.h +++ b/src/render/frontend/qmaterial_p.h @@ -54,7 +54,7 @@ class QT3DCORESHARED_EXPORT QMaterialPrivate : public QAbstractMaterialPrivate public: QMaterialPrivate(QMaterial *qq); - QList<Parameter *> m_parameters; + QList<QParameter *> m_parameters; TextureDict m_textures; Q_DECLARE_PUBLIC(QMaterial) }; diff --git a/src/render/frontend/parameter.cpp b/src/render/frontend/qparameter.cpp index da57ff4f7..855e76772 100644 --- a/src/render/frontend/parameter.cpp +++ b/src/render/frontend/qparameter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "parameter.h" +#include "qparameter.h" #include "renderlogging.h" #include <Qt3DCore/qscenepropertychange.h> @@ -47,20 +47,20 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -Parameter::Parameter(QNode *parent, const QString &name, const QVariant &value) +QParameter::QParameter(QNode *parent, const QString &name, const QVariant &value) : QNode(parent) , m_name(name) , m_value(value) { } -Parameter::Parameter(QNode *parent) +QParameter::QParameter(QNode *parent) : QNode(parent) , m_type(Undefined) { } -Parameter::Parameter(QNode *parent, const QString &name, const QVariant &value, Parameter::OpenGLTypes ty) +QParameter::QParameter(QNode *parent, const QString &name, const QVariant &value, QParameter::OpenGLTypes ty) : QNode(parent) , m_name(name) , m_type(ty) @@ -69,7 +69,7 @@ Parameter::Parameter(QNode *parent, const QString &name, const QVariant &value, } -void Parameter::setName(const QString &name) +void QParameter::setName(const QString &name) { if (m_name != name) { m_name = name; @@ -77,7 +77,7 @@ void Parameter::setName(const QString &name) } } -void Parameter::setValue(const QVariant &dv) +void QParameter::setValue(const QVariant &dv) { if (m_value != dv) { m_value = dv; @@ -89,12 +89,12 @@ void Parameter::setValue(const QVariant &dv) } } -QVariant Parameter::value() const +QVariant QParameter::value() const { return m_value; } -void Parameter::setDatatype(OpenGLTypes type) +void QParameter::setDatatype(OpenGLTypes type) { if (m_type != type) { m_type = type; @@ -102,7 +102,7 @@ void Parameter::setDatatype(OpenGLTypes type) } } -bool Parameter::isTextureType() const +bool QParameter::isTextureType() const { switch (m_type) { case Sampler1D: @@ -115,7 +115,7 @@ bool Parameter::isTextureType() const } } -Render::QUniformValue::Type Parameter::uniformType() const +Render::QUniformValue::Type QParameter::uniformType() const { switch (m_type) { case Bool: diff --git a/src/render/frontend/parameter.h b/src/render/frontend/qparameter.h index c8b439dbd..2ae04afca 100644 --- a/src/render/frontend/parameter.h +++ b/src/render/frontend/qparameter.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_PARAMETER_H -#define QT3D_PARAMETER_H +#ifndef QT3D_QPARAMETER_H +#define QT3D_QPARAMETER_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DRENDERERSHARED_EXPORT Parameter : public QNode +class QT3DRENDERERSHARED_EXPORT QParameter : public QNode { Q_OBJECT Q_ENUMS(OpenGLTypes) @@ -88,9 +88,9 @@ public: IntVec4 }; - explicit Parameter(QNode *parent = 0); - Parameter(QNode* parent, const QString& name, const QVariant& value); - Parameter(QNode* parent, const QString& name, const QVariant& value, OpenGLTypes ty); + explicit QParameter(QNode *parent = 0); + QParameter(QNode* parent, const QString& name, const QVariant& value); + QParameter(QNode* parent, const QString& name, const QVariant& value, OpenGLTypes ty); void setName(const QString &name); QString name() const @@ -130,6 +130,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Parameter *) +Q_DECLARE_METATYPE(Qt3D::QParameter *) #endif // QT3D_PARAMETER_H diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index d2c98b27f..4d6d1b691 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -41,7 +41,7 @@ #include "qrenderpass.h" #include "qrenderpass_p.h" -#include "parameter.h" +#include "qparameter.h" #include "renderpasscriterion.h" #include "parametermapper.h" diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h index fd8277b90..46872a205 100644 --- a/src/render/frontend/qrenderpass.h +++ b/src/render/frontend/qrenderpass.h @@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Parameter; +class QParameter; class ParameterMapper; -typedef QList<Parameter*> ParameterList; +typedef QList<QParameter*> ParameterList; class QRenderPassPrivate; @@ -69,9 +69,9 @@ class QT3DRENDERERSHARED_EXPORT QRenderPass : public QAbstractRenderPass public: explicit QRenderPass(QNode *parent = 0); - void addUniformBinding(Parameter* param, QString glslUniformName); + void addUniformBinding(QParameter* param, QString glslUniformName); - void addAttributeBinding(Parameter* param, QString glslAttributeName); + void addAttributeBinding(QParameter* param, QString glslAttributeName); QString glslNameForParameter(QString paramName) const; diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h index c2b9bbbbf..c1cf64152 100644 --- a/src/render/frontend/qrenderpass_p.h +++ b/src/render/frontend/qrenderpass_p.h @@ -50,9 +50,9 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class QRenderPass; -class Parameter; +class QParameter; class ParameterMapper; -typedef QList<Parameter*> ParameterList; +typedef QList<QParameter*> ParameterList; namespace Render { diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp index a125c917b..09c0eb452 100644 --- a/src/render/frontend/qtechnique.cpp +++ b/src/render/frontend/qtechnique.cpp @@ -41,7 +41,7 @@ #include "qtechnique.h" #include "qtechnique_p.h" -#include "parameter.h" +#include "qparameter.h" #include <Qt3DCore/qscenepropertychange.h> #include <QDebug> @@ -132,7 +132,7 @@ void QTechnique::addPass(QAbstractRenderPass *pass) QAbstractTechnique::addPass(pass); } -void QTechnique::addParameter(Parameter *parameter) +void QTechnique::addParameter(QParameter *parameter) { Q_D(QTechnique); if (!d->m_parameters.contains(parameter)) { @@ -144,7 +144,7 @@ void QTechnique::addParameter(Parameter *parameter) } } -void QTechnique::removeParameter(Parameter *parameter) +void QTechnique::removeParameter(QParameter *parameter) { Q_D(QTechnique); d->m_parameters.removeOne(parameter); @@ -154,16 +154,16 @@ void QTechnique::removeParameter(Parameter *parameter) notifyObservers(change); } -QList<Parameter *> QTechnique::parameters() const +QList<QParameter *> QTechnique::parameters() const { Q_D(const QTechnique); return d->m_parameters; } -Parameter *QTechnique::parameterByName(QString name) const +QParameter *QTechnique::parameterByName(QString name) const { Q_D(const QTechnique); - foreach (Parameter* p, d->m_parameters) { + foreach (QParameter* p, d->m_parameters) { if (p->name() == name) return p; } diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h index 1d7d9c588..25f5413b1 100644 --- a/src/render/frontend/qtechnique.h +++ b/src/render/frontend/qtechnique.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Parameter; +class QParameter; class QTechniquePrivate; class QT3DRENDERERSHARED_EXPORT QTechnique : public QAbstractTechnique @@ -76,11 +76,11 @@ public: void addPass(QAbstractRenderPass* pass) Q_DECL_OVERRIDE; - void addParameter(Parameter *p); - void removeParameter(Parameter *p); - QList<Parameter *> parameters() const; + void addParameter(QParameter *p); + void removeParameter(QParameter *p); + QList<QParameter *> parameters() const; - Parameter* parameterByName(QString name) const; + QParameter* parameterByName(QString name) const; protected: Q_DECLARE_PRIVATE(QTechnique) diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h index 08f654ea8..3b67a5693 100644 --- a/src/render/frontend/qtechnique_p.h +++ b/src/render/frontend/qtechnique_p.h @@ -51,7 +51,7 @@ namespace Qt3D { class QTechnique; class TechniqueCriterion; -class Parameter; +class QParameter; class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public QAbstractTechniquePrivate { @@ -59,7 +59,7 @@ public: QTechniquePrivate(QTechnique *dd); Q_DECLARE_PUBLIC(QTechnique) QList<TechniqueCriterion *> m_criteriaList; - QList<Parameter *> m_parameters; + QList<QParameter *> m_parameters; }; } // Qt3D diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index a6db713df..1b856a0de 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -18,7 +18,7 @@ HEADERS += \ $$PWD/qscene.h \ $$PWD/techniquecriterion.h \ $$PWD/renderpasscriterion.h \ - $$PWD/parameter.h \ + $$PWD/qparameter.h \ $$PWD/parametermapper.h \ $$PWD/qtorusmesh.h \ $$PWD/qspheremesh.h \ @@ -55,7 +55,7 @@ SOURCES += \ $$PWD/qscene.cpp \ $$PWD/techniquecriterion.cpp \ $$PWD/renderpasscriterion.cpp \ - $$PWD/parameter.cpp \ + $$PWD/qparameter.cpp \ $$PWD/parametermapper.cpp \ $$PWD/qtorusmesh.cpp \ $$PWD/qspheremesh.cpp \ diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp index 0a0422de8..aa8fbbf05 100644 --- a/src/render/io/assimpparser.cpp +++ b/src/render/io/assimpparser.cpp @@ -42,7 +42,7 @@ #include "assimpparser.h" #include <Qt3DCore/qtransform.h> -#include <parameter.h> +#include <qparameter.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/cameralens.h> #include <qmesh.h> @@ -668,17 +668,17 @@ void AssimpParser::copyMaterialColorProperties(QMaterial *material, aiMaterial * { aiColor3D color; if (assimpMaterial->Get(AI_MATKEY_COLOR_DIFFUSE, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_DIFFUSE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_DIFFUSE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); if (assimpMaterial->Get(AI_MATKEY_COLOR_SPECULAR, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_SPECULAR_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_SPECULAR_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); if (assimpMaterial->Get(AI_MATKEY_COLOR_AMBIENT, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_AMBIENT_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_AMBIENT_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); if (assimpMaterial->Get(AI_MATKEY_COLOR_EMISSIVE, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_EMISSIVE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_EMISSIVE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); if (assimpMaterial->Get(AI_MATKEY_COLOR_TRANSPARENT, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_TRANSPARENT_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_TRANSPARENT_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); if (assimpMaterial->Get(AI_MATKEY_COLOR_REFLECTIVE, color) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_REFLECTIVE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_REFLECTIVE_COLOR, QColor::fromRgbF(color.r, color.g, color.b))); } /*! @@ -688,9 +688,9 @@ void AssimpParser::copyMaterialBoolProperties(QMaterial *material, aiMaterial *a { int value; if (assimpMaterial->Get(AI_MATKEY_TWOSIDED, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_IS_TWOSIDED, (value == 0) ? false : true)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_IS_TWOSIDED, (value == 0) ? false : true)); if (assimpMaterial->Get(AI_MATKEY_ENABLE_WIREFRAME, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_IS_WIREFRAME, (value == 0) ? false : true)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_IS_WIREFRAME, (value == 0) ? false : true)); } void AssimpParser::copyMaterialShadingModel(QMaterial *material, aiMaterial *assimpMaterial) @@ -763,7 +763,7 @@ void AssimpParser::copyMaterialTextures(QMaterial *material, aiMaterial *assimpM } } if (textureLoaded) { - material->addParameter(new Parameter(material, m_textureToParameterName[textureType[i]], + material->addParameter(new QParameter(material, m_textureToParameterName[textureType[i]], QVariant::fromValue(m_materialTextures[fullPath]))); } } @@ -777,15 +777,15 @@ void AssimpParser::copyMaterialFloatProperties(QMaterial *material, aiMaterial * { float value = 0; if (assimpMaterial->Get(AI_MATKEY_OPACITY, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_OPACITY, value)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_OPACITY, value)); if (assimpMaterial->Get(AI_MATKEY_SHININESS, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_SHININESS,value)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_SHININESS,value)); if (assimpMaterial->Get(AI_MATKEY_SHININESS_STRENGTH, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_SHININESS_STRENGTH, value)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_SHININESS_STRENGTH, value)); if (assimpMaterial->Get(AI_MATKEY_REFRACTI, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_REFRACTI, value)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_REFRACTI, value)); if (assimpMaterial->Get(AI_MATKEY_REFLECTIVITY, value) == aiReturn_SUCCESS) - material->addParameter(new Parameter(material, ASSIMP_MATERIAL_REFLECTIVITY, value)); + material->addParameter(new QParameter(material, ASSIMP_MATERIAL_REFLECTIVITY, value)); } AssimpParser::AssimpMesh::AssimpMesh(QNode *parent) diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index dffd1ee7e..df5b65fec 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -55,7 +55,7 @@ #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/cameralens.h> #include <texture.h> -#include <parameter.h> +#include <qparameter.h> #include <QJsonDocument> #include <QJsonObject> @@ -163,41 +163,41 @@ const QString KEY_INTERNAL_FORMAT = QStringLiteral("internalFormat"); // return Parameter::None; //} -Parameter::OpenGLTypes parseType(const QByteArray &s) -{ - if (s == "BYTE") return Parameter::Undefined; - if (s == "BYTE_VEC2") return Parameter::Undefined; - if (s == "BYTE_VEC3") return Parameter::Undefined; - if (s == "BYTE_VEC4") return Parameter::Undefined; - if (s == "UNSIGNED_BYTE") return Parameter::Undefined; - if (s == "UNSIGNED_BYTE_VEC2") return Parameter::Undefined; - if (s == "UNSIGNED_BYTE_VEC3") return Parameter::Undefined; - if (s == "UNSIGNED_BYTE_VEC4") return Parameter::Undefined; - if (s == "SHORT") return Parameter::Undefined; - if (s == "SHORT_VEC2") return Parameter::Undefined; - if (s == "SHORT_VEC3") return Parameter::Undefined; - if (s == "SHORT_VEC4") return Parameter::Undefined; - if (s == "UNSIGNED_SHORT") return Parameter::Undefined; - if (s == "UNSIGNED_SHORT_VEC2") return Parameter::Undefined; - if (s == "UNSIGNED_SHORT_VEC3") return Parameter::Undefined; - if (s == "UNSIGNED_SHORT_VEC4") return Parameter::Undefined; - if (s == "FLOAT") return Parameter::Float; - if (s == "FLOAT_VEC2") return Parameter::FloatVec2; - if (s == "FLOAT_VEC3") return Parameter::FloatVec3; - if (s == "FLOAT_VEC4") return Parameter::FloatVec4; - if (s == "FLOAT_MAT2") return Parameter::FloatMat2; - if (s == "FLOAT_MAT2") return Parameter::FloatMat3; - if (s == "FLOAT_MAT2") return Parameter::FloatMat4; - if (s == "INT") return Parameter::Int; - if (s == "INT_VEC2") return Parameter::IntVec2; - if (s == "INT_VEC3") return Parameter::IntVec3; - if (s == "INT_VEC4") return Parameter::IntVec4; - if (s == "BOOL") return Parameter::Bool; - if (s == "BOOL_VEC2") return Parameter::BoolVec2; - if (s == "BOOL_VEC3") return Parameter::BoolVec3; - if (s == "BOOL_VEC4") return Parameter::BoolVec4; - - return Parameter::Undefined; +QParameter::OpenGLTypes parseType(const QByteArray &s) +{ + if (s == "BYTE") return QParameter::Undefined; + if (s == "BYTE_VEC2") return QParameter::Undefined; + if (s == "BYTE_VEC3") return QParameter::Undefined; + if (s == "BYTE_VEC4") return QParameter::Undefined; + if (s == "UNSIGNED_BYTE") return QParameter::Undefined; + if (s == "UNSIGNED_BYTE_VEC2") return QParameter::Undefined; + if (s == "UNSIGNED_BYTE_VEC3") return QParameter::Undefined; + if (s == "UNSIGNED_BYTE_VEC4") return QParameter::Undefined; + if (s == "SHORT") return QParameter::Undefined; + if (s == "SHORT_VEC2") return QParameter::Undefined; + if (s == "SHORT_VEC3") return QParameter::Undefined; + if (s == "SHORT_VEC4") return QParameter::Undefined; + if (s == "UNSIGNED_SHORT") return QParameter::Undefined; + if (s == "UNSIGNED_SHORT_VEC2") return QParameter::Undefined; + if (s == "UNSIGNED_SHORT_VEC3") return QParameter::Undefined; + if (s == "UNSIGNED_SHORT_VEC4") return QParameter::Undefined; + if (s == "FLOAT") return QParameter::Float; + if (s == "FLOAT_VEC2") return QParameter::FloatVec2; + if (s == "FLOAT_VEC3") return QParameter::FloatVec3; + if (s == "FLOAT_VEC4") return QParameter::FloatVec4; + if (s == "FLOAT_MAT2") return QParameter::FloatMat2; + if (s == "FLOAT_MAT2") return QParameter::FloatMat3; + if (s == "FLOAT_MAT2") return QParameter::FloatMat4; + if (s == "INT") return QParameter::Int; + if (s == "INT_VEC2") return QParameter::IntVec2; + if (s == "INT_VEC3") return QParameter::IntVec3; + if (s == "INT_VEC4") return QParameter::IntVec4; + if (s == "BOOL") return QParameter::Bool; + if (s == "BOOL_VEC2") return QParameter::BoolVec2; + if (s == "BOOL_VEC3") return QParameter::BoolVec3; + if (s == "BOOL_VEC4") return QParameter::BoolVec4; + + return QParameter::Undefined; } } // of anonymous namespace @@ -490,7 +490,7 @@ QMaterial* GLTFParser::material(QString id) QJsonObject values = tech.value(KEY_VALUES).toObject(); foreach (QString vName, values.keys()) { - Parameter* param = technique->parameterByName(vName); + QParameter* param = technique->parameterByName(vName); if (!param) { qWarning() << "unknown parameter:" << vName << "in technique" << tname << "processing material" << id; @@ -788,7 +788,7 @@ void GLTFParser::processJSONTechnique( QString id, QJsonObject jsonObj ) QTechnique *t = new QTechnique; t->setObjectName(id); - QHash<QString, Parameter*> paramDict; + QHash<QString, QParameter*> paramDict; QJsonObject params = jsonObj.value(KEY_PARAMETERS).toObject(); Q_FOREACH (QString pname, params.keys()) { QJsonObject po = params.value(pname).toObject(); @@ -797,7 +797,7 @@ void GLTFParser::processJSONTechnique( QString id, QJsonObject jsonObj ) QString semantic = po.value(KEY_SEMANTIC).toString(); // The Standard has changed, it doesn't return the raw int value for a type // But a string - Parameter* p = new Parameter(t, pname, parseType(po.value(KEY_TYPE).toString().toUtf8())); + QParameter* p = new QParameter(t, pname, parseType(po.value(KEY_TYPE).toString().toUtf8())); // Parameter::StandardUniform su = parseSemanticName(semantic.toUtf8()); // if (su != Parameter::None) { // p->setStandardUniform(su); @@ -916,26 +916,26 @@ GLTFParser::BufferData::BufferData(QJsonObject json) // url } -QVariant GLTFParser::parameterValueFromJSON(Parameter* p, QJsonValue val) +QVariant GLTFParser::parameterValueFromJSON(QParameter* p, QJsonValue val) { switch (p->datatype()) { - case Parameter::Bool: + case QParameter::Bool: return val.toBool(); - case Parameter::Float: + case QParameter::Float: return val.toDouble(); - case Parameter::FloatVec2: { + case QParameter::FloatVec2: { QJsonArray a = val.toArray(); return QVector2D(a[0].toDouble(), a[1].toDouble()); } - case Parameter::FloatVec3: { + case QParameter::FloatVec3: { QJsonArray a = val.toArray(); return QVector3D(a[0].toDouble(), a[1].toDouble(), a[3].toDouble()); } - case Parameter::FloatVec4: { + case QParameter::FloatVec4: { QJsonArray a = val.toArray(); return QVector4D(a[0].toDouble(), a[1].toDouble(), @@ -943,7 +943,7 @@ QVariant GLTFParser::parameterValueFromJSON(Parameter* p, QJsonValue val) a[3].toDouble()); } - case Parameter::FloatMat4: { + case QParameter::FloatMat4: { QJsonArray a = val.toArray(); QMatrix4x4 m; diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h index 23f4fa7d4..14ec081f7 100644 --- a/src/render/io/gltfparser.h +++ b/src/render/io/gltfparser.h @@ -168,7 +168,7 @@ private: void processJSONImage(QString id, QJsonObject jsonObj); void processJSONTexture(QString id, QJsonObject jsonObj); - QVariant parameterValueFromJSON(Parameter *p, QJsonValue val); + QVariant parameterValueFromJSON(QParameter *p, QJsonValue val); Render::DrawState *buildState(const QByteArray& nm, QJsonValue obj); }; |