diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-30 19:12:51 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-01 14:05:44 +0000 |
| commit | d763a69c9c2e55f7d358c538335ebf5c62cb5445 (patch) | |
| tree | 9633975093a3d814ff82185fa612d8278096cd2f /src/render/defaults | |
| parent | bfdaeb1877ec05f7c19eac646358eaf1acddc2eb (diff) | |
Migrate DiffuseMapMaterial to be light-aware
Change-Id: I79cac9384a258bfd3e106beba1aebb44c5f15491
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.cpp | 4 | ||||
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial_p.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index d738e1592..e46fb4e53 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -64,8 +64,6 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate() , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture)) , 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_diffuseMapGL3Technique(new QTechnique()) , m_diffuseMapGL2Technique(new QTechnique()) @@ -121,8 +119,6 @@ void QDiffuseMapMaterialPrivate::init() m_diffuseMapEffect->addParameter(m_diffuseParameter); m_diffuseMapEffect->addParameter(m_specularParameter); m_diffuseMapEffect->addParameter(m_shininessParameter); - m_diffuseMapEffect->addParameter(m_lightPositionParameter); - m_diffuseMapEffect->addParameter(m_lightIntensityParameter); m_diffuseMapEffect->addParameter(m_textureScaleParameter); q_func()->setEffect(m_diffuseMapEffect); diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h index 0badb01ff..667b53ae6 100644 --- a/src/render/defaults/qdiffusemapmaterial_p.h +++ b/src/render/defaults/qdiffusemapmaterial_p.h @@ -76,8 +76,6 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate QParameter *m_diffuseParameter; QParameter *m_specularParameter; QParameter *m_shininessParameter; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QParameter *m_textureScaleParameter; QTechnique *m_diffuseMapGL3Technique; QTechnique *m_diffuseMapGL2Technique; |