diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-02 14:16:35 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-04 11:28:46 +0000 |
| commit | 25d72d8dbaa8a615a0d9893e755b404dc20c04a7 (patch) | |
| tree | 89edc16cec4e4297bf41671db349f04fdb4bf4d6 /src/render/defaults | |
| parent | ec471e983146dbaf52191c01e7ad737900e9459c (diff) | |
Migrate NormalDiffuseMap(Alpha)Material to be lights-aware
Change-Id: I91a6db87836c0e37af10d8de90e431240a7851e2
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapalphamaterial.cpp | 2 | ||||
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial.cpp | 4 | ||||
| -rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial_p.h | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index 602a111d7..bd438b3a3 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -116,8 +116,6 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() m_normalDiffuseEffect->addParameter(m_normalParameter); m_normalDiffuseEffect->addParameter(m_specularParameter); m_normalDiffuseEffect->addParameter(m_shininessParameter); - m_normalDiffuseEffect->addParameter(m_lightPositionParameter); - m_normalDiffuseEffect->addParameter(m_lightIntensityParameter); m_normalDiffuseEffect->addParameter(m_textureScaleParameter); q_func()->setEffect(m_normalDiffuseEffect); diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index 259ac54d8..e038b2c81 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -67,8 +67,6 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() , m_normalParameter(new QParameter(QStringLiteral("normalTexture"), m_normalTexture)) , m_specularParameter(new QParameter(QStringLiteral("ks"), QColor::fromRgbF(0.95f, 0.95f, 0.95f, 1.0f))) , m_shininessParameter(new QParameter(QStringLiteral("shininess"), 150.0f)) - , m_lightPositionParameter(new QParameter(QStringLiteral("lightPosition"), QVector4D(0.0f, 0.0f, 0.0f, 1.0f))) - , m_lightIntensityParameter(new QParameter(QStringLiteral("lightIntensity"), QVector3D(1.0f, 1.0f, 1.0f))) , m_textureScaleParameter(new QParameter(QStringLiteral("texCoordScale"), 1.0f)) , m_normalDiffuseGL3Technique(new QTechnique()) , m_normalDiffuseGL2Technique(new QTechnique()) @@ -130,8 +128,6 @@ void QNormalDiffuseMapMaterialPrivate::init() m_normalDiffuseEffect->addParameter(m_normalParameter); m_normalDiffuseEffect->addParameter(m_specularParameter); m_normalDiffuseEffect->addParameter(m_shininessParameter); - m_normalDiffuseEffect->addParameter(m_lightPositionParameter); - m_normalDiffuseEffect->addParameter(m_lightIntensityParameter); m_normalDiffuseEffect->addParameter(m_textureScaleParameter); q_func()->setEffect(m_normalDiffuseEffect); diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h index 7bf820541..996aa76c9 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h @@ -79,8 +79,6 @@ public: QParameter *m_normalParameter; QParameter *m_specularParameter; QParameter *m_shininessParameter; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QParameter *m_textureScaleParameter; QTechnique *m_normalDiffuseGL3Technique; QTechnique *m_normalDiffuseGL2Technique; |