summaryrefslogtreecommitdiffstats
path: root/src/render/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/backend')
-rw-r--r--src/render/backend/parameterpack.cpp10
-rw-r--r--src/render/backend/parameterpack.h8
-rw-r--r--src/render/backend/qgraphicscontext.cpp2
-rw-r--r--src/render/backend/rendereffect.cpp8
-rw-r--r--src/render/backend/renderer.cpp16
-rw-r--r--src/render/backend/rendermaterial.cpp12
-rw-r--r--src/render/backend/rendermaterial.h2
-rw-r--r--src/render/backend/rendershader.h2
-rw-r--r--src/render/backend/rendertechnique.cpp10
-rw-r--r--src/render/backend/rendertechnique.h4
-rw-r--r--src/render/backend/renderview.cpp2
-rw-r--r--src/render/backend/renderview.h2
12 files changed, 39 insertions, 39 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:03:19 +0000