From a7be688384cfc0b4af11b3d61a06007d6205e151 Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Mon, 9 May 2016 11:44:16 +0100 Subject: Moved mouseinput-qml example to manual test Part of an examples cleanup Change-Id: Ib77fedcfc75b5b48a2e1618f90a995b2d9e392ad Reviewed-by: Sean Harmer --- examples/qt3d/mouseinput-qml/main.cpp | 63 ------------ examples/qt3d/mouseinput-qml/main.qml | 130 ------------------------ examples/qt3d/mouseinput-qml/mouseinput-qml.pro | 13 --- examples/qt3d/mouseinput-qml/mouseinput-qml.qrc | 5 - examples/qt3d/qt3d.pro | 1 - tests/manual/manual.pro | 3 +- tests/manual/mouseinput-qml/main.cpp | 63 ++++++++++++ tests/manual/mouseinput-qml/main.qml | 130 ++++++++++++++++++++++++ tests/manual/mouseinput-qml/mouseinput-qml.pro | 13 +++ tests/manual/mouseinput-qml/mouseinput-qml.qrc | 5 + 10 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 examples/qt3d/mouseinput-qml/main.cpp delete mode 100644 examples/qt3d/mouseinput-qml/main.qml delete mode 100644 examples/qt3d/mouseinput-qml/mouseinput-qml.pro delete mode 100644 examples/qt3d/mouseinput-qml/mouseinput-qml.qrc create mode 100644 tests/manual/mouseinput-qml/main.cpp create mode 100644 tests/manual/mouseinput-qml/main.qml create mode 100644 tests/manual/mouseinput-qml/mouseinput-qml.pro create mode 100644 tests/manual/mouseinput-qml/mouseinput-qml.qrc diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp deleted file mode 100644 index e1a359d2a..000000000 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 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(QStringLiteral("qrc:/main.qml"))); - view.show(); - - return app.exec(); -} diff --git a/examples/qt3d/mouseinput-qml/main.qml b/examples/qt3d/mouseinput-qml/main.qml deleted file mode 100644 index de7d115c2..000000000 --- a/examples/qt3d/mouseinput-qml/main.qml +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 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: sceneRoot - - Camera { - id: camera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 45 - aspectRatio: 16/9 - nearPlane : 0.1 - farPlane : 1000.0 - position: Qt.vector3d( 0.0, 0.0, 40.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) - } - - OrbitCameraController { camera: camera } - - components: [ - RenderSettings { - ForwardRenderer { - camera: camera - clearColor: "black" - } - renderPolicy: RenderSettings.Always - }, - InputSettings {} - ] - - SphereMesh { - id: sphereMesh - radius: 3 - } - - PhongMaterial { - id: material - diffuse: "green" - } - - MouseDevice { - id: mouseDevice - } - - Entity { - id: sphere1 - - property real scaleFactor: 1.0 - - property Transform transform: Transform { - scale: sphere1.scaleFactor - rotation: fromAxisAndAngle(Qt.vector3d(1, 0, 0), 45) - } - - property MouseHandler mouseHandler : MouseHandler { - sourceDevice: mouseDevice - - onClicked: { - //Signal not implemented yet - } - - onReleased: { - switch (mouse.button) { - case Qt.LeftButton: - sphere1.scaleFactor += 0.5; - break; - - case Qt.RightButton: - sphere1.scaleFactor -= 0.5; - break; - } - } - } - - components: [sphereMesh, material, transform, mouseHandler] - } -} diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro b/examples/qt3d/mouseinput-qml/mouseinput-qml.pro deleted file mode 100644 index a5bad5991..000000000 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro +++ /dev/null @@ -1,13 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras - -SOURCES += main.cpp - -RESOURCES += \ - mouseinput-qml.qrc - -OTHER_FILES += \ - main.qml diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.qrc b/examples/qt3d/mouseinput-qml/mouseinput-qml.qrc deleted file mode 100644 index 5f6483ac3..000000000 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - - diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 64abfa872..60eae21c1 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -20,7 +20,6 @@ SUBDIRS += \ transparency-qml \ transparency-qml-scene3d \ scene3d-loader \ - mouseinput-qml \ instanced-arrays-qml \ picking-qml \ transforms-qml \ diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 8355a9ad7..6e14482c9 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -18,4 +18,5 @@ SUBDIRS += \ gltf \ gooch-qml \ keyboardinput-qml \ - loader-qml + loader-qml \ + mouseinput-qml diff --git a/tests/manual/mouseinput-qml/main.cpp b/tests/manual/mouseinput-qml/main.cpp new file mode 100644 index 000000000..e1a359d2a --- /dev/null +++ b/tests/manual/mouseinput-qml/main.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2015 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(QStringLiteral("qrc:/main.qml"))); + view.show(); + + return app.exec(); +} diff --git a/tests/manual/mouseinput-qml/main.qml b/tests/manual/mouseinput-qml/main.qml new file mode 100644 index 000000000..de7d115c2 --- /dev/null +++ b/tests/manual/mouseinput-qml/main.qml @@ -0,0 +1,130 @@ +/**************************************************************************** +** +** Copyright (C) 2015 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: sceneRoot + + Camera { + id: camera + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: 16/9 + nearPlane : 0.1 + farPlane : 1000.0 + position: Qt.vector3d( 0.0, 0.0, 40.0 ) + upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) + viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) + } + + OrbitCameraController { camera: camera } + + components: [ + RenderSettings { + ForwardRenderer { + camera: camera + clearColor: "black" + } + renderPolicy: RenderSettings.Always + }, + InputSettings {} + ] + + SphereMesh { + id: sphereMesh + radius: 3 + } + + PhongMaterial { + id: material + diffuse: "green" + } + + MouseDevice { + id: mouseDevice + } + + Entity { + id: sphere1 + + property real scaleFactor: 1.0 + + property Transform transform: Transform { + scale: sphere1.scaleFactor + rotation: fromAxisAndAngle(Qt.vector3d(1, 0, 0), 45) + } + + property MouseHandler mouseHandler : MouseHandler { + sourceDevice: mouseDevice + + onClicked: { + //Signal not implemented yet + } + + onReleased: { + switch (mouse.button) { + case Qt.LeftButton: + sphere1.scaleFactor += 0.5; + break; + + case Qt.RightButton: + sphere1.scaleFactor -= 0.5; + break; + } + } + } + + components: [sphereMesh, material, transform, mouseHandler] + } +} diff --git a/tests/manual/mouseinput-qml/mouseinput-qml.pro b/tests/manual/mouseinput-qml/mouseinput-qml.pro new file mode 100644 index 000000000..e8b5f42f9 --- /dev/null +++ b/tests/manual/mouseinput-qml/mouseinput-qml.pro @@ -0,0 +1,13 @@ +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) +} + +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras + +SOURCES += main.cpp + +RESOURCES += \ + mouseinput-qml.qrc + +OTHER_FILES += \ + main.qml diff --git a/tests/manual/mouseinput-qml/mouseinput-qml.qrc b/tests/manual/mouseinput-qml/mouseinput-qml.qrc new file mode 100644 index 000000000..5f6483ac3 --- /dev/null +++ b/tests/manual/mouseinput-qml/mouseinput-qml.qrc @@ -0,0 +1,5 @@ + + + main.qml + + -- cgit v1.2.3