diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-02 14:56:05 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-12-04 11:28:51 +0000 |
| commit | 9ca806af52108baa80dafa2d9c3161f1baae3af0 (patch) | |
| tree | 713afc57e4bb547ae318b925231c54da2d3fb4ad /src/render/defaults | |
| parent | 25d72d8dbaa8a615a0d9893e755b404dc20c04a7 (diff) | |
Migrate NormalDiffuseSpecularMapMaterial to be light-aware
Remove duplicated vertex shaders in the process.
[normal]diffusespecularmap.vert is the same as [normal]diffusemap.vert
hence there is no need for the former.
Change-Id: If448005c593c765551ca239af6789df2f6e53af6
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/defaults')
3 files changed, 4 insertions, 10 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 44c507859..392824135 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -91,9 +91,9 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() void QDiffuseSpecularMapMaterialPrivate::init() { - m_diffuseSpecularMapGL3Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/diffusespecularmap.vert")))); + m_diffuseSpecularMapGL3Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/diffusemap.vert")))); m_diffuseSpecularMapGL3Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/diffusespecularmap.frag")))); - m_diffuseSpecularMapGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusespecularmap.vert")))); + m_diffuseSpecularMapGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusemap.vert")))); m_diffuseSpecularMapGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/diffusespecularmap.frag")))); m_diffuseSpecularMapGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index 8f263153d..05adf12ca 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -67,8 +67,6 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva , m_normalParameter(new QParameter(QStringLiteral("normalTexture"), m_normalTexture)) , m_specularParameter(new QParameter(QStringLiteral("specularTexture"), m_specularTexture)) , 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_normalDiffuseSpecularGL3Technique(new QTechnique()) , m_normalDiffuseSpecularGL2Technique(new QTechnique()) @@ -99,9 +97,9 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva void QNormalDiffuseSpecularMapMaterialPrivate::init() { - m_normalDiffuseSpecularGL3Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/normaldiffusespecularmap.vert")))); + m_normalDiffuseSpecularGL3Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/normaldiffusemap.vert")))); m_normalDiffuseSpecularGL3Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/gl3/normaldiffusespecularmap.frag")))); - m_normalDiffuseSpecularGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusespecularmap.vert")))); + m_normalDiffuseSpecularGL2ES2Shader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusemap.vert")))); m_normalDiffuseSpecularGL2ES2Shader->setFragmentShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/es2/normaldiffusespecularmap.frag")))); m_normalDiffuseSpecularGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); @@ -136,8 +134,6 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() m_normalDiffuseSpecularEffect->addParameter(m_normalParameter); m_normalDiffuseSpecularEffect->addParameter(m_specularParameter); m_normalDiffuseSpecularEffect->addParameter(m_shininessParameter); - m_normalDiffuseSpecularEffect->addParameter(m_lightPositionParameter); - m_normalDiffuseSpecularEffect->addParameter(m_lightIntensityParameter); m_normalDiffuseSpecularEffect->addParameter(m_textureScaleParameter); q_func()->setEffect(m_normalDiffuseSpecularEffect); diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h index fcb85fe91..672dc19b3 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -80,8 +80,6 @@ public: QParameter *m_normalParameter; QParameter *m_specularParameter; QParameter *m_shininessParameter; - QParameter *m_lightPositionParameter; - QParameter *m_lightIntensityParameter; QParameter *m_textureScaleParameter; QTechnique *m_normalDiffuseSpecularGL3Technique; QTechnique *m_normalDiffuseSpecularGL2Technique; |