Add some more interesting lighting to the materials example

Useful for testing more of the lighting shader code paths.

Change-Id: Iae1403bbe8562cfc8a0d22784069080a421153f5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 155 insertions, 10 deletions

diff --git a/examples/qt3d/materials/Lights.qml b/examples/qt3d/materials/Lights.qml
new file mode 100644
index 000000000..efcb2e14e
--- /dev/null
+++ b/examples/qt3d/materials/Lights.qml
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** 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:BSD$
+** 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.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import Qt3D.Core 2.0
+import Qt3D.Render 2.0
+import Qt3D.Input 2.0
+import Qt3D.Extras 2.0
+
+Entity {
+    id: lights
+
+    // Point Light (pulsing)
+    Entity {
+        components: [
+            PointLight {
+                color: "red"
+                intensity: 0.3
+                constantAttenuation: 1.0
+                linearAttenuation: 0.0
+                quadraticAttenuation: 0.0025
+
+                NumberAnimation on intensity {
+                    from: 0.3; to: 0.8;
+                    running: true
+                    loops: Animation.Infinite
+                    duration: 1000
+                    easing.type: Easing.CosineCurve
+                }
+            },
+            Transform {
+                translation: Qt.vector3d(0.0, 5.0, 0.0)
+            }
+        ]
+    }
+
+    // 2 x Directional Lights (steady)
+    Entity {
+        components: [
+            DirectionalLight {
+                worldDirection: Qt.vector3d(0.3, -3.0, 0.0).normalized();
+                color: "#fbf9ce"
+                intensity: 0.3
+            }
+        ]
+    }
+
+    Entity {
+        components: [
+            DirectionalLight {
+                worldDirection: Qt.vector3d(-0.3, -0.3, 0.0).normalized();
+                color: "#9cdaef"
+                intensity: 0.15
+            }
+        ]
+    }
+
+    // Spot Light (sweeping)
+    Entity {
+        components: [
+            SpotLight {
+                localDirection: Qt.vector3d(0.0, -1.0, 0.0)
+                color: "white"
+                intensity: 0.6
+            },
+            Transform {
+                id: spotLightTransform
+                translation: Qt.vector3d(0.0, 5.0, 0.0)
+                rotationZ: -60.0
+
+
+                SequentialAnimation {
+                    loops: Animation.Infinite
+                    running: true
+
+                    NumberAnimation {
+                        target: spotLightTransform
+                        property: "rotationZ"
+                        from: -60; to: 60
+                        duration: 2000
+                        easing.type: Easing.InOutQuad
+                    }
+
+                    NumberAnimation {
+                        target: spotLightTransform
+                        property: "rotationZ"
+                        from: 60; to: -60
+                        duration: 2000
+                        easing.type: Easing.InOutQuad
+                    }
+                }
+            }
+        ]
+    }
+}
diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml
index 46a48c4e2..9ed9bd219 100644
--- a/examples/qt3d/materials/main.qml
+++ b/examples/qt3d/materials/main.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** 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.
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1 as QQ2
+import QtQuick 2.1
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 import Qt3D.Input 2.0
@@ -79,9 +79,11 @@ Entity {
 
     FirstPersonCameraController { camera: mainCamera }
 
+    Lights { }
+
     PhongMaterial {
         id: redAdsMaterial
-        ambient: Qt.rgba( 0.2, 0.0, 0.0, 1.0 )
+        ambient: Qt.rgba( 0.02, 0.02, 0.02, 1.0 )
         diffuse: Qt.rgba( 0.8, 0.0, 0.0, 1.0 )
     }
 
@@ -93,12 +95,12 @@ Entity {
         resolution: Qt.size(20, 20)
 
         material: NormalDiffuseSpecularMapMaterial {
-            ambient: Qt.rgba( 0.2, 0.2, 0.2, 1.0 )
+            ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
             diffuse:  "assets/textures/pattern_09/diffuse.webp"
             specular: "assets/textures/pattern_09/specular.webp"
             normal:   "assets/textures/pattern_09/normal.webp"
             textureScale: 10.0
-            shininess: 80.0
+            shininess: 10.0
         }
     }
 
@@ -108,18 +110,18 @@ Entity {
         y: 3.5
         scale: 0.5
 
-        QQ2.ParallelAnimation {
-            loops: QQ2.Animation.Infinite
+        ParallelAnimation {
+            loops: Animation.Infinite
             running: true
 
-            QQ2.NumberAnimation {
+            NumberAnimation {
                 target: trefoilKnot
                 property: "theta"
                 from: 0; to: 360
                 duration: 2000
             }
 
-            QQ2.NumberAnimation {
+            NumberAnimation {
                 target: trefoilKnot
                 property: "phi"
                 from: 0; to: 360
@@ -198,6 +200,6 @@ Entity {
         diffuseColor: "stainless_steel"
         bump: "no_bumps"
         specular: "stainless_steel"
-        shininess: 150
+        shininess: 15
     }
 }
diff --git a/examples/qt3d/materials/materials.qrc b/examples/qt3d/materials/materials.qrc
index 417653df9..b984a2778 100644
--- a/examples/qt3d/materials/materials.qrc
+++ b/examples/qt3d/materials/materials.qrc
@@ -9,5 +9,6 @@
         <file>Barrel.qml</file>
         <file>Chest.qml</file>
         <file>SortedForwardRenderer.qml</file>
+        <file>Lights.qml</file>
     </qresource>
 </RCC>