diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-01 13:27:33 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-02 11:31:57 +0000 |
| commit | b8d1f11ce3b9325c592f028aefdc05101eb49c8b (patch) | |
| tree | 459bdd2f80ff8f27a42b8b1bfa84a564dd08d111 /src/render/defaults | |
| parent | 705f5dd781a1e34db429edbfe133842eea16a82b (diff) | |
Migrate PhongAlphaMaterial to be light-aware
Change-Id: Ie082b7885e4465181c8c38e17bf0ce17543154b9
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qphongalphamaterial.cpp | 4 | ||||
| -rw-r--r-- | src/render/defaults/qphongalphamaterial_p.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/render/defaults/qphongalphamaterial.cpp index 6235b54a0..321469404 100644 --- a/src/render/defaults/qphongalphamaterial.cpp +++ b/src/render/defaults/qphongalphamaterial.cpp @@ -66,8 +66,6 @@ QPhongAlphaMaterialPrivate::QPhongAlphaMaterialPrivate() , 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_alphaParameter(new QParameter(QStringLiteral("alpha"), 0.5f)) - , 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_phongAlphaGL3Technique(new QTechnique()) , m_phongAlphaGL2Technique(new QTechnique()) , m_phongAlphaES2Technique(new QTechnique()) @@ -276,8 +274,6 @@ void QPhongAlphaMaterialPrivate::init() m_phongEffect->addParameter(m_specularParameter); m_phongEffect->addParameter(m_shininessParameter); m_phongEffect->addParameter(m_alphaParameter); - m_phongEffect->addParameter(m_lightPositionParameter); - m_phongEffect->addParameter(m_lightIntensityParameter); q_func()->setEffect(m_phongEffect); } diff --git a/src/render/defaults/qphongalphamaterial_p.h b/src/render/defaults/qphongalphamaterial_p.h index 9c91669b2..b2598ced6 100644 --- a/src/render/defaults/qphongalphamaterial_p.h +++ b/src/render/defaults/qphongalphamaterial_p.h @@ -79,8 +79,6 @@ public: QParameter *m_specularParameter; QParameter *m_shininessParameter; QParameter *m_alphaParameter; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QTechnique *m_phongAlphaGL3Technique; QTechnique *m_phongAlphaGL2Technique; QTechnique *m_phongAlphaES2Technique; |