Upgrade to AssImp library v2.0.863.

Also includes a new example.

Task-number: QTBUG-22194.
Change-Id: I9b8cb61f805b9011b6478532be83aa6d9a45111e
Reviewed-by: Danny Pope <daniel.pope@nokia.com>

13 files changed, 823 insertions, 1 deletions

diff --git a/examples/quick3d/animations/animations.pro b/examples/quick3d/animations/animations.pro
new file mode 100644
index 000000000..b8c6615ca
--- /dev/null
+++ b/examples/quick3d/animations/animations.pro
@@ -0,0 +1,30 @@
+TEMPLATE = app
+TARGET = animations_qml
+QT += declarative quick
+CONFIG += qt warn_on
+
+SOURCES += main.cpp
+
+ICON_FILE = ../icon.png
+
+QML_FILES = \
+    qml/Animations.qml \
+    qml/desktop.qml
+
+QML_INFRA_FILES = \
+    $$QML_FILES \
+    qml/qtlogo.png \
+    qml/cube_rotated.dae \
+    qml/stonewal.jpg
+
+CATEGORY = examples
+include(../../../pkg.pri)
+
+INSTALL_DIRS = qml
+mt: INSTALL_FILES = mt.qml
+
+OTHER_FILES += \
+    animations_qml.rc \
+    $$QML_INFRA_FILES
+
+RC_FILE = animations_qml.rc
diff --git a/examples/quick3d/animations/animations.qrc b/examples/quick3d/animations/animations.qrc
new file mode 100644
index 000000000..0336aaa93
--- /dev/null
+++ b/examples/quick3d/animations/animations.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/cube_rotated.dae</file>
+        <file>qml/animations.qml</file>
+        <file>qml/stonewal.jpg</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick3d/animations/animations_qml.qmlproject b/examples/quick3d/animations/animations_qml.qmlproject
new file mode 100644
index 000000000..37c467f13
--- /dev/null
+++ b/examples/quick3d/animations/animations_qml.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+     importPaths: [".", "../../imports/"]
+}
diff --git a/examples/quick3d/animations/animations_qml.rc b/examples/quick3d/animations/animations_qml.rc
new file mode 100644
index 000000000..1b6228c97
--- /dev/null
+++ b/examples/quick3d/animations/animations_qml.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/animations/main.cpp b/examples/quick3d/animations/main.cpp
new file mode 100644
index 000000000..bb051b358
--- /dev/null
+++ b/examples/quick3d/animations/main.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 Nokia Corporation and its Subsidiary(-ies) 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$
+**
+****************************************************************************/
+
+#include "../qmlres.h"
+
+QUICK3D_EXAMPLE_MAIN("qml/desktop.qml")
diff --git a/examples/quick3d/animations/mt.qml b/examples/quick3d/animations/mt.qml
new file mode 100644
index 000000000..ed848a8a0
--- /dev/null
+++ b/examples/quick3d/animations/mt.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 Nokia Corporation and its Subsidiary(-ies) 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.0
+import Qt3D 1.0
+import Qt3D.Shapes 1.0
+import "qml"
+
+Item {
+    width: 320
+    height: 480
+
+    Cube {
+    }
+}
diff --git a/examples/quick3d/animations/qml/Animations.qml b/examples/quick3d/animations/qml/Animations.qml
new file mode 100644
index 000000000..dae424727
--- /dev/null
+++ b/examples/quick3d/animations/qml/Animations.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 Nokia Corporation and its Subsidiary(-ies) 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$
+**
+****************************************************************************/
+//! [1]
+import QtQuick 2.0
+import Qt3D 1.0
+
+Viewport {
+    width: parent.width;
+    height: parent.height
+    renderMode: "DirectRender"
+    fillColor: "darkblue"
+    objectName: "anim viewport"
+
+    camera: Camera {
+        eye: Qt.vector3d(0, 80, 200)
+    }
+
+    Item3D {
+        mesh: Mesh { source: "cube_rotated.dae" }
+        effect: Effect { texture: "stonewal.jpg" }
+    }
+}
+//! [3]
diff --git a/examples/quick3d/animations/qml/cube_rotated.dae b/examples/quick3d/animations/qml/cube_rotated.dae
new file mode 100644
index 000000000..ac681b5fb
--- /dev/null
+++ b/examples/quick3d/animations/qml/cube_rotated.dae
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.0">
+  <asset>
+    <contributor>
+      <author></author>
+      <authoring_tool>FBX COLLADA exporter</authoring_tool>
+      <comments></comments>
+    </contributor>
+    <created>2012-01-09T10:08:02Z</created>
+    <modified>2012-01-09T10:08:02Z</modified>
+    <revision></revision>
+    <title></title>
+    <subject></subject>
+    <keywords></keywords>
+    <unit meter="0.025400"/>
+    <up_axis>Y_UP</up_axis>
+  </asset>
+  <library_images>
+    <image id="Map__2-image" name="Map__2">
+      <init_from>file://stonewal.jpg</init_from>
+    </image>
+    <image id="Map__1-image" name="Map__1">
+      <init_from>file://stonewal.jpg</init_from>
+    </image>
+  </library_images>
+  <library_materials>
+    <material id="_02___Default" name="_02___Default">
+      <instance_effect url="#_02___Default-fx"/>
+    </material>
+    <material id="_01___Default" name="_01___Default">
+      <instance_effect url="#_01___Default-fx"/>
+    </material>
+  </library_materials>
+  <library_effects>
+    <effect id="_02___Default-fx" name="_02___Default">
+      <profile_COMMON>
+        <technique sid="standard">
+          <phong>
+            <emission>
+              <color sid="emission">0.000000  0.000000 0.000000 1.000000</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0.588235  0.588235 0.588235 1.000000</color>
+            </ambient>
+            <diffuse>
+              <texture texture="Map__2-image" texcoord="CHANNEL0">
+                <extra>
+                  <technique profile="MAYA">
+                    <wrapU sid="wrapU0">TRUE</wrapU>
+                    <wrapV sid="wrapV0">TRUE</wrapV>
+                    <blend_mode>ADD</blend_mode>
+                  </technique>
+                </extra>
+              </texture>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.000000  0.000000 0.000000 1.000000</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">2.000000</float>
+            </shininess>
+            <reflective>
+              <color sid="reflective">0.000000  0.000000 0.000000 1.000000</color>
+            </reflective>
+            <reflectivity>
+              <float sid="reflectivity">1.000000</float>
+            </reflectivity>
+            <transparent>
+              <color sid="transparent">1.000000  1.000000 1.000000 1.000000</color>
+            </transparent>
+            <transparency>
+              <float sid="transparency">0.000000</float>
+            </transparency>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+    <effect id="_01___Default-fx" name="_01___Default">
+      <profile_COMMON>
+        <technique sid="standard">
+          <phong>
+            <emission>
+              <color sid="emission">0.000000  0.000000 0.000000 1.000000</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0.588235  0.588235 0.588235 1.000000</color>
+            </ambient>
+            <diffuse>
+              <texture texture="Map__1-image" texcoord="CHANNEL0">
+                <extra>
+                  <technique profile="MAYA">
+                    <wrapU sid="wrapU0">TRUE</wrapU>
+                    <wrapV sid="wrapV0">TRUE</wrapV>
+                    <blend_mode>ADD</blend_mode>
+                  </technique>
+                </extra>
+              </texture>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.000000  0.000000 0.000000 1.000000</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">2.000000</float>
+            </shininess>
+            <reflective>
+              <color sid="reflective">0.000000  0.000000 0.000000 1.000000</color>
+            </reflective>
+            <reflectivity>
+              <float sid="reflectivity">1.000000</float>
+            </reflectivity>
+            <transparent>
+              <color sid="transparent">1.000000  1.000000 1.000000 1.000000</color>
+            </transparent>
+            <transparency>
+              <float sid="transparency">0.000000</float>
+            </transparency>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_geometries>
+    <geometry id="Box01-lib" name="Box01Mesh">
+      <mesh>
+        <source id="Box01-lib-Position">
+          <float_array id="Box01-lib-Position-array" count="24">
+-50.000000 -50.000000 0.000000
+50.000000 -50.000000 0.000000
+-50.000000 50.000000 0.000000
+50.000000 50.000000 0.000000
+-50.000000 -50.000000 1.000000
+50.000000 -50.000000 1.000000
+-50.000000 50.000000 1.000000
+50.000000 50.000000 1.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box01-lib-Position-array" count="8" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box01-lib-Normal0">
+          <float_array id="Box01-lib-Normal0-array" count="108">
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box01-lib-Normal0-array" count="36" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box01-lib-UV0">
+          <float_array id="Box01-lib-UV0-array" count="24">
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box01-lib-UV0-array" count="12" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Box01-lib-Vertex">
+          <input semantic="POSITION" source="#Box01-lib-Position"/>
+        </vertices>
+        <polygons material="_02___Default" count="12">
+          <input semantic="VERTEX" offset="0" source="#Box01-lib-Vertex"/>
+          <input semantic="NORMAL" offset="1" source="#Box01-lib-Normal0"/>
+          <input semantic="TEXCOORD" offset="2" set="0" source="#Box01-lib-UV0"/>
+          <p>0 0 9 2 1 11 3 2 10</p>
+          <p>3 3 10 1 4 8 0 5 9</p>
+          <p>4 6 8 5 7 9 7 8 11</p>
+          <p>7 9 11 6 10 10 4 11 8</p>
+          <p>0 12 4 1 13 5 5 14 7</p>
+          <p>5 15 7 4 16 6 0 17 4</p>
+          <p>1 18 0 3 19 1 7 20 3</p>
+          <p>7 21 3 5 22 2 1 23 0</p>
+          <p>3 24 4 2 25 5 6 26 7</p>
+          <p>6 27 7 7 28 6 3 29 4</p>
+          <p>2 30 0 0 31 1 4 32 3</p>
+          <p>4 33 3 6 34 2 2 35 0</p>
+        </polygons>
+      </mesh>
+    </geometry>
+    <geometry id="Box02-lib" name="Box02Mesh">
+      <mesh>
+        <source id="Box02-lib-Position">
+          <float_array id="Box02-lib-Position-array" count="24">
+-20.000000 -20.000000 0.000000
+20.000000 -20.000000 0.000000
+-20.000000 20.000000 0.000000
+20.000000 20.000000 0.000000
+-20.000000 -20.000000 20.000000
+20.000000 -20.000000 20.000000
+-20.000000 20.000000 20.000000
+20.000000 20.000000 20.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box02-lib-Position-array" count="8" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-lib-Normal0">
+          <float_array id="Box02-lib-Normal0-array" count="108">
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 -1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+0.000000 -1.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 0.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 0.000000 0.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box02-lib-Normal0-array" count="36" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-lib-UV0">
+          <float_array id="Box02-lib-UV0-array" count="24">
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+0.000000 0.000000
+1.000000 0.000000
+0.000000 1.000000
+1.000000 1.000000
+</float_array>
+          <technique_common>
+            <accessor source="#Box02-lib-UV0-array" count="12" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Box02-lib-Vertex">
+          <input semantic="POSITION" source="#Box02-lib-Position"/>
+        </vertices>
+        <polygons material="_01___Default" count="12">
+          <input semantic="VERTEX" offset="0" source="#Box02-lib-Vertex"/>
+          <input semantic="NORMAL" offset="1" source="#Box02-lib-Normal0"/>
+          <input semantic="TEXCOORD" offset="2" set="0" source="#Box02-lib-UV0"/>
+          <p>0 0 9 2 1 11 3 2 10</p>
+          <p>3 3 10 1 4 8 0 5 9</p>
+          <p>4 6 8 5 7 9 7 8 11</p>
+          <p>7 9 11 6 10 10 4 11 8</p>
+          <p>0 12 4 1 13 5 5 14 7</p>
+          <p>5 15 7 4 16 6 0 17 4</p>
+          <p>1 18 0 3 19 1 7 20 3</p>
+          <p>7 21 3 5 22 2 1 23 0</p>
+          <p>3 24 4 2 25 5 6 26 7</p>
+          <p>6 27 7 7 28 6 3 29 4</p>
+          <p>2 30 0 0 31 1 4 32 3</p>
+          <p>4 33 3 6 34 2 2 35 0</p>
+        </polygons>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_animations>
+    <animation id="Box02-anim" name="Box02">
+      <animation>
+        <source id="Box02-rotateX-animation-inputANGLE">
+          <float_array id="Box02-rotateX-animation-inputANGLE-array" count="2">
+
+0.000000 0.800000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateX-animation-inputANGLE-array" count="2">
+              <param name="TIME" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateX-animation-outputANGLE">
+          <float_array id="Box02-rotateX-animation-outputANGLE-array" count="2">
+
+0.000000 0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateX-animation-outputANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateX-animation-intanANGLE">
+          <float_array id="Box02-rotateX-animation-intanANGLE-array" count="2">
+
+0.000000 -0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateX-animation-intanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateX-animation-outtanANGLE">
+          <float_array id="Box02-rotateX-animation-outtanANGLE-array" count="2">
+
+0.000000 0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateX-animation-outtanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateX-animation-interpolationANGLE">
+          <Name_array id="Box02-rotateX-animation-interpolationANGLE-array" count="2">
+ BEZIER BEZIER</Name_array>
+          <technique_common>
+            <accessor source="#Box02-rotateX-animation-interpolationANGLE-array" count="2">
+              <param type="name"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <sampler id="Box02-rotateX-animationANGLE">
+          <input semantic="INPUT" source="#Box02-rotateX-animation-inputANGLE"/>
+          <input semantic="OUTPUT" source="#Box02-rotateX-animation-outputANGLE"/>
+          <input semantic="IN_TANGENT" source="#Box02-rotateX-animation-intanANGLE"/>
+          <input semantic="OUT_TANGENT" source="#Box02-rotateX-animation-outtanANGLE"/>
+          <input semantic="INTERPOLATION" source="#Box02-rotateX-animation-interpolationANGLE"/>
+        </sampler>
+        <channel source="#Box02-rotateX-animationANGLE" target="Box02/rotateX.ANGLE"/>
+      </animation>
+      <animation>
+        <source id="Box02-rotateY-animation-inputANGLE">
+          <float_array id="Box02-rotateY-animation-inputANGLE-array" count="2">
+
+0.000000 0.800000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateY-animation-inputANGLE-array" count="2">
+              <param name="TIME" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateY-animation-outputANGLE">
+          <float_array id="Box02-rotateY-animation-outputANGLE-array" count="2">
+
+-0.000000 -0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateY-animation-outputANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateY-animation-intanANGLE">
+          <float_array id="Box02-rotateY-animation-intanANGLE-array" count="2">
+
+0.000000 -0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateY-animation-intanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateY-animation-outtanANGLE">
+          <float_array id="Box02-rotateY-animation-outtanANGLE-array" count="2">
+
+0.000000 0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateY-animation-outtanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateY-animation-interpolationANGLE">
+          <Name_array id="Box02-rotateY-animation-interpolationANGLE-array" count="2">
+ BEZIER BEZIER</Name_array>
+          <technique_common>
+            <accessor source="#Box02-rotateY-animation-interpolationANGLE-array" count="2">
+              <param type="name"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <sampler id="Box02-rotateY-animationANGLE">
+          <input semantic="INPUT" source="#Box02-rotateY-animation-inputANGLE"/>
+          <input semantic="OUTPUT" source="#Box02-rotateY-animation-outputANGLE"/>
+          <input semantic="IN_TANGENT" source="#Box02-rotateY-animation-intanANGLE"/>
+          <input semantic="OUT_TANGENT" source="#Box02-rotateY-animation-outtanANGLE"/>
+          <input semantic="INTERPOLATION" source="#Box02-rotateY-animation-interpolationANGLE"/>
+        </sampler>
+        <channel source="#Box02-rotateY-animationANGLE" target="Box02/rotateY.ANGLE"/>
+      </animation>
+      <animation>
+        <source id="Box02-rotateZ-animation-inputANGLE">
+          <float_array id="Box02-rotateZ-animation-inputANGLE-array" count="2">
+
+0.000000 0.800000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateZ-animation-inputANGLE-array" count="2">
+              <param name="TIME" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateZ-animation-outputANGLE">
+          <float_array id="Box02-rotateZ-animation-outputANGLE-array" count="2">
+
+0.000000 90.000008</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateZ-animation-outputANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateZ-animation-intanANGLE">
+          <float_array id="Box02-rotateZ-animation-intanANGLE-array" count="2">
+
+0.000000 -0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateZ-animation-intanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateZ-animation-outtanANGLE">
+          <float_array id="Box02-rotateZ-animation-outtanANGLE-array" count="2">
+
+0.000000 0.000000</float_array>
+          <technique_common>
+            <accessor source="#Box02-rotateZ-animation-outtanANGLE-array" count="2">
+              <param name="ANGLE" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Box02-rotateZ-animation-interpolationANGLE">
+          <Name_array id="Box02-rotateZ-animation-interpolationANGLE-array" count="2">
+ BEZIER BEZIER</Name_array>
+          <technique_common>
+            <accessor source="#Box02-rotateZ-animation-interpolationANGLE-array" count="2">
+              <param type="name"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <sampler id="Box02-rotateZ-animationANGLE">
+          <input semantic="INPUT" source="#Box02-rotateZ-animation-inputANGLE"/>
+          <input semantic="OUTPUT" source="#Box02-rotateZ-animation-outputANGLE"/>
+          <input semantic="IN_TANGENT" source="#Box02-rotateZ-animation-intanANGLE"/>
+          <input semantic="OUT_TANGENT" source="#Box02-rotateZ-animation-outtanANGLE"/>
+          <input semantic="INTERPOLATION" source="#Box02-rotateZ-animation-interpolationANGLE"/>
+        </sampler>
+        <channel source="#Box02-rotateZ-animationANGLE" target="Box02/rotateZ.ANGLE"/>
+      </animation>
+    </animation>
+  </library_animations>
+  <library_visual_scenes>
+    <visual_scene id="RootNode" name="RootNode">
+      <node id="Box01" name="Box01">
+        <rotate sid="jointOrientX">1 0 0 -90.000000</rotate>
+        <instance_geometry url="#Box01-lib">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="_02___Default" target="#_02___Default"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+      <node id="Box02" name="Box02">
+        <translate sid="translate">0.000000 5.000000 -0.000000</translate>
+        <rotate sid="jointOrientX">1 0 0 -90.000000</rotate>
+        <rotate sid="rotateZ">0 0 1 0.000000</rotate>
+        <rotate sid="rotateY">0 1 0 0.000000</rotate>
+        <rotate sid="rotateX">1 0 0 0.000000</rotate>
+        <instance_geometry url="#Box02-lib">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="_01___Default" target="#_01___Default"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#RootNode"/>
+  </scene>
+</COLLADA>
+
diff --git a/examples/quick3d/animations/qml/desktop.qml b/examples/quick3d/animations/qml/desktop.qml
new file mode 100644
index 000000000..178b53e5a
--- /dev/null
+++ b/examples/quick3d/animations/qml/desktop.qml
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 Nokia Corporation and its Subsidiary(-ies) 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.0
+import Qt3D 1.0
+import "."
+
+Item {
+    width: 640
+    height: 480
+
+    Animations {
+    }
+}
diff --git a/examples/quick3d/animations/qml/qtlogo.png b/examples/quick3d/animations/qml/qtlogo.png
new file mode 100644
index 000000000..7d3e97eb3
--- /dev/null
+++ b/examples/quick3d/animations/qml/qtlogo.png
diff --git a/examples/quick3d/animations/qml/stonewal.jpg b/examples/quick3d/animations/qml/stonewal.jpg
new file mode 100644
index 000000000..226672a29
--- /dev/null
+++ b/examples/quick3d/animations/qml/stonewal.jpg
diff --git a/examples/quick3d/animations/qtquick3d.ico b/examples/quick3d/animations/qtquick3d.ico
new file mode 100644
index 000000000..b3b85e37b
--- /dev/null
+++ b/examples/quick3d/animations/qtquick3d.ico
diff --git a/examples/quick3d/quick3d.pro b/examples/quick3d/quick3d.pro
index d95070ccc..c06e7b1bb 100644
--- a/examples/quick3d/quick3d.pro
+++ b/examples/quick3d/quick3d.pro
@@ -9,4 +9,5 @@ SUBDIRS += \
     moon \
     photoroom \
     shaders \
-    sphere
+    sphere \
+    animations