From 14449db181a5b7a6fc273b8d9da2a7a5a1f1d603 Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Mon, 9 May 2016 11:20:03 +0100 Subject: Moved gltf example to manual test Part of an examples cleanup Change-Id: Id1bee587dd97adcca7bba3f6b4afcf5bd9339c1a Reviewed-by: Sean Harmer --- examples/qt3d/gltf/Wine.qml | 73 --------------------------- examples/qt3d/gltf/doc/src/gltf.qdoc | 32 ------------ examples/qt3d/gltf/gltf.pro | 18 ------- examples/qt3d/gltf/gltf_example.qrc | 6 --- examples/qt3d/gltf/main.cpp | 72 --------------------------- examples/qt3d/gltf/main.qml | 96 ------------------------------------ examples/qt3d/qt3d.pro | 1 - tests/manual/gltf/Wine.qml | 73 +++++++++++++++++++++++++++ tests/manual/gltf/doc/src/gltf.qdoc | 32 ++++++++++++ tests/manual/gltf/gltf.pro | 18 +++++++ tests/manual/gltf/gltf_example.qrc | 6 +++ tests/manual/gltf/main.cpp | 72 +++++++++++++++++++++++++++ tests/manual/gltf/main.qml | 96 ++++++++++++++++++++++++++++++++++++ tests/manual/manual.pro | 3 +- 14 files changed, 299 insertions(+), 299 deletions(-) delete mode 100644 examples/qt3d/gltf/Wine.qml delete mode 100644 examples/qt3d/gltf/doc/src/gltf.qdoc delete mode 100644 examples/qt3d/gltf/gltf.pro delete mode 100644 examples/qt3d/gltf/gltf_example.qrc delete mode 100644 examples/qt3d/gltf/main.cpp delete mode 100644 examples/qt3d/gltf/main.qml create mode 100644 tests/manual/gltf/Wine.qml create mode 100644 tests/manual/gltf/doc/src/gltf.qdoc create mode 100644 tests/manual/gltf/gltf.pro create mode 100644 tests/manual/gltf/gltf_example.qrc create mode 100644 tests/manual/gltf/main.cpp create mode 100644 tests/manual/gltf/main.qml diff --git a/examples/qt3d/gltf/Wine.qml b/examples/qt3d/gltf/Wine.qml deleted file mode 100644 index fc25cfd62..000000000 --- a/examples/qt3d/gltf/Wine.qml +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -** 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 Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -Entity { - id: root - - property vector3d position: Qt.vector3d(0, 0, 0) - property real angleX: 0 - property real angleY: 0 - property real angleZ: 0 - property real scale: 1 - - components: [ - Transform { - translation: root.position - rotation: fromEulerAngles(root.angleX, root.angleY, root.angleZ) - scale: root.scale - }, - SceneLoader { - source: "qrc:/assets/gltf/wine/wine.gltf" - } - ] -} diff --git a/examples/qt3d/gltf/doc/src/gltf.qdoc b/examples/qt3d/gltf/doc/src/gltf.qdoc deleted file mode 100644 index 04c57c670..000000000 --- a/examples/qt3d/gltf/doc/src/gltf.qdoc +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $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 gltf - \title Qt 3D: glTF Assets Example - \ingroup qt3d-examples-qml -*/ diff --git a/examples/qt3d/gltf/gltf.pro b/examples/qt3d/gltf/gltf.pro deleted file mode 100644 index 2ec5551a9..000000000 --- a/examples/qt3d/gltf/gltf.pro +++ /dev/null @@ -1,18 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras - -HEADERS += \ - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml \ - Wine.qml - -RESOURCES += \ - gltf_example.qrc \ - ../exampleresources/gltf.qrc \ diff --git a/examples/qt3d/gltf/gltf_example.qrc b/examples/qt3d/gltf/gltf_example.qrc deleted file mode 100644 index 0da7ea21f..000000000 --- a/examples/qt3d/gltf/gltf_example.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - main.qml - Wine.qml - - diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp deleted file mode 100644 index 8fc9cd8e2..000000000 --- a/examples/qt3d/gltf/main.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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$ -** -****************************************************************************/ - -#include -#include -#include - -int main(int argc, char* argv[]) -{ - QGuiApplication app(argc, argv); - Qt3DExtras::Quick::Qt3DQuickWindow view; - - view.setSource(QUrl("qrc:/main.qml")); - view.show(); - - const bool isES = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES - || view.requestedFormat().renderableType() == QSurfaceFormat::OpenGLES; - if (!isES) - qDebug("Using a non-OpenGL ES context. This may result in no material on the model " - "as currently the standard glTF format only includes OpenGL ES 2.0 shaders. " - "To overcome this, run the application on OpenGL ES or use the qgltf tool " - "with -g to generate a slightly extended glTF asset from the original COLLADA source."); - - return app.exec(); -} diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml deleted file mode 100644 index 1afb8c48e..000000000 --- a/examples/qt3d/gltf/main.qml +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). -** 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 Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 - -Entity { - id: sceneRoot - - Camera { - id: camera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 45 - aspectRatio: 16/9 - nearPlane : 0.1 - farPlane : 1000.0 - position: Qt.vector3d( 0.0, 20.0, -120.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - viewCenter: Qt.vector3d( 0.0, 10.0, 0.0 ) - } - - FirstPersonCameraController { camera: camera } - - RenderSettings { - id : renderSettings - activeFrameGraph : Viewport { - CameraSelector { - camera: camera - ClearBuffers { - buffers : ClearBuffers.ColorDepthBuffer - clearColor: "black" - SortPolicy { - sortTypes: [ SortType.BackToFront ] - } - } - } - } - } - - components: [ renderSettings ] - - Wine { - id: wineRack - position: Qt.vector3d(-60.0, 0.0, 50.0) - angleX: 180 - } -} diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index c4ddeb0fc..734be99b1 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs SUBDIRS += \ simple-qml \ simple-cpp \ - gltf \ multiviewport \ wireframe \ tessellation-modes \ diff --git a/tests/manual/gltf/Wine.qml b/tests/manual/gltf/Wine.qml new file mode 100644 index 000000000..fc25cfd62 --- /dev/null +++ b/tests/manual/gltf/Wine.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** 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 Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Entity { + id: root + + property vector3d position: Qt.vector3d(0, 0, 0) + property real angleX: 0 + property real angleY: 0 + property real angleZ: 0 + property real scale: 1 + + components: [ + Transform { + translation: root.position + rotation: fromEulerAngles(root.angleX, root.angleY, root.angleZ) + scale: root.scale + }, + SceneLoader { + source: "qrc:/assets/gltf/wine/wine.gltf" + } + ] +} diff --git a/tests/manual/gltf/doc/src/gltf.qdoc b/tests/manual/gltf/doc/src/gltf.qdoc new file mode 100644 index 000000000..04c57c670 --- /dev/null +++ b/tests/manual/gltf/doc/src/gltf.qdoc @@ -0,0 +1,32 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $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 gltf + \title Qt 3D: glTF Assets Example + \ingroup qt3d-examples-qml +*/ diff --git a/tests/manual/gltf/gltf.pro b/tests/manual/gltf/gltf.pro new file mode 100644 index 000000000..443141685 --- /dev/null +++ b/tests/manual/gltf/gltf.pro @@ -0,0 +1,18 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras + +HEADERS += \ + +SOURCES += \ + main.cpp + +OTHER_FILES += \ + main.qml \ + Wine.qml + +RESOURCES += \ + gltf_example.qrc \ + ../../../examples/qt3d/exampleresources/gltf.qrc diff --git a/tests/manual/gltf/gltf_example.qrc b/tests/manual/gltf/gltf_example.qrc new file mode 100644 index 000000000..0da7ea21f --- /dev/null +++ b/tests/manual/gltf/gltf_example.qrc @@ -0,0 +1,6 @@ + + + main.qml + Wine.qml + + diff --git a/tests/manual/gltf/main.cpp b/tests/manual/gltf/main.cpp new file mode 100644 index 000000000..8fc9cd8e2 --- /dev/null +++ b/tests/manual/gltf/main.cpp @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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$ +** +****************************************************************************/ + +#include +#include +#include + +int main(int argc, char* argv[]) +{ + QGuiApplication app(argc, argv); + Qt3DExtras::Quick::Qt3DQuickWindow view; + + view.setSource(QUrl("qrc:/main.qml")); + view.show(); + + const bool isES = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES + || view.requestedFormat().renderableType() == QSurfaceFormat::OpenGLES; + if (!isES) + qDebug("Using a non-OpenGL ES context. This may result in no material on the model " + "as currently the standard glTF format only includes OpenGL ES 2.0 shaders. " + "To overcome this, run the application on OpenGL ES or use the qgltf tool " + "with -g to generate a slightly extended glTF asset from the original COLLADA source."); + + return app.exec(); +} diff --git a/tests/manual/gltf/main.qml b/tests/manual/gltf/main.qml new file mode 100644 index 000000000..1afb8c48e --- /dev/null +++ b/tests/manual/gltf/main.qml @@ -0,0 +1,96 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** 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 Qt3D.Core 2.0 +import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 + +Entity { + id: sceneRoot + + Camera { + id: camera + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: 16/9 + nearPlane : 0.1 + farPlane : 1000.0 + position: Qt.vector3d( 0.0, 20.0, -120.0 ) + upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) + viewCenter: Qt.vector3d( 0.0, 10.0, 0.0 ) + } + + FirstPersonCameraController { camera: camera } + + RenderSettings { + id : renderSettings + activeFrameGraph : Viewport { + CameraSelector { + camera: camera + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer + clearColor: "black" + SortPolicy { + sortTypes: [ SortType.BackToFront ] + } + } + } + } + } + + components: [ renderSettings ] + + Wine { + id: wineRack + position: Qt.vector3d(-60.0, 0.0, 50.0) + angleX: 180 + } +} diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index e423b47d4..488da56c6 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -14,4 +14,5 @@ SUBDIRS += \ deferred-renderer-cpp \ deferred-renderer-qml \ dynamicscene-cpp \ - enabled-qml + enabled-qml \ + gltf -- cgit v1.2.3