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>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index 36de0b302..ab1727e2d 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -97,21 +97,15 @@ Material {
     ]
 
     effect: Effect {
-
-        parameters: [
-            Parameter { name: "lightPosition";  value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
-            Parameter { name: "lightIntensity"; value: Qt.vector3d( 1.0, 1.0, 1.0 ) }
-        ]
-
         ShaderProgram {
             id: gl2Es2Shader
-            vertexShaderCode:   loadSource("qrc:/shaders/es2/normaldiffusespecularmap.vert")
+            vertexShaderCode:   loadSource("qrc:/shaders/es2/normaldiffusemap.vert")
             fragmentShaderCode: loadSource("qrc:/shaders/es2/normaldiffusespecularmap.frag")
         }
 
         ShaderProgram {
             id: gl3Shader
-            vertexShaderCode:   loadSource("qrc:/shaders/gl3/normaldiffusespecularmap.vert")
+            vertexShaderCode:   loadSource("qrc:/shaders/gl3/normaldiffusemap.vert")
             fragmentShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusespecularmap.frag")
         }