diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-30 18:03:01 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-01 14:05:34 +0000 |
| commit | f6adee1f24a148a0daafb37a33f9da16095875b4 (patch) | |
| tree | cf5a540e5c4ce8acde86430662c389213a6acf61 /src/render/defaults | |
| parent | c7125de64509411644b7b5ab185ebec40bfa77c3 (diff) | |
Unify the default and phong shaders
This also means that (Q)PhongMaterial is now lights capable.
Change-Id: I8191fa6dfe96dadafdc9a2db47066650a8c96ee6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qphongmaterial.cpp | 4 | ||||
| -rw-r--r-- | src/render/defaults/qphongmaterial_p.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 4c08d3713..7d18afccc 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -62,8 +62,6 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() , m_diffuseParameter(new QParameter(QStringLiteral("kd"), QColor::fromRgbF(0.7f, 0.7f, 0.7f, 1.0f))) , 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(1.0f, 1.0f, 0.0f, 1.0f))) - , m_lightIntensityParameter(new QParameter(QStringLiteral("lightIntensity"), QVector3D(1.0f, 1.0f, 1.0f))) , m_phongGL3Technique(new QTechnique()) , m_phongGL2Technique(new QTechnique()) , m_phongES2Technique(new QTechnique()) @@ -227,8 +225,6 @@ void QPhongMaterialPrivate::init() m_phongEffect->addParameter(m_diffuseParameter); m_phongEffect->addParameter(m_specularParameter); m_phongEffect->addParameter(m_shininessParameter); - m_phongEffect->addParameter(m_lightPositionParameter); - m_phongEffect->addParameter(m_lightIntensityParameter); q_func()->setEffect(m_phongEffect); } diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h index 527310097..33ae2f048 100644 --- a/src/render/defaults/qphongmaterial_p.h +++ b/src/render/defaults/qphongmaterial_p.h @@ -75,8 +75,6 @@ public: QParameter *m_diffuseParameter; QParameter *m_specularParameter; QParameter *m_shininessParameter; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QTechnique *m_phongGL3Technique; QTechnique *m_phongGL2Technique; QTechnique *m_phongES2Technique; |