From fa2a03502f6b2ea0f2da59143fe7e06246c4c0fa Mon Sep 17 00:00:00 2001 From: Janne Kangas Date: Fri, 27 Apr 2018 13:45:39 +0300 Subject: 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 --- examples/3dstudioruntime2/3dstudioruntime2.pro | 3 +- examples/3dstudioruntime2/qmldatainput/main.cpp | 75 ++++++++++ .../qmldatainput/presentation/datainput.uia | 21 +++ .../qmldatainput/presentation/datainput.uip | 56 ++++++++ .../presentation/fonts/TitilliumWeb-Regular.ttf | Bin 0 -> 63752 bytes .../qmldatainput/qml/qmldatainput/main.qml | 160 +++++++++++++++++++++ .../3dstudioruntime2/qmldatainput/qmldatainput.pro | 22 +++ .../3dstudioruntime2/qmldatainput/qmldatainput.qrc | 7 + 8 files changed, 343 insertions(+), 1 deletion(-) create mode 100644 examples/3dstudioruntime2/qmldatainput/main.cpp create mode 100644 examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia create mode 100644 examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip create mode 100644 examples/3dstudioruntime2/qmldatainput/presentation/fonts/TitilliumWeb-Regular.ttf create mode 100644 examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml create mode 100644 examples/3dstudioruntime2/qmldatainput/qmldatainput.pro create mode 100644 examples/3dstudioruntime2/qmldatainput/qmldatainput.qrc (limited to 'examples') 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 +#include +#include +#ifdef USE_EMBEDDED_FONTS +#include +#include +#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 @@ + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 0 0 10 0 0 0 + 0 0 0 0 10 0 0 0 + 0 0 0 0 10 -360 0 0 + + + + + + + + + + + + + + + + + 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 Binary files /dev/null and b/examples/3dstudioruntime2/qmldatainput/presentation/fonts/TitilliumWeb-Regular.ttf differ 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 @@ + + + qml/qmldatainput/main.qml + presentation/datainput.uia + presentation/datainput.uip + + -- cgit v1.2.3