diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-01 13:21:39 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-02 11:31:53 +0000 |
| commit | 705f5dd781a1e34db429edbfe133842eea16a82b (patch) | |
| tree | 351c44a3910c334eb563e9de777161523d1cb6e9 /src/render/defaults/qdiffusespecularmapmaterial.cpp | |
| parent | ff67c813fcd377d704bcb9d37b03546797be6193 (diff) | |
Migrate DiffuseSpecularMapMaterial to be light-aware
Change-Id: I692e7ad9cdd63c2098e799c41937b2a4440f9c70
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 746739ed3..44c507859 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -66,8 +66,6 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture)) , m_specularParameter(new QParameter(QStringLiteral("specularTexture"), m_specularTexture)) , m_shininessParameter(new QParameter(QStringLiteral("shininess"), 150.0f)) - , m_lightPositionParameter(new QParameter(QStringLiteral("lightPosition"), QVector4D(1.0f, 1.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_diffuseSpecularMapGL3Technique(new QTechnique()) , m_diffuseSpecularMapGL2Technique(new QTechnique()) @@ -129,8 +127,6 @@ void QDiffuseSpecularMapMaterialPrivate::init() m_diffuseSpecularMapEffect->addParameter(m_diffuseParameter); m_diffuseSpecularMapEffect->addParameter(m_specularParameter); m_diffuseSpecularMapEffect->addParameter(m_shininessParameter); - m_diffuseSpecularMapEffect->addParameter(m_lightPositionParameter); - m_diffuseSpecularMapEffect->addParameter(m_lightIntensityParameter); m_diffuseSpecularMapEffect->addParameter(m_textureScaleParameter); q_func()->setEffect(m_diffuseSpecularMapEffect); |