From ca1492cb1fa22e0e6f95b88ba68f5b3b80969c33 Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Fri, 6 May 2016 10:45:25 +0100 Subject: Moved bigmodel-qml example to manual test Part of an examples cleanup Change-Id: I1e5be9e6fb76ce7f9d0289f5f71fcb46af44012e Reviewed-by: Sean Harmer --- examples/qt3d/bigmodel-qml/MyEntity.qml | 70 ------------ examples/qt3d/bigmodel-qml/bigmodel-qml.pro | 18 ---- examples/qt3d/bigmodel-qml/bigmodel-qml.qrc | 6 -- .../qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc | 32 ------ examples/qt3d/bigmodel-qml/main.cpp | 64 ----------- examples/qt3d/bigmodel-qml/main.qml | 120 --------------------- 6 files changed, 310 deletions(-) delete mode 100644 examples/qt3d/bigmodel-qml/MyEntity.qml delete mode 100644 examples/qt3d/bigmodel-qml/bigmodel-qml.pro delete mode 100644 examples/qt3d/bigmodel-qml/bigmodel-qml.qrc delete mode 100644 examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc delete mode 100644 examples/qt3d/bigmodel-qml/main.cpp delete mode 100644 examples/qt3d/bigmodel-qml/main.qml (limited to 'examples/qt3d/bigmodel-qml') diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml deleted file mode 100644 index c2c7e5d7c..000000000 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ /dev/null @@ -1,70 +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$ -** -****************************************************************************/ - -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 - -Entity { - id: root - property string name: "Entity" - property alias position: transform.translation - property alias diffuse: material.diffuse - - components: [ - Transform { id: transform }, - SphereMesh { radius: 2 }, - PhongMaterial { id: material }, - ObjectPicker { - onClicked: console.log("Clicked", root.name, pick.distance, pick.triangleIndex) - } - ] -} diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro deleted file mode 100644 index cb590374a..000000000 --- a/examples/qt3d/bigmodel-qml/bigmodel-qml.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 3dextras 3dquickextras - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml \ - MyEntity.qml - -RESOURCES += \ - bigmodel-qml.qrc - -DISTFILES += \ - MyEntity.qml diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc b/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc deleted file mode 100644 index 6cc293f70..000000000 --- a/examples/qt3d/bigmodel-qml/bigmodel-qml.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - main.qml - MyEntity.qml - - diff --git a/examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc b/examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.qdoc deleted file mode 100644 index 194fcfde9..000000000 --- a/examples/qt3d/bigmodel-qml/doc/src/bigmodel-qml.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 bigmodel-qml - \title Qt 3D: Big Model QML Example - \ingroup qt3d-examples-qml -*/ diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp deleted file mode 100644 index c004e2a45..000000000 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ /dev/null @@ -1,64 +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 - - -int main(int argc, char* argv[]) -{ - QGuiApplication app(argc, argv); - Qt3DExtras::Quick::Qt3DQuickWindow view; - - view.setSource(QUrl("qrc:/main.qml")); - view.show(); - - return app.exec(); -} diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml deleted file mode 100644 index 61d9d39a5..000000000 --- a/examples/qt3d/bigmodel-qml/main.qml +++ /dev/null @@ -1,120 +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$ -** -****************************************************************************/ - -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 -import QtQuick 2.2 as QQ2 - -Entity { - id: sceneRoot - - FirstPersonCameraController { camera: mainCamera } - - components: [ - RenderSettings { - activeFrameGraph:ForwardRenderer { - camera: mainCamera - } - pickingSettings { - pickMethod: PickingSettings.TrianglePicking - } - }, - // Event Source will be set by the Qt3DQuickWindow - InputSettings { } - ] - - Camera { - id: mainCamera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 22.5 - aspectRatio: 16 / 9 - nearPlane: 0.01 - farPlane: 1000.0 - position: Qt.vector3d( 0.0, 25.0, 40.0 ) - viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - } - - QQ2.ListModel { - id: entityModel - QQ2.ListElement { emptyRole: 0 } - } - - NodeInstantiator { - id: collection - property int _count: 0 - property real spacing: 5 - property int cols: 8 - property int _rows: count / cols - - model: entityModel - delegate: MyEntity { - id: myEntity - name: "E" + index - property real _lightness: 0.2 + 0.7 / collection._rows * Math.floor(index / collection.cols) - property real _hue: (index % collection.cols) / collection.cols - position: Qt.vector3d(collection.spacing * (index % collection.cols - 0.5 * (collection.cols - 1)), - 0.0, - collection.spacing * (Math.floor(index / collection.cols) - 0.5 * collection._rows)); - diffuse: Qt.hsla( _hue, 0.5, _lightness, 1.0 ) - } - } - - QQ2.Timer { - interval: 1000 - repeat: true - running: true - onTriggered: { - entityModel.append({}); - } - } -} -- cgit v1.2.3