diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-20 09:48:26 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-22 10:45:34 +0200 |
| commit | 4be6e50f1af5520a989246035d3ed0ba6ab1bfd0 (patch) | |
| tree | eb9384ace93f79137b4d10c37bc84eb18f4ae48a /src/render/backend/renderer.cpp | |
| parent | 62f9d57d8e4e9dc77f3eceb9f9c8413998143ca5 (diff) | |
QParameterMapper: renamed to QParameterMapping
Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0
Task-number: QTBUG-41535
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/renderer.cpp')
| -rw-r--r-- | src/render/backend/renderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 5d0b462d9..c8e858237 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -49,7 +49,7 @@ #include <Qt3DRenderer/qmaterial.h> #include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qparametermapper.h> +#include <Qt3DRenderer/qparametermapping.h> #include <Qt3DRenderer/qrenderpass.h> #include <Qt3DRenderer/qshaderprogram.h> #include <Qt3DRenderer/qtechnique.h> @@ -177,18 +177,18 @@ void Renderer::buildDefaultTechnique() // diffuse lighting uniforms QParameter* lightPos = new QParameter(QStringLiteral("lightPos"), QVector4D(10.0f, 10.0f, 0.0f, 1.0f)); m_defaultTechnique->addParameter(lightPos); - basicPass->addBinding(new QParameterMapper(QStringLiteral("lightPos"), QStringLiteral("lightPosition"), QParameterMapper::Uniform)); + basicPass->addBinding(new QParameterMapping(QStringLiteral("lightPos"), QStringLiteral("lightPosition"), QParameterMapping::Uniform)); QParameter* lightIntensity = new QParameter(QStringLiteral("lightIntensity"), QVector3D(0.5f, 0.5f, 0.5f)); m_defaultTechnique->addParameter(lightIntensity); QParameter* kd = new QParameter(QStringLiteral("diffuse"), QVector3D(1.0f, 0.5f, 0.0f)); m_defaultTechnique->addParameter(kd); - basicPass->addBinding(new QParameterMapper(QStringLiteral("diffuse"), QStringLiteral("kd"), QParameterMapper::Uniform)); + basicPass->addBinding(new QParameterMapping(QStringLiteral("diffuse"), QStringLiteral("kd"), QParameterMapping::Uniform)); QParameter* ka = new QParameter(QStringLiteral("ambient"), QVector3D(0.2f, 0.2f, 0.2f)); m_defaultTechnique->addParameter(ka); - basicPass->addBinding(new QParameterMapper(QStringLiteral("ambient"), QStringLiteral("ka"), QParameterMapper::Uniform)); + basicPass->addBinding(new QParameterMapping(QStringLiteral("ambient"), QStringLiteral("ka"), QParameterMapping::Uniform)); } |