diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-01 13:34:41 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-02 10:40:16 +0000 |
| commit | ff67c813fcd377d704bcb9d37b03546797be6193 (patch) | |
| tree | 183751b99ebcc90cf680d19cef55b9b63dac2b88 /src/render/defaults | |
| parent | e81795101cad74a70599915028045b11f2763e3a (diff) | |
Migrate PerVertexMaterial to be light-aware
The original version has no specular component so leave that out
in this version as well. To make this simple, introduce adModel().
Change-Id: I474485a19163ec55e6f6e025d94d8172297e847c
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qpervertexcolormaterial.cpp | 5 | ||||
| -rw-r--r-- | src/render/defaults/qpervertexcolormaterial_p.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index 5ea8f9fbf..36468e90e 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -58,8 +58,6 @@ namespace Qt3DRender { QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate() : QMaterialPrivate() , m_vertexEffect(new QEffect()) - , 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_vertexGL3Technique(new QTechnique()) , m_vertexGL2Technique(new QTechnique()) , m_vertexES2Technique(new QTechnique()) @@ -145,9 +143,6 @@ void QPerVertexColorMaterialPrivate::init() m_vertexEffect->addTechnique(m_vertexGL2Technique); m_vertexEffect->addTechnique(m_vertexES2Technique); - m_vertexEffect->addParameter(m_lightPositionParameter); - m_vertexEffect->addParameter(m_lightIntensityParameter); - q_func()->setEffect(m_vertexEffect); } diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h index 5b6079b0f..9e8298667 100644 --- a/src/render/defaults/qpervertexcolormaterial_p.h +++ b/src/render/defaults/qpervertexcolormaterial_p.h @@ -71,8 +71,6 @@ public: void init(); QEffect *m_vertexEffect; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QTechnique *m_vertexGL3Technique; QTechnique *m_vertexGL2Technique; QTechnique *m_vertexES2Technique; |