Integrate latest datainput UIP format changes

Parse special char "$" denoting datainput name in UIP parser. Add Variant
type datainput. Fix timeline controller goToTime calculation. Add example
(without textstring controller due to bug QT3DS-1413). Add new datatypes
to profiling UI.

Task-ID: QT3DS-1477

Change-Id: Iba0fa0ef19c8380e6961bce8d8846c776065aa30
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

8 files changed, 343 insertions, 1 deletions

diff --git a/examples/3dstudioruntime2/3dstudioruntime2.pro b/examples/3dstudioruntime2/3dstudioruntime2.pro
index 9f1b2c5..1ad83f1 100644
--- a/examples/3dstudioruntime2/3dstudioruntime2.pro
+++ b/examples/3dstudioruntime2/3dstudioruntime2.pro
@@ -5,7 +5,8 @@ SUBDIRS += \
     simpleoffscreen
 
 qtHaveModule(quick) {
-    SUBDIRS += simpleqml
+    SUBDIRS += simpleqml \
+               qmldatainput
 }
 
 qtHaveModule(widgets) {
diff --git a/examples/3dstudioruntime2/qmldatainput/main.cpp b/examples/3dstudioruntime2/qmldatainput/main.cpp
new file mode 100644
index 0000000..6d0db02
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/main.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $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$
+**
+****************************************************************************/
+
+#include <QtWidgets/QApplication>
+#include <QtQuick/QQuickView>
+#include <q3dsruntimeglobal.h>
+#ifdef USE_EMBEDDED_FONTS
+#include <QtGui/QFontDatabase>
+#include <QtCore/QDebug>
+#endif
+
+int main(int argc, char *argv[])
+{
+    qputenv("QSG_INFO", "1");
+
+    QApplication app(argc, argv);
+    QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat());
+
+    QQuickView viewer;
+    viewer.setSource(QUrl("qrc:/qml/qmldatainput/main.qml"));
+
+    viewer.setTitle(QStringLiteral("Qt 3D Studio Example"));
+    viewer.setResizeMode(QQuickView::SizeRootObjectToView);
+    viewer.resize(1280, 720);
+    viewer.show();
+
+    return app.exec();
+}
diff --git a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia
new file mode 100644
index 0000000..2abe03b
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application>
+	<assets initial="datainput">
+		<presentation id="datainput" src="datainput.uip"/>
+		<dataInput name="rangeInput" type="Ranged Number" min="0" max="360"/>
+		<dataInput name="scaleInput" type="Vector3"/>
+		<dataInput name="stringInput" type="String"/>
+		<dataInput name="colorInput" type="Vector3"/>
+		<dataInput name="cameraRotInput" type="Vector3"/>
+		<dataInput name="variantInput" type="Variant"/>
+	</assets>
+	<statemachine ref="#logic">
+		<visual-states>
+			<state ref="Initial">
+				<enter>
+					<goto-slide element="main:Scene" rel="next"/>
+				</enter>
+			</state>
+		</visual-states>
+	</statemachine>
+</application>
diff --git a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip
new file mode 100644
index 0000000..6b47e44
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3" >
+	<Project >
+		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" >
+			<CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>
+		</ProjectSettings>
+		<Graph >
+			<Scene id="Scene" controlledproperty="$rangeInput @timeline" >
+				<Layer id="Layer" >
+					<Camera id="Camera" />
+					<Light id="Light" />
+					<Text id="Text" />
+					<Text id="Text2" />
+					<Model id="Cone" >
+						<Material id="Default" name="Default" />
+					</Model>
+					<Model id="Cylinder" >
+						<Material id="Default_002" name="Default" />
+					</Model>
+					<Text id="Text6" />
+					<Text id="Text8" />
+					<Model id="Cube2" >
+						<Material id="Default_003" name="Default" />
+					</Model>
+					<Text id="Text3" />
+					<Text id="Text4" />
+				</Layer>
+			</Scene>
+		</Graph>
+		<Logic >
+			<State name="Master Slide" component="#Scene" >
+				<Add ref="#Layer" multisampleaa="None" progressiveaa="4x" temporalaa="True" />
+				<Add ref="#Camera" controlledproperty="$cameraRotInput rotation" pivot="0 0 0" rotation="0 0 0" />
+				<Add ref="#Light" castshadow="True" controlledproperty="$colorInput lightdiffuse" lightdiffuse="1 0 0" position="-350.984 -229.258 -30" />
+				<State id="Scene-Slide1" name="Slide1" initialplaystate="Pause" >
+					<Add ref="#Text" name="Text" font="TitilliumWeb-Regular" position="216.513 76.6172 -113.498" scale="1 1 1" size="24" textstring="0" >
+						<AnimationTrack property="rotation.x" type="EaseInOut" >0 0 0 0 10 0 0 0</AnimationTrack>
+						<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 10 0 0 0</AnimationTrack>
+						<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 10 -360 0 0</AnimationTrack>
+					</Add>
+					<Add ref="#Text2" name="Text2" controlledproperty="" font="TitilliumWeb-Regular" position="259.808 217.95 0" scale="1 1 1" size="16" textstring="Text control&#10;Rotation animation control via datainput timeline control" />
+					<Add ref="#Cone" name="Cone" controlledproperty="$scaleInput scale" position="-417.135 -225.166 0" sourcepath="#Cone" />
+					<Add ref="#Default" />
+					<Add ref="#Cylinder" name="Cylinder" controlledproperty="$variantInput opacity" position="131.347 -180.422 0" sourcepath="#Cylinder" />
+					<Add ref="#Default_002" />
+					<Add ref="#Text6" name="Text6" font="TitilliumWeb-Regular" position="135.678 -300.019 -8.28656" size="16" textstring="Opacity control&#10;(Variant type)" />
+					<Add ref="#Text8" name="Text8" font="TitilliumWeb-Regular" position="-428.683 -290.118 0" size="16" textstring="Scale control" />
+					<Add ref="#Cube2" name="Cube2" controlledproperty="$vec3Input rotation" position="409.919 -177.535 0" sourcepath="#Cube" />
+					<Add ref="#Default_003" controlledproperty="$vec3Input2 diffuse" />
+					<Add ref="#Text3" name="Text3" font="TitilliumWeb-Regular" position="434.456 -304.552 0" size="16" textstring="Rotation control&#10;Diffuse color control" />
+					<Add ref="#Text4" name="Text4" font="TitilliumWeb-Regular" position="-381.051 290.118 0" size="18" textstring="Directional light color and Camera xy &#10;rotation controlled via Datainput" />
+				</State>
+			</State>
+		</Logic>
+	</Project>
+</UIP>
diff --git a/examples/3dstudioruntime2/qmldatainput/presentation/fonts/TitilliumWeb-Regular.ttf b/examples/3dstudioruntime2/qmldatainput/presentation/fonts/TitilliumWeb-Regular.ttf
new file mode 100644
index 0000000..6da8219
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/presentation/fonts/TitilliumWeb-Regular.ttf
diff --git a/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml b/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml
new file mode 100644
index 0000000..ef7d0e7
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $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.7
+import QtStudio3D 2.0
+
+Item {
+    id: mainview
+    width: 1280
+    height: 768
+    visible: true
+
+    Studio3D {
+        id: studio3D
+        anchors.fill: parent
+
+        property real inputNumber: 0
+        property vector3d inputColorVec3: Qt.vector3d(0, 0, 0)
+        property vector3d inputCamRotVec3: Qt.vector3d(0, 0, 0)
+        property vector3d inputScaleVec3: Qt.vector3d(0, 0, 0)
+        property string inputString: ""
+        property variant inputVariant: 0
+
+        // A changing property to demonstrate DataInput
+        NumberAnimation {
+            target: studio3D
+            property: "inputNumber"
+            duration: 20000
+            from: 0
+            to: 360
+            loops: Animation.Infinite
+            running: true
+        }
+        Vector3dAnimation {
+            target: studio3D
+            property: "inputScaleVec3"
+            duration: 12000
+            from: Qt.vector3d(0.3, 0.5, 0.5)
+            to: Qt.vector3d(1.0, 1.0, 1.0)
+            loops: Animation.Infinite
+            running: true
+        }
+        Vector3dAnimation {
+            target: studio3D
+            property: "inputColorVec3"
+            duration: 2000
+            from: Qt.vector3d(0.1, 0.1, 0.3)
+            to: Qt.vector3d(1.0, 0.5, 1.0)
+            loops: Animation.Infinite
+            running: true
+        }
+        Vector3dAnimation {
+            target: studio3D
+            property: "inputCamRotVec3"
+            duration: 20000
+            from: Qt.vector3d(-5, -5, 0.0)
+            to: Qt.vector3d(10.0, 10.1, 10.0)
+            loops: Animation.Infinite
+            running: true
+        }
+        NumberAnimation {
+            target: studio3D
+            property: "inputString"
+            duration: 20000
+            from: 0
+            to: 1
+            loops: Animation.Infinite
+            running: true
+        }
+        NumberAnimation {
+            target: studio3D
+            property: "inputVariant"
+            duration: 5000
+            from: 20
+            to: 100
+            loops: Animation.Infinite
+            running: true
+        }
+
+        // Presentation item is used to control the presentation.
+        //![1]
+        Presentation {
+            source: "qrc:/presentation/datainput.uia"
+            DataInput {
+                // Name must match the data input name specified in the presentation
+                name: "rangeInput"
+                value: studio3D.inputNumber
+            }
+            DataInput {
+                name: "scaleInput"
+                value: studio3D.inputScaleVec3
+            }
+            DataInput {
+                name: "colorInput"
+                value: studio3D.inputColorVec3
+            }
+            DataInput {
+                name: "cameraRotInput"
+                value: studio3D.inputCamRotVec3
+            }
+            DataInput {
+                name: "stringInput"
+                value: studio3D.inputString
+            }
+            DataInput {
+                name: "variantInput"
+                value: studio3D.inputVariant
+            }
+        }
+        //![1]
+    }
+
+}
diff --git a/examples/3dstudioruntime2/qmldatainput/qmldatainput.pro b/examples/3dstudioruntime2/qmldatainput/qmldatainput.pro
new file mode 100644
index 0000000..8d44d94
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/qmldatainput.pro
@@ -0,0 +1,22 @@
+#include(../examples.pri)
+
+TEMPLATE = app
+
+QT += widgets qml quick 3dstudioruntime2
+
+integrity: DEFINES += USE_EMBEDDED_FONTS
+
+target.path = $$[QT_INSTALL_EXAMPLES]/3dstudioruntime2/$$TARGET
+INSTALLS += target
+
+SOURCES += main.cpp
+
+RESOURCES += \
+    qmldatainput.qrc
+
+OTHER_FILES += qml/qmldatainput/* \
+               doc/src/* \
+               doc/images/*
+
+# Icon in case example is included in installer
+exists(example.ico): RC_ICONS = example.ico
diff --git a/examples/3dstudioruntime2/qmldatainput/qmldatainput.qrc b/examples/3dstudioruntime2/qmldatainput/qmldatainput.qrc
new file mode 100644
index 0000000..6fb7388
--- /dev/null
+++ b/examples/3dstudioruntime2/qmldatainput/qmldatainput.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/qmldatainput/main.qml</file>
+        <file>presentation/datainput.uia</file>
+        <file>presentation/datainput.uip</file>
+    </qresource>
+</RCC>