Fix NormalDiffuseMapAlpha material

It was using the phong alpha effect and not the proper effect which enables
alpha to coverage. Fixes materials-qml.

Change-Id: Idb73a8564beedb2509f56c90b2d941aebfd4d54a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 119 insertions, 7 deletions

diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri
index 46028557d..65271afeb 100644
--- a/src/quick3d/imports/extras/defaults/defaults.pri
+++ b/src/quick3d/imports/extras/defaults/defaults.pri
@@ -21,4 +21,5 @@ QML_FILES = \
     $$PWD/qml/PhongAlphaMaterial.qml \
     $$PWD/qml/TextureMaterial.qml \
     $$PWD/qml/OrbitCameraController.qml \
-    $$PWD/qml/FirstPersonCameraController.qml
+    $$PWD/qml/FirstPersonCameraController.qml \
+    $$PWD/qml/NormalDiffuseMapAlphaEffect.qml
diff --git a/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaEffect.qml b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaEffect.qml
new file mode 100644
index 000000000..e4f038642
--- /dev/null
+++ b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaEffect.qml
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt3D.Core 2.0
+import Qt3D.Render 2.0
+
+Effect {
+    property string vertexES: "qrc:/shaders/es2/normaldiffusemap.vert"
+    property string fragmentES: "qrc:/shaders/es2/normaldiffusemapalpha.frag"
+    property string vertex: "qrc:/shaders/gl3/normaldiffusemap.vert"
+    property string fragment: "qrc:/shaders/gl3/normaldiffusemapalpha.frag"
+
+    FilterKey {
+        id: forward
+        name: "renderingStyle"
+        value: "forward"
+    }
+
+    ShaderProgram {
+        id: gl2Es2Shader
+        vertexShaderCode:   loadSource(vertexES)
+        fragmentShaderCode: loadSource(fragmentES)
+    }
+
+    ShaderProgram {
+        id: gl3Shader
+        vertexShaderCode:   loadSource(vertex)
+        fragmentShaderCode: loadSource(fragment)
+    }
+
+    AlphaCoverage { id: alphaCoverage }
+
+    techniques: [
+        // OpenGL 3.1
+        Technique {
+            filterKeys: [ forward ]
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.CoreProfile
+                majorVersion: 3
+                minorVersion: 1
+            }
+            renderPasses: RenderPass {
+                shaderProgram: gl3Shader
+                renderStates: [ alphaCoverage ]
+            }
+        },
+
+        // OpenGL 2.1
+        Technique {
+            filterKeys: [ forward ]
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGL
+                profile: GraphicsApiFilter.NoProfile
+                majorVersion: 2
+                minorVersion: 0
+            }
+            renderPasses: RenderPass {
+                shaderProgram: gl2Es2Shader
+                renderStates: [ alphaCoverage ]
+            }
+        },
+
+        // OpenGL ES 2
+        Technique {
+            filterKeys: [ forward ]
+            graphicsApiFilter {
+                api: GraphicsApiFilter.OpenGLES
+                profile: GraphicsApiFilter.NoProfile
+                majorVersion: 2
+                minorVersion: 0
+            }
+            renderPasses: RenderPass {
+                shaderProgram: gl2Es2Shader
+                renderStates: [ alphaCoverage ]
+            }
+        }
+    ]
+}
diff --git a/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index 99d9c0a3d..421cc3aa9 100644
--- a/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -87,11 +87,6 @@ Material {
         Parameter { name: "texCoordScale"; value: textureScale }
     ]
 
-    effect: DefaultAlphaEffect {
-        vertexES: "qrc:/shaders/es2/normaldiffusemap.vert"
-        fragmentES: "qrc:/shaders/es2/normaldiffusemapalpha.frag"
-        vertex: "qrc:/shaders/gl3/normaldiffusemap.vert"
-        fragment: "qrc:/shaders/gl3/normaldiffusemapalpha.frag"
-    }
+    effect: NormalDiffuseMapAlphaEffect { }
 }
 
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index 7b5f138ae..2746c62b2 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -72,6 +72,7 @@ static const struct {
     // Effects
     { "DefaultEffect", 2, 0 },
     { "DefaultAlphaEffect", 2, 0 },
+    { "NormalDiffuseMapAlphaEffect", 2, 0 },
     // FrameGraphs
     { "ForwardRenderer", 2, 0 },
     // Entities