From 52f3ec01c0f9e7170dd375de688541baf353bf81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Tue, 17 Sep 2019 14:44:27 +0300 Subject: Add dynamic loading example Add example for deferred loading of images and subpresentations. Task-number: QT3DS-3941 Change-Id: Ica8a38238141f5aff92b09d1f953e3cb58d1109a Reviewed-by: Miikka Heikkinen --- .../studio3d/dynamicloading/StartupProgress.qml | 77 ++++++++++++++++ .../dynamicloading/doc/src/dynamicloading.qdoc | 46 ++++++++++ .../studio3d/dynamicloading/dynamicloading.pro | 26 ++++++ examples/studio3d/dynamicloading/main.cpp | 68 ++++++++++++++ examples/studio3d/dynamicloading/main.qml | 99 +++++++++++++++++++++ .../dynamicloading/presentation/dynamicloading.uia | 7 ++ .../effects/FullScreenTextureOverlay.effect | 28 ++++++ .../presentation/fonts/TitilliumWeb-Regular.ttf | Bin 0 -> 63752 bytes .../presentation/maps/Abstract_001_COLOR.jpg | Bin 0 -> 28039 bytes .../presentation/maps/Blue_Marble_002_COLOR.jpg | Bin 0 -> 40404 bytes .../presentation/maps/Ice_002_COLOR.jpg | Bin 0 -> 16254 bytes .../presentation/maps/Metal_Streaks.png | Bin 0 -> 13744 bytes .../presentation/maps/Moon_001_COLOR.jpg | Bin 0 -> 9868 bytes .../presentation/maps/Rock_023_COLOR2.jpg | Bin 0 -> 7307 bytes .../dynamicloading/presentation/maps/license.txt | 2 + .../presentation/materials/simplecustom.material | 39 ++++++++ .../presentation/presentations/dynamicloading.uip | 86 ++++++++++++++++++ .../presentation/presentations/subpres.uip | 35 ++++++++ examples/studio3d/dynamicloading/qml.qrc | 19 ++++ examples/studio3d/studio3d.pro | 3 +- 20 files changed, 534 insertions(+), 1 deletion(-) create mode 100644 examples/studio3d/dynamicloading/StartupProgress.qml create mode 100644 examples/studio3d/dynamicloading/doc/src/dynamicloading.qdoc create mode 100644 examples/studio3d/dynamicloading/dynamicloading.pro create mode 100644 examples/studio3d/dynamicloading/main.cpp create mode 100644 examples/studio3d/dynamicloading/main.qml create mode 100644 examples/studio3d/dynamicloading/presentation/dynamicloading.uia create mode 100644 examples/studio3d/dynamicloading/presentation/effects/FullScreenTextureOverlay.effect create mode 100644 examples/studio3d/dynamicloading/presentation/fonts/TitilliumWeb-Regular.ttf create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Abstract_001_COLOR.jpg create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Blue_Marble_002_COLOR.jpg create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Ice_002_COLOR.jpg create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Metal_Streaks.png create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Moon_001_COLOR.jpg create mode 100644 examples/studio3d/dynamicloading/presentation/maps/Rock_023_COLOR2.jpg create mode 100644 examples/studio3d/dynamicloading/presentation/maps/license.txt create mode 100644 examples/studio3d/dynamicloading/presentation/materials/simplecustom.material create mode 100644 examples/studio3d/dynamicloading/presentation/presentations/dynamicloading.uip create mode 100644 examples/studio3d/dynamicloading/presentation/presentations/subpres.uip create mode 100644 examples/studio3d/dynamicloading/qml.qrc diff --git a/examples/studio3d/dynamicloading/StartupProgress.qml b/examples/studio3d/dynamicloading/StartupProgress.qml new file mode 100644 index 0000000..c845588 --- /dev/null +++ b/examples/studio3d/dynamicloading/StartupProgress.qml @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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.Controls 2.5 +import QtQuick 2.12 + +Rectangle { + width: 180 + height: 60 + radius: 16 + anchors.centerIn: parent + color: "white" + antialiasing: true + property alias progressEnabled: progressBar.enabled + property alias textColor: text.color + Text { + id: text + anchors.centerIn: parent + text: "Loading presentation..." + color: "black" + + } + ProgressBar { + id: progressBar + anchors.left: text.left + anchors.top: text.bottom + width: text.width + indeterminate: true + } +} diff --git a/examples/studio3d/dynamicloading/doc/src/dynamicloading.qdoc b/examples/studio3d/dynamicloading/doc/src/dynamicloading.qdoc new file mode 100644 index 0000000..20af763 --- /dev/null +++ b/examples/studio3d/dynamicloading/doc/src/dynamicloading.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt 3D Studio. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example dynamicloading + \title Qt 3D Studio Runtime: Dynamic Loading Example + \ingroup OpenGLRuntime-examples-qml + \brief Demonstrates how resources can be loaded dynamically. + + \e {This example demonstrates deferred loading.} + + \include examples-run.qdocinc + + \section1 Description + + The presentation consists of three slides with images, effect, subpresentation and + custom material. Images and subpresentation are loaded dynamically before entering + the slide using the \l{Presentation::preloadSlide}{preloadSlide} function and unloaded + when exiting a slide using the \l{Presentation::unloadSlide}{unloadSlide} function. + + \snippet dynamicloading/main.qml 1 +*/ diff --git a/examples/studio3d/dynamicloading/dynamicloading.pro b/examples/studio3d/dynamicloading/dynamicloading.pro new file mode 100644 index 0000000..af8ed76 --- /dev/null +++ b/examples/studio3d/dynamicloading/dynamicloading.pro @@ -0,0 +1,26 @@ +TEMPLATE = app + +QT += quick widgets qml studio3d +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Refer to the documentation for the +# deprecated API to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp + +RESOURCES += qml.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET +INSTALLS += target + +OTHER_FILES += \ + doc/src/dynamicloading.qdoc diff --git a/examples/studio3d/dynamicloading/main.cpp b/examples/studio3d/dynamicloading/main.cpp new file mode 100644 index 0000000..4894be7 --- /dev/null +++ b/examples/studio3d/dynamicloading/main.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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 + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat()); + + QQuickView viewer; + viewer.setSource(QUrl("qrc:/main.qml")); + viewer.setTitle(QStringLiteral("Qt 3D Studio Example")); + viewer.setResizeMode(QQuickView::SizeRootObjectToView); + viewer.resize(1680, 1050); + viewer.show(); + return app.exec(); +} diff --git a/examples/studio3d/dynamicloading/main.qml b/examples/studio3d/dynamicloading/main.qml new file mode 100644 index 0000000..daa8a94 --- /dev/null +++ b/examples/studio3d/dynamicloading/main.qml @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2019 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.12 +import QtStudio3D.OpenGL 2.4 + +Item { + id: mainview + anchors.fill: parent + visible: true + + StartupProgress { + id: progress + } + Studio3D { + id: studio3D + anchors.fill: parent + asyncInit: true + + ViewerSettings { + showRenderStats: false + scaleMode: ViewerSettings.ScaleModeCenter + } + //![1] + Presentation { + property string slidePath: "dynamicloading:Scene:Slide" + property int curSlideIndex: 1 + property int maxSlideIndex: 3 + + id: presentation + delayedLoading: true + source: "qrc:/presentation/dynamicloading.uia" + + onSlideEntered: { + console.log("Entered: " + name) + + curSlideIndex = index + 1 + if (curSlideIndex > maxSlideIndex) + curSlideIndex = 1 + console.log("preloadSlide: " + slidePath + curSlideIndex) + preloadSlide(slidePath + curSlideIndex) + } + + onSlideExited: { + console.log("Exited: " + name) + unloadSlide(name) + } + } + //![1] + onPresentationReady: progress.visible = false + } +} diff --git a/examples/studio3d/dynamicloading/presentation/dynamicloading.uia b/examples/studio3d/dynamicloading/presentation/dynamicloading.uia new file mode 100644 index 0000000..733f47d --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/dynamicloading.uia @@ -0,0 +1,7 @@ + + + + + + + diff --git a/examples/studio3d/dynamicloading/presentation/effects/FullScreenTextureOverlay.effect b/examples/studio3d/dynamicloading/presentation/effects/FullScreenTextureOverlay.effect new file mode 100644 index 0000000..8cfde54 --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/effects/FullScreenTextureOverlay.effect @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/studio3d/dynamicloading/presentation/fonts/TitilliumWeb-Regular.ttf b/examples/studio3d/dynamicloading/presentation/fonts/TitilliumWeb-Regular.ttf new file mode 100644 index 0000000..6da8219 Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/fonts/TitilliumWeb-Regular.ttf differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Abstract_001_COLOR.jpg b/examples/studio3d/dynamicloading/presentation/maps/Abstract_001_COLOR.jpg new file mode 100644 index 0000000..97c5df3 Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Abstract_001_COLOR.jpg differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Blue_Marble_002_COLOR.jpg b/examples/studio3d/dynamicloading/presentation/maps/Blue_Marble_002_COLOR.jpg new file mode 100644 index 0000000..1fab91a Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Blue_Marble_002_COLOR.jpg differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Ice_002_COLOR.jpg b/examples/studio3d/dynamicloading/presentation/maps/Ice_002_COLOR.jpg new file mode 100644 index 0000000..0e69b27 Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Ice_002_COLOR.jpg differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Metal_Streaks.png b/examples/studio3d/dynamicloading/presentation/maps/Metal_Streaks.png new file mode 100644 index 0000000..f2a6d49 Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Metal_Streaks.png differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Moon_001_COLOR.jpg b/examples/studio3d/dynamicloading/presentation/maps/Moon_001_COLOR.jpg new file mode 100644 index 0000000..3fd374c Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Moon_001_COLOR.jpg differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/Rock_023_COLOR2.jpg b/examples/studio3d/dynamicloading/presentation/maps/Rock_023_COLOR2.jpg new file mode 100644 index 0000000..39214f9 Binary files /dev/null and b/examples/studio3d/dynamicloading/presentation/maps/Rock_023_COLOR2.jpg differ diff --git a/examples/studio3d/dynamicloading/presentation/maps/license.txt b/examples/studio3d/dynamicloading/presentation/maps/license.txt new file mode 100644 index 0000000..62a06f7 --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/maps/license.txt @@ -0,0 +1,2 @@ +https://3dtextures.me/ distributed under the terms of +https://creativecommons.org/publicdomain/zero/1.0/ diff --git a/examples/studio3d/dynamicloading/presentation/materials/simplecustom.material b/examples/studio3d/dynamicloading/presentation/materials/simplecustom.material new file mode 100644 index 0000000..51878d2 --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/materials/simplecustom.material @@ -0,0 +1,39 @@ + + + + + + + + + + + + + +#define QT3DS_ENABLE_UV0 1 +#define QT3DS_ENABLE_WORLD_POSITION 1 +#define QT3DS_ENABLE_TEXTAN 0 +#define QT3DS_ENABLE_BINORMAL 0 + +#include "vertexFragmentBase.glsllib" + +// set shader output +out vec4 fragColor; + +void main() +{ + vec4 c = texture(basecolor, varTexCoord0.xy); + c.rgb *= vec3(red_weight, green_weight, blue_weight); + fragColor = c; +} + + + + + + + + + + diff --git a/examples/studio3d/dynamicloading/presentation/presentations/dynamicloading.uip b/examples/studio3d/dynamicloading/presentation/presentations/dynamicloading.uip new file mode 100644 index 0000000..bcde630 --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/presentations/dynamicloading.uip @@ -0,0 +1,86 @@ + + + + + #989898 #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0.01 100 100 0.616 0.26 100 100 2 0.09 100 100 + + + + + + + + + + + + + + + + + + + + + + + + + + 0 1.08 100 100 1.016 1.58 100 100 2 1.68 100 100 + 0 1.22 100 100 1.016 1.7 100 100 2 1.28 100 100 + 0 0.42 100 100 1.016 1.12 100 100 2 0.72 100 100 + + + + + + diff --git a/examples/studio3d/dynamicloading/presentation/presentations/subpres.uip b/examples/studio3d/dynamicloading/presentation/presentations/subpres.uip new file mode 100644 index 0000000..6b3d8d8 --- /dev/null +++ b/examples/studio3d/dynamicloading/presentation/presentations/subpres.uip @@ -0,0 +1,35 @@ + + + + + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/studio3d/dynamicloading/qml.qrc b/examples/studio3d/dynamicloading/qml.qrc new file mode 100644 index 0000000..b4de469 --- /dev/null +++ b/examples/studio3d/dynamicloading/qml.qrc @@ -0,0 +1,19 @@ + + + main.qml + StartupProgress.qml + presentation/effects/FullScreenTextureOverlay.effect + presentation/fonts/TitilliumWeb-Regular.ttf + presentation/maps/Abstract_001_COLOR.jpg + presentation/maps/Blue_Marble_002_COLOR.jpg + presentation/maps/Ice_002_COLOR.jpg + presentation/maps/license.txt + presentation/maps/Metal_Streaks.png + presentation/maps/Moon_001_COLOR.jpg + presentation/maps/Rock_023_COLOR2.jpg + presentation/materials/simplecustom.material + presentation/presentations/dynamicloading.uip + presentation/presentations/subpres.uip + presentation/dynamicloading.uia + + diff --git a/examples/studio3d/studio3d.pro b/examples/studio3d/studio3d.pro index 05213bd..4eb7780 100644 --- a/examples/studio3d/studio3d.pro +++ b/examples/studio3d/studio3d.pro @@ -6,5 +6,6 @@ SUBDIRS += \ qtHaveModule(quick) { SUBDIRS += simpleqml \ qmldatainput \ - dynamicelement + dynamicelement \ + dynamicloading } -- cgit v1.2.3