diff options
Diffstat (limited to 'tests/manual')
145 files changed, 0 insertions, 6627 deletions
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro deleted file mode 100644 index 1fd243f9..00000000 --- a/tests/manual/animations/animations.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_animations -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/animations/animations.qmlproject b/tests/manual/animations/animations.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/animations/animations.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/animations/icon-l-qtquick3d.png b/tests/manual/animations/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/animations/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/animations/info.json b/tests/manual/animations/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/animations/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/animations/m5-tst_animations_qml.desktop b/tests/manual/animations/m5-tst_animations_qml.desktop deleted file mode 100644 index 0ea204c9..00000000 --- a/tests/manual/animations/m5-tst_animations_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_animations -Comment=Qt3D test animations application -Exec=/usr/bin/tst_animations -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/animations/main.cpp b/tests/manual/animations/main.cpp deleted file mode 100644 index 58a72cab..00000000 --- a/tests/manual/animations/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_animations.qml") diff --git a/tests/manual/animations/mt.qml b/tests/manual/animations/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/animations/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/animations/qml/TestCase.qml b/tests/manual/animations/qml/TestCase.qml deleted file mode 100644 index 49f259d4..00000000 --- a/tests/manual/animations/qml/TestCase.qml +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - property string text; - property variant rotationAxis : Qt.vector3d(1,0,0) - property real defaultWidth: 220 - property real defaultHeight: 150 - property variant rotation: Rotation3D {} - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - - anchors.left: parent.left - anchors.right: parent.right - } - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: Camera { eye: Qt.vector3d(0,15,50)} - Cube - { - id: model - scale: 8.0 - transform: container.rotation - } - } - } -} diff --git a/tests/manual/animations/qml/desktop.qml b/tests/manual/animations/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/animations/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/animations/qml/tst_animations.qml b/tests/manual/animations/qml/tst_animations.qml deleted file mode 100644 index a34477c6..00000000 --- a/tests/manual/animations/qml/tst_animations.qml +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-18702 -Item { - id: screen - width: aTestCase.defaultWidth * 3 - height: aTestCase.defaultHeight * 3 - - Flow { - anchors.fill: parent - - TestCase { - id: aTestCase - text: "Rotation: Z axis\n(Rolling to the left)\nNumberAnimation" - rotationAxis: Qt.vector3d(0,0,1) - rotation: Rotation3D { - axis: rotationAxis - NumberAnimation on angle { - loops: Animation.Infinite - from: 0 - to: 360 - duration: 1500 - } - } - } - - TestCase { - text: "Rotation: Z axis\n(Rolling to the left)\nRotationAnimation" - rotationAxis: Qt.vector3d(0,0,1) - rotation: Rotation3D { - axis: rotationAxis - RotationAnimation on angle { - loops: Animation.Infinite - from: 0 - to: 359 - duration: 1500 - direction: RotationAnimation.Clockwise - } - } - } - - TestCase { - text: "Rotation: Z axis\n(Rolling to the left)\nSmoothedAnimation" - rotationAxis: Qt.vector3d(0,0,1) - rotation: Rotation3D { - axis: rotationAxis - SmoothedAnimation on angle { - loops: Animation.Infinite - from: 0 - to: 360 - duration: 1500 - velocity: 200 - } - } - } - - TestCase { - text: "Rotation: Z axis\n(Rolling to the left)\nSpringAnimation" - rotationAxis: Qt.vector3d(0,0,1) - rotation: Rotation3D { - axis: rotationAxis - SpringAnimation on angle { - id: rotationAnimation - loops: Animation.Infinite - from: 0 - to: 359 - duration: 1500 - spring: 2 - damping: 0.2 - } - } - } - } -} diff --git a/tests/manual/animations/tst_animations_qml.desktop b/tests/manual/animations/tst_animations_qml.desktop deleted file mode 100644 index b8aebcb4..00000000 --- a/tests/manual/animations/tst_animations_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_animations -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_animations -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_animations_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/background/background.pro b/tests/manual/background/background.pro deleted file mode 100644 index 9908f199..00000000 --- a/tests/manual/background/background.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = tst_background -CONFIG += qt warn_on -QT += declarative quick - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/background/icon-l-qtquick3d.png b/tests/manual/background/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/background/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/background/main.cpp b/tests/manual/background/main.cpp deleted file mode 100644 index 5d672540..00000000 --- a/tests/manual/background/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_background.qml") diff --git a/tests/manual/background/qml/sky.png b/tests/manual/background/qml/sky.png Binary files differdeleted file mode 100644 index 153b833c..00000000 --- a/tests/manual/background/qml/sky.png +++ /dev/null diff --git a/tests/manual/background/qml/tst_background.qml b/tests/manual/background/qml/tst_background.qml deleted file mode 100644 index d527c768..00000000 --- a/tests/manual/background/qml/tst_background.qml +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Image { - source: "sky.png" - - Viewport { - width: 640 - height: 480 - - camera: Camera { - eye: Qt.vector3d(2,5,20); - } - - picking: true - - Cube { - onClicked: console.log("Cube clicked") - effect: Effect { - color: "#aaca00" - } - } - } - - Text { - id: instructionsText - text: "Cube + back image. Drag to rotate, click & check log." - } -} - diff --git a/tests/manual/basic/README b/tests/manual/basic/README deleted file mode 100644 index f7994e81..00000000 --- a/tests/manual/basic/README +++ /dev/null @@ -1,11 +0,0 @@ -This test renders a cube against a cleared black background. - -The cube should be able to be manipulated by dragging the mouse -pointer around the window. - -The aim is to have the simplest possible test which shows rendering -3D content with no 2D content. - -When the 3D content is free of 2D QML in this way optimized approaches may -be used and this test (along with "background") is meant to be the simplest test -of this behavior. diff --git a/tests/manual/basic/basic.pro b/tests/manual/basic/basic.pro deleted file mode 100644 index 964cbc72..00000000 --- a/tests/manual/basic/basic.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = tst_basic -CONFIG += qt warn_on -QT += declarative quick - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/basic/icon-l-qtquick3d.png b/tests/manual/basic/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/basic/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/basic/main.cpp b/tests/manual/basic/main.cpp deleted file mode 100644 index e62e2af6..00000000 --- a/tests/manual/basic/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_basic.qml") diff --git a/tests/manual/basic/qml/tst_basic.qml b/tests/manual/basic/qml/tst_basic.qml deleted file mode 100644 index 8db4d048..00000000 --- a/tests/manual/basic/qml/tst_basic.qml +++ /dev/null @@ -1,141 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Item { - id: screen - width: 640 - height: 520 - - Viewport { - width: 640 - height: 480 - fillColor: "black" - - camera: Camera {eye: Qt.vector3d(0,3,20) } - picking: true - //showPicking: true - - ListModel { - id: positionModel - ListElement { - x: -2.0; y: 1.8; - color: "#CC2200"; - name_string: "top left" - } - ListElement { - x: 0.0; y: 1.8; - color: "#8822aa"; - name_string: "top middle" - } - ListElement { - x: 2.0; y: 1.8; - color: "#1122ca"; - name_string: "top right" - } - ListElement { - x: -2.0; y: 0.0; - color: "#CC8800"; - name_string: "mid left" - } - ListElement { - x: 0.0; y: 0.0; - color: "#8888aa"; - name_string: "middle" - } - ListElement { - x: 2.0; y: 0.0; - color: "#118800"; - name_string: "mid right" - } - ListElement { - x: -2.0; y: -1.8; - color: "#CCBB00"; - name_string: "bottom left" - } - ListElement { - x: 0.0; y: -1.8; - color: "#88BB00"; - name_string: "bottom middle" - } - ListElement { - x: 2.0; y: -1.8; - color: "#11BB00"; - name_string: "bottom right" - } - } - - Component { - id: cubeComponent - Cube { - position: Qt.vector3d(model.x,model.y, 0.0) - onClicked: console.log(model.name_string) - effect: Effect { - color: model.color - } - } - } - - Item3D { - Repeater { - delegate: cubeComponent - model: positionModel - } - } - } - Rectangle { - id: instructions - x: 0; y: 480 - width: screen.width - height: 40 - color: "#3333aa" - Text { - id: instructionsText - wrapMode: "WordWrap" - text: "Pick a cube, check log output. Drag in the black area to move all cubes." - anchors.centerIn: parent - } - } -} - diff --git a/tests/manual/displaymodel/README b/tests/manual/displaymodel/README deleted file mode 100644 index e22b48fd..00000000 --- a/tests/manual/displaymodel/README +++ /dev/null @@ -1,16 +0,0 @@ - -This test renders a series of generated and file loaded meshes to validate functionality. - -The first 5 meshes are dynamically generated. They are: points, lines, sphere, cylinder, capsule. - -The next 2 meshes are .obj files loaded at runtime. They are: plane.obj, cube.obj. - -The next mesh is a .bez teapot mesh. - -The final mesh is a .3ds mesh of a lunar lander. - -All meshes should be lit & shaded, and can be manually rotated by using ctrl+leftclick and dragging. - -Zoom can be achieved by mouse wheel. - -Click each object for an "Object clicked" debug message in the debugger. diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro deleted file mode 100644 index 49b36b2c..00000000 --- a/tests/manual/displaymodel/displaymodel.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_displaymodel -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/displaymodel/displaymodel.qmlproject b/tests/manual/displaymodel/displaymodel.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/displaymodel/displaymodel.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/displaymodel/icon-l-qtquick3d.png b/tests/manual/displaymodel/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/displaymodel/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/displaymodel/info.json b/tests/manual/displaymodel/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/displaymodel/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/displaymodel/main.cpp b/tests/manual/displaymodel/main.cpp deleted file mode 100644 index a592e327..00000000 --- a/tests/manual/displaymodel/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_displaymodel.qml") diff --git a/tests/manual/displaymodel/mt.qml b/tests/manual/displaymodel/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/displaymodel/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/displaymodel/qml/desktop.qml b/tests/manual/displaymodel/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/displaymodel/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/displaymodel/qml/meshes/lunar-lander.3ds b/tests/manual/displaymodel/qml/meshes/lunar-lander.3ds Binary files differdeleted file mode 100644 index 7403fdef..00000000 --- a/tests/manual/displaymodel/qml/meshes/lunar-lander.3ds +++ /dev/null diff --git a/tests/manual/displaymodel/qml/meshes/monkey.mtl b/tests/manual/displaymodel/qml/meshes/monkey.mtl deleted file mode 100644 index 07e6051f..00000000 --- a/tests/manual/displaymodel/qml/meshes/monkey.mtl +++ /dev/null @@ -1,2 +0,0 @@ -# Blender MTL File: '' -# Material Count: 0 diff --git a/tests/manual/displaymodel/qml/meshes/monkey.obj b/tests/manual/displaymodel/qml/meshes/monkey.obj deleted file mode 100644 index 95ace968..00000000 --- a/tests/manual/displaymodel/qml/meshes/monkey.obj +++ /dev/null @@ -1,1013 +0,0 @@ -# Blender v2.57 (sub 1) OBJ File: '' -# www.blender.org -mtllib monkey.mtl -o Monkey -v 0.447324 0.860709 -0.155921 -v -0.427676 0.860709 -0.155921 -v 0.509824 0.782584 -0.085608 -v -0.490176 0.782584 -0.085608 -v 0.556699 0.673209 -0.046546 -v -0.537051 0.673209 -0.046546 -v 0.361386 0.712272 0.031579 -v -0.341739 0.712272 0.031579 -v 0.361386 0.813834 -0.023108 -v -0.341739 0.813834 -0.023108 -v 0.361386 0.876334 -0.124671 -v -0.341739 0.876334 -0.124671 -v 0.283261 0.891959 -0.155921 -v -0.263614 0.891959 -0.155921 -v 0.212949 0.837272 -0.085608 -v -0.193301 0.837272 -0.085608 -v 0.166074 0.743522 -0.046546 -v -0.146426 0.743522 -0.046546 -v 0.087949 0.751334 -0.234046 -v -0.068301 0.751334 -0.234046 -v 0.150449 0.837272 -0.234046 -v -0.130801 0.837272 -0.234046 -v 0.252011 0.891959 -0.234046 -v -0.232364 0.891959 -0.234046 -v 0.283261 0.891959 -0.319983 -v -0.263614 0.891959 -0.319983 -v 0.212949 0.837272 -0.382483 -v -0.193301 0.837272 -0.382483 -v 0.166074 0.743522 -0.429358 -v -0.146426 0.743522 -0.429358 -v 0.361386 0.712272 -0.507483 -v -0.341739 0.712272 -0.507483 -v 0.361386 0.813834 -0.444983 -v -0.341739 0.813834 -0.444983 -v 0.361386 0.876334 -0.351233 -v -0.341739 0.876334 -0.351233 -v 0.447324 0.860709 -0.319983 -v -0.427676 0.860709 -0.319983 -v 0.509824 0.782584 -0.382483 -v -0.490176 0.782584 -0.382483 -v 0.556699 0.673209 -0.429358 -v -0.537051 0.673209 -0.429358 -v 0.634824 0.657584 -0.234046 -v -0.615176 0.657584 -0.234046 -v 0.572324 0.766959 -0.234046 -v -0.552676 0.766959 -0.234046 -v 0.478574 0.852897 -0.234046 -v -0.458926 0.852897 -0.234046 -v 0.486386 0.868522 -0.234046 -v -0.466739 0.868522 -0.234046 -v 0.455136 0.876334 -0.327796 -v -0.435489 0.876334 -0.327796 -v 0.361386 0.899772 -0.366858 -v -0.341739 0.899772 -0.366858 -v 0.275449 0.915397 -0.327796 -v -0.255801 0.915397 -0.327796 -v 0.236386 0.915397 -0.234046 -v -0.216739 0.915397 -0.234046 -v 0.275449 0.915397 -0.148108 -v -0.255801 0.915397 -0.148108 -v 0.361386 0.923209 -0.234046 -v -0.341739 0.923209 -0.234046 -v 0.361386 0.899772 -0.109046 -v -0.341739 0.899772 -0.109046 -v 0.455136 0.876334 -0.148108 -v -0.435489 0.876334 -0.148108 -v 0.009824 0.837272 -0.421546 -v 0.009824 0.915397 -0.343421 -v 0.009824 0.829459 0.687829 -v 0.009824 0.876334 0.328454 -v 0.009824 0.891959 0.195642 -v 0.009824 0.813834 0.781579 -v 0.009824 0.696647 -0.398108 -v 0.009824 0.665397 -0.562171 -v 0.009824 -0.451791 -0.890296 -v 0.009824 -0.756478 -0.554358 -v 0.009824 -0.733041 -0.062171 -v 0.009824 -0.256478 0.390954 -v 0.212949 0.657584 0.195642 -v -0.193301 0.657584 0.195642 -v 0.322324 0.665397 0.445642 -v -0.302676 0.665397 0.445642 -v 0.361386 0.665397 0.703454 -v -0.341739 0.665397 0.703454 -v 0.377011 0.626334 0.898767 -v -0.357364 0.626334 0.898767 -v 0.337949 0.618522 0.953454 -v -0.318301 0.618522 0.953454 -v 0.189511 0.649772 0.976892 -v -0.169864 0.649772 0.976892 -v 0.009824 0.673209 0.992517 -v 0.447324 0.626334 0.148767 -v -0.427676 0.626334 0.148767 -v 0.642636 0.634147 0.047204 -v -0.622989 0.634147 0.047204 -v 0.837949 0.540397 -0.140296 -v -0.818301 0.540397 -0.140296 -v 0.869199 0.688834 -0.421546 -v -0.849551 0.688834 -0.421546 -v 0.720761 0.720084 -0.476233 -v -0.701114 0.720084 -0.476233 -v 0.502011 0.782584 -0.593421 -v -0.482364 0.782584 -0.593421 -v 0.330136 0.829459 -0.749671 -v -0.310489 0.829459 -0.749671 -v 0.166074 0.852897 -0.710608 -v -0.146426 0.852897 -0.710608 -v 0.072324 0.845084 -0.484046 -v -0.052676 0.845084 -0.484046 -v 0.173886 0.868522 -0.405921 -v -0.154239 0.868522 -0.405921 -v 0.134824 0.860709 -0.296546 -v -0.115176 0.860709 -0.296546 -v 0.212949 0.837272 -0.085608 -v -0.193301 0.837272 -0.085608 -v 0.384824 0.798209 -0.007483 -v -0.365176 0.798209 -0.007483 -v 0.502011 0.766959 -0.054358 -v -0.482364 0.766959 -0.054358 -v 0.634824 0.743522 -0.179358 -v -0.615176 0.743522 -0.179358 -v 0.650449 0.743522 -0.288733 -v -0.630801 0.743522 -0.288733 -v 0.611386 0.759147 -0.366858 -v -0.591739 0.759147 -0.366858 -v 0.439511 0.813834 -0.429358 -v -0.419864 0.813834 -0.429358 -v 0.259824 0.852897 -0.460608 -v -0.240176 0.852897 -0.460608 -v 0.009824 0.829459 0.773767 -v 0.119199 0.829459 0.726892 -v -0.099551 0.829459 0.726892 -v 0.127011 0.806022 0.844079 -v -0.107364 0.806022 0.844079 -v 0.072324 0.790397 0.890954 -v -0.052676 0.790397 0.890954 -v 0.009824 0.782584 0.898767 -v 0.009824 0.845084 0.203454 -v 0.009824 0.837272 0.148767 -v 0.111386 0.837272 0.156579 -v -0.091739 0.837272 0.156579 -v 0.134824 0.845084 0.234704 -v -0.115176 0.845084 0.234704 -v 0.095761 0.837272 0.297204 -v -0.076114 0.837272 0.297204 -v 0.408261 0.766959 0.055017 -v -0.388614 0.766959 0.055017 -v 0.627011 0.720084 -0.046546 -v -0.607364 0.720084 -0.046546 -v 0.736386 0.696647 -0.194983 -v -0.716739 0.696647 -0.194983 -v 0.752011 0.751334 -0.366858 -v -0.732364 0.751334 -0.366858 -v 0.697324 0.821647 -0.405921 -v -0.677676 0.821647 -0.405921 -v 0.447324 0.891959 -0.538733 -v -0.427676 0.891959 -0.538733 -v 0.322324 0.931022 -0.632483 -v -0.302676 0.931022 -0.632483 -v 0.212949 0.946647 -0.609046 -v -0.193301 0.946647 -0.609046 -v 0.111386 0.938834 -0.421546 -v -0.091739 0.938834 -0.421546 -v 0.134824 0.907584 0.109704 -v -0.115176 0.907584 0.109704 -v 0.220761 0.806022 0.453454 -v -0.201114 0.806022 0.453454 -v 0.259824 0.782584 0.711267 -v -0.240176 0.782584 0.711267 -v 0.275449 0.759147 0.828454 -v -0.255801 0.759147 0.828454 -v 0.244199 0.727897 0.922204 -v -0.224551 0.727897 0.922204 -v 0.173886 0.727897 0.937829 -v -0.154239 0.727897 0.937829 -v 0.009824 0.735709 0.953454 -v 0.009824 0.821647 -0.038733 -v 0.009824 0.860709 -0.202796 -v 0.337949 0.837272 -0.468421 -v -0.318301 0.837272 -0.468421 -v 0.173886 0.845084 -0.132483 -v -0.154239 0.845084 -0.132483 -v 0.142636 0.852897 -0.202796 -v -0.122989 0.852897 -0.202796 -v 0.127011 0.829459 0.695642 -v -0.107364 0.829459 0.695642 -v 0.087949 0.845084 0.453454 -v -0.068301 0.845084 0.453454 -v 0.009824 0.845084 0.453454 -v 0.009824 0.837272 0.336267 -v 0.103574 0.876334 0.281579 -v -0.083926 0.876334 0.281579 -v 0.142636 0.891959 0.234704 -v -0.122989 0.891959 0.234704 -v 0.119199 0.876334 0.140954 -v -0.099551 0.876334 0.140954 -v 0.048886 0.876334 0.133142 -v -0.029239 0.876334 0.133142 -v 0.009824 0.923209 0.211267 -v 0.056699 0.907584 0.156579 -v -0.037051 0.907584 0.156579 -v 0.103574 0.907584 0.164392 -v -0.083926 0.907584 0.164392 -v 0.119199 0.923209 0.234704 -v -0.099551 0.923209 0.234704 -v 0.087949 0.899772 0.258142 -v -0.068301 0.899772 0.258142 -v 0.009824 0.899772 0.297204 -v 0.267636 0.649772 0.320642 -v -0.247989 0.649772 0.320642 -v 0.173886 0.806022 0.250329 -v -0.154239 0.806022 0.250329 -v 0.189511 0.806022 0.320642 -v -0.169864 0.806022 0.320642 -v 0.244199 0.649772 0.258142 -v -0.224551 0.649772 0.258142 -v 0.009824 0.782584 0.883142 -v 0.056699 0.782584 0.875329 -v -0.037051 0.782584 0.875329 -v 0.103574 0.806022 0.828454 -v -0.083926 0.806022 0.828454 -v 0.103574 0.821647 0.750329 -v -0.083926 0.821647 0.750329 -v 0.009824 0.751334 0.789392 -v 0.103574 0.759147 0.758142 -v -0.083926 0.759147 0.758142 -v 0.103574 0.735709 0.820642 -v -0.083926 0.735709 0.820642 -v 0.056699 0.727897 0.859704 -v -0.037051 0.727897 0.859704 -v 0.009824 0.727897 0.867517 -v 0.181699 0.876334 -0.210608 -v -0.162051 0.876334 -0.210608 -v 0.197324 0.868522 -0.148108 -v -0.177676 0.868522 -0.148108 -v 0.345761 0.852897 -0.421546 -v -0.326114 0.852897 -0.421546 -v 0.283261 0.868522 -0.413733 -v -0.263614 0.868522 -0.413733 -v 0.431699 0.868522 -0.390296 -v -0.412051 0.868522 -0.390296 -v 0.572324 0.790397 -0.343421 -v -0.552676 0.790397 -0.343421 -v 0.595761 0.782584 -0.280921 -v -0.576114 0.782584 -0.280921 -v 0.587949 0.774772 -0.187171 -v -0.568301 0.774772 -0.187171 -v 0.486386 0.813834 -0.093421 -v -0.466739 0.813834 -0.093421 -v 0.384824 0.837272 -0.054358 -v -0.365176 0.837272 -0.054358 -v 0.236386 0.876334 -0.101233 -v -0.216739 0.876334 -0.101233 -v 0.189511 0.876334 -0.288733 -v -0.169864 0.876334 -0.288733 -v 0.220761 0.876334 -0.366858 -v -0.201114 0.876334 -0.366858 -v 0.244199 0.852897 -0.351233 -v -0.224551 0.852897 -0.351233 -v 0.205136 0.852897 -0.288733 -v -0.185489 0.852897 -0.288733 -v 0.252011 0.852897 -0.116858 -v -0.232364 0.852897 -0.116858 -v 0.384824 0.821647 -0.077796 -v -0.365176 0.821647 -0.077796 -v 0.470761 0.798209 -0.109046 -v -0.451114 0.798209 -0.109046 -v 0.556699 0.766959 -0.202796 -v -0.537051 0.766959 -0.202796 -v 0.564511 0.766959 -0.273108 -v -0.544864 0.766959 -0.273108 -v 0.541074 0.774772 -0.327796 -v -0.521426 0.774772 -0.327796 -v 0.423886 0.845084 -0.382483 -v -0.404239 0.845084 -0.382483 -v 0.291074 0.860709 -0.390296 -v -0.271426 0.860709 -0.390296 -v 0.345761 0.845084 -0.398108 -v -0.326114 0.845084 -0.398108 -v 0.212949 0.845084 -0.163733 -v -0.193301 0.845084 -0.163733 -v 0.205136 0.845084 -0.218421 -v -0.185489 0.845084 -0.218421 -v 0.119199 0.704459 -0.452796 -v -0.099551 0.704459 -0.452796 -v 0.205136 0.712272 -0.655921 -v -0.185489 0.712272 -0.655921 -v 0.345761 0.688834 -0.679358 -v -0.326114 0.688834 -0.679358 -v 0.494199 0.649772 -0.546546 -v -0.474551 0.649772 -0.546546 -v 0.689511 0.587272 -0.444983 -v -0.669864 0.587272 -0.444983 -v 0.806699 0.556022 -0.398108 -v -0.787051 0.556022 -0.398108 -v 0.783261 0.470084 -0.155921 -v -0.763614 0.470084 -0.155921 -v 0.611386 0.509147 0.008142 -v -0.591739 0.509147 0.008142 -v 0.447324 0.563834 0.101892 -v -0.427676 0.563834 0.101892 -v 0.009824 0.384147 -0.890296 -v 0.009824 0.016959 -0.976233 -v 0.009824 -0.576791 0.203454 -v 0.009824 0.282584 0.469079 -v 0.009824 0.556022 0.984704 -v 0.009824 0.438834 0.812829 -v 0.009824 0.415397 0.578454 -v 0.009824 0.376334 0.492517 -v 0.861386 0.149772 -0.226233 -v -0.841739 0.149772 -0.226233 -v 0.869199 0.048209 -0.312171 -v -0.849551 0.048209 -0.312171 -v 0.783261 -0.342416 -0.257483 -v -0.763614 -0.342416 -0.257483 -v 0.470761 -0.608041 -0.429358 -v -0.451114 -0.608041 -0.429358 -v 0.744199 0.165397 0.055017 -v -0.724551 0.165397 0.055017 -v 0.603574 -0.068978 0.133142 -v -0.583926 -0.068978 0.133142 -v 0.650449 -0.334603 0.015954 -v -0.630801 -0.334603 0.015954 -v 0.345761 -0.568978 -0.046546 -v -0.326114 -0.568978 -0.046546 -v 0.244199 0.501334 0.359704 -v -0.224551 0.501334 0.359704 -v 0.189511 0.352897 0.422204 -v -0.169864 0.352897 0.422204 -v 0.298886 0.477897 0.719079 -v -0.279239 0.477897 0.719079 -v 0.259824 0.485709 0.508142 -v -0.240176 0.485709 0.508142 -v 0.337949 0.493522 0.922204 -v -0.318301 0.493522 0.922204 -v 0.150449 0.462272 0.765954 -v -0.130801 0.462272 0.765954 -v 0.134824 0.454459 0.547204 -v -0.115176 0.454459 0.547204 -v 0.173886 0.532584 0.953454 -v -0.154239 0.532584 0.953454 -v 0.228574 0.524772 0.289392 -v -0.208926 0.524772 0.289392 -v 0.220761 0.563834 0.234704 -v -0.201114 0.563834 0.234704 -v 0.212949 0.595084 0.180017 -v -0.193301 0.595084 0.180017 -v 0.220761 0.259147 0.398767 -v -0.201114 0.259147 0.398767 -v 0.306699 -0.170541 0.320642 -v -0.287051 -0.170541 0.320642 -v 0.353574 -0.443978 0.156579 -v -0.333926 -0.443978 0.156579 -v 0.462949 -0.287728 -0.859046 -v -0.443301 -0.287728 -0.859046 -v 0.462949 0.024772 -0.921546 -v -0.443301 0.024772 -0.921546 -v 0.462949 0.329459 -0.843421 -v -0.443301 0.329459 -0.843421 -v 0.470761 0.524772 -0.515296 -v -0.451114 0.524772 -0.515296 -v 0.736386 0.431022 -0.398108 -v -0.716739 0.431022 -0.398108 -v 0.642636 0.376334 -0.444983 -v -0.622989 0.376334 -0.444983 -v 0.650449 0.149772 -0.694983 -v -0.630801 0.149772 -0.694983 -v 0.806699 0.220084 -0.554358 -v -0.787051 0.220084 -0.554358 -v 0.806699 -0.022103 -0.609046 -v -0.787051 -0.022103 -0.609046 -v 0.650449 -0.100228 -0.741858 -v -0.630801 -0.100228 -0.741858 -v 0.650449 -0.350228 -0.671546 -v -0.630801 -0.350228 -0.671546 -v 0.806699 -0.264291 -0.530921 -v -0.787051 -0.264291 -0.530921 -v 0.627011 -0.490853 -0.319983 -v -0.607364 -0.490853 -0.319983 -v 0.494199 -0.451791 -0.015296 -v -0.474551 -0.451791 -0.015296 -v 0.830136 -0.108041 -0.319983 -v -0.810489 -0.108041 -0.319983 -v 0.416074 0.243522 0.180017 -v -0.396426 0.243522 0.180017 -v 0.439511 -0.115853 0.203454 -v -0.419864 -0.115853 0.203454 -v 0.900449 -0.139291 -0.398108 -v -0.880801 -0.139291 -0.398108 -v 0.783261 -0.029916 0.148767 -v -0.763614 -0.029916 0.148767 -v 1.048886 -0.233041 0.109704 -v -1.029239 -0.233041 0.109704 -v 1.291074 -0.334603 -0.046546 -v -1.271426 -0.334603 -0.046546 -v 1.361386 -0.326791 -0.312171 -v -1.341739 -0.326791 -0.312171 -v 1.244199 -0.326791 -0.499671 -v -1.224551 -0.326791 -0.499671 -v 1.033261 -0.217416 -0.468421 -v -1.013614 -0.217416 -0.468421 -v 1.025449 -0.193978 -0.405921 -v -1.005801 -0.193978 -0.405921 -v 1.197324 -0.295541 -0.429358 -v -1.177676 -0.295541 -0.429358 -v 1.275449 -0.311166 -0.280921 -v -1.255801 -0.311166 -0.280921 -v 1.220761 -0.311166 -0.069983 -v -1.201114 -0.311166 -0.069983 -v 1.041074 -0.209603 0.047204 -v -1.021426 -0.209603 0.047204 -v 0.837949 -0.037728 0.078454 -v -0.818301 -0.037728 0.078454 -v 0.931699 -0.123666 -0.351233 -v -0.912051 -0.123666 -0.351233 -v 0.955136 -0.193978 -0.296546 -v -0.935489 -0.193978 -0.296546 -v 0.892636 -0.115853 0.031579 -v -0.872989 -0.115853 0.031579 -v 1.048886 -0.272103 0.008142 -v -1.029239 -0.272103 0.008142 -v 1.197324 -0.350228 -0.085608 -v -1.177676 -0.350228 -0.085608 -v 1.244199 -0.350228 -0.241858 -v -1.224551 -0.350228 -0.241858 -v 1.181699 -0.342416 -0.351233 -v -1.162051 -0.342416 -0.351233 -v 1.033261 -0.264291 -0.335608 -v -1.013614 -0.264291 -0.335608 -v 0.853574 -0.115853 -0.280921 -v -0.833926 -0.115853 -0.280921 -v 0.845761 -0.178353 -0.163733 -v -0.826114 -0.178353 -0.163733 -v 0.767636 -0.178353 -0.085608 -v -0.747989 -0.178353 -0.085608 -v 0.830136 -0.178353 -0.077796 -v -0.810489 -0.178353 -0.077796 -v 0.853574 -0.178353 -0.007483 -v -0.833926 -0.178353 -0.007483 -v 0.822324 -0.178353 0.023767 -v -0.802676 -0.178353 0.023767 -v 0.736386 0.024772 0.008142 -v -0.716739 0.024772 0.008142 -v 0.728574 -0.076791 0.031579 -v -0.708926 -0.076791 0.031579 -v 0.728574 -0.092416 -0.030921 -v -0.708926 -0.092416 -0.030921 -v 0.806699 -0.115853 -0.194983 -v -0.787051 -0.115853 -0.194983 -v 0.900449 -0.170541 -0.234046 -v -0.880801 -0.170541 -0.234046 -v 0.900449 -0.225228 -0.226233 -v -0.880801 -0.225228 -0.226233 -v 0.822324 -0.225228 0.023767 -v -0.802676 -0.225228 0.023767 -v 0.861386 -0.225228 -0.007483 -v -0.841739 -0.225228 -0.007483 -v 0.837949 -0.225228 -0.069983 -v -0.818301 -0.225228 -0.069983 -v 0.775449 -0.225228 -0.085608 -v -0.755801 -0.225228 -0.085608 -v 0.853574 -0.225228 -0.163733 -v -0.833926 -0.225228 -0.163733 -v 1.048886 -0.318978 -0.319983 -v -1.029239 -0.318978 -0.319983 -v 1.197324 -0.389291 -0.335608 -v -1.177676 -0.389291 -0.335608 -v 1.267636 -0.397103 -0.234046 -v -1.247989 -0.397103 -0.234046 -v 1.220761 -0.389291 -0.077796 -v -1.201114 -0.389291 -0.077796 -v 1.056699 -0.326791 0.008142 -v -1.037051 -0.326791 0.008142 -v 0.892636 -0.170541 0.023767 -v -0.872989 -0.170541 0.023767 -v 0.962949 -0.248666 -0.280921 -v -0.943301 -0.248666 -0.280921 -v 0.900449 -0.233041 -0.101233 -v -0.880801 -0.233041 -0.101233 -v 0.947324 -0.240853 -0.054358 -v -0.927676 -0.240853 -0.054358 -v 1.009824 -0.272103 -0.116858 -v -0.990176 -0.272103 -0.116858 -v 0.970761 -0.256478 -0.163733 -v -0.951114 -0.256478 -0.163733 -v 1.025449 -0.279916 -0.226233 -v -1.005801 -0.279916 -0.226233 -v 1.064511 -0.287728 -0.179358 -v -1.044864 -0.287728 -0.179358 -v 1.119199 -0.295541 -0.202796 -v -1.099551 -0.295541 -0.202796 -v 1.095761 -0.295541 -0.265296 -v -1.076114 -0.295541 -0.265296 -v 1.033261 -0.389291 -0.429358 -v -1.013614 -0.389291 -0.429358 -v 1.259824 -0.451791 -0.460608 -v -1.240176 -0.451791 -0.460608 -v 1.377011 -0.404916 -0.288733 -v -1.357364 -0.404916 -0.288733 -v 1.322324 -0.436166 -0.046546 -v -1.302676 -0.436166 -0.046546 -v 1.048886 -0.397103 0.094079 -v -1.029239 -0.397103 0.094079 -v 0.798886 -0.233041 0.133142 -v -0.779239 -0.233041 0.133142 -v 0.869199 -0.287728 -0.374671 -v -0.849551 -0.287728 -0.374671 -usemtl (null) -s off -f 47 1 3 45 -f 4 2 48 46 -f 45 3 5 43 -f 6 4 46 44 -f 3 9 7 5 -f 8 10 4 6 -f 1 11 9 3 -f 10 12 2 4 -f 11 13 15 9 -f 16 14 12 10 -f 9 15 17 7 -f 18 16 10 8 -f 15 21 19 17 -f 20 22 16 18 -f 13 23 21 15 -f 22 24 14 16 -f 23 25 27 21 -f 28 26 24 22 -f 21 27 29 19 -f 30 28 22 20 -f 27 33 31 29 -f 32 34 28 30 -f 25 35 33 27 -f 34 36 26 28 -f 35 37 39 33 -f 40 38 36 34 -f 33 39 41 31 -f 42 40 34 32 -f 39 45 43 41 -f 44 46 40 42 -f 37 47 45 39 -f 46 48 38 40 -f 47 37 51 49 -f 52 38 48 50 -f 37 35 53 51 -f 54 36 38 52 -f 35 25 55 53 -f 56 26 36 54 -f 25 23 57 55 -f 58 24 26 56 -f 23 13 59 57 -f 60 14 24 58 -f 13 11 63 59 -f 64 12 14 60 -f 11 1 65 63 -f 66 2 12 64 -f 1 47 49 65 -f 50 48 2 66 -f 61 65 49 -f 50 66 62 -f 63 65 61 -f 62 66 64 -f 61 59 63 -f 64 60 62 -f 61 57 59 -f 60 58 62 -f 61 55 57 -f 58 56 62 -f 61 53 55 -f 56 54 62 -f 61 51 53 -f 54 52 62 -f 61 49 51 -f 52 50 62 -f 89 174 176 91 -f 176 175 90 91 -f 87 172 174 89 -f 175 173 88 90 -f 85 170 172 87 -f 173 171 86 88 -f 83 168 170 85 -f 171 169 84 86 -f 81 166 168 83 -f 169 167 82 84 -f 79 92 146 164 -f 147 93 80 165 -f 92 94 148 146 -f 149 95 93 147 -f 94 96 150 148 -f 151 97 95 149 -f 96 98 152 150 -f 153 99 97 151 -f 98 100 154 152 -f 155 101 99 153 -f 100 102 156 154 -f 157 103 101 155 -f 102 104 158 156 -f 159 105 103 157 -f 104 106 160 158 -f 161 107 105 159 -f 106 108 162 160 -f 163 109 107 161 -f 108 67 68 162 -f 68 67 109 163 -f 110 128 160 162 -f 161 129 111 163 -f 128 179 158 160 -f 159 180 129 161 -f 126 156 158 179 -f 159 157 127 180 -f 124 154 156 126 -f 157 155 125 127 -f 122 152 154 124 -f 155 153 123 125 -f 120 150 152 122 -f 153 151 121 123 -f 118 148 150 120 -f 151 149 119 121 -f 116 146 148 118 -f 149 147 117 119 -f 114 164 146 116 -f 147 165 115 117 -f 114 181 177 164 -f 177 182 115 165 -f 110 162 68 112 -f 68 163 111 113 -f 112 68 178 183 -f 178 68 113 184 -f 177 181 183 178 -f 184 182 177 178 -f 135 137 176 174 -f 176 137 136 175 -f 133 135 174 172 -f 175 136 134 173 -f 131 133 172 170 -f 173 134 132 171 -f 166 187 185 168 -f 186 188 167 169 -f 131 170 168 185 -f 169 171 132 186 -f 144 190 189 187 -f 189 190 145 188 -f 185 187 189 69 -f 189 188 186 69 -f 130 131 185 69 -f 186 132 130 69 -f 142 193 191 144 -f 192 194 143 145 -f 140 195 193 142 -f 194 196 141 143 -f 139 197 195 140 -f 196 198 139 141 -f 138 71 197 139 -f 198 71 138 139 -f 190 144 191 70 -f 192 145 190 70 -f 70 191 206 208 -f 207 192 70 208 -f 71 199 200 197 -f 201 199 71 198 -f 197 200 202 195 -f 203 201 198 196 -f 195 202 204 193 -f 205 203 196 194 -f 193 204 206 191 -f 207 205 194 192 -f 199 204 202 200 -f 203 205 199 201 -f 199 208 206 204 -f 207 208 199 205 -f 139 140 164 177 -f 165 141 139 177 -f 140 142 211 164 -f 212 143 141 165 -f 142 144 213 211 -f 214 145 143 212 -f 144 187 166 213 -f 167 188 145 214 -f 81 209 213 166 -f 214 210 82 167 -f 209 215 211 213 -f 212 216 210 214 -f 79 164 211 215 -f 212 165 80 216 -f 131 130 72 222 -f 72 130 132 223 -f 133 131 222 220 -f 223 132 134 221 -f 135 133 220 218 -f 221 134 136 219 -f 137 135 218 217 -f 219 136 137 217 -f 217 218 229 231 -f 230 219 217 231 -f 218 220 227 229 -f 228 221 219 230 -f 220 222 225 227 -f 226 223 221 228 -f 222 72 224 225 -f 224 72 223 226 -f 224 231 229 225 -f 230 231 224 226 -f 225 229 227 -f 228 230 226 -f 183 181 234 232 -f 235 182 184 233 -f 112 183 232 254 -f 233 184 113 255 -f 110 112 254 256 -f 255 113 111 257 -f 181 114 252 234 -f 253 115 182 235 -f 114 116 250 252 -f 251 117 115 253 -f 116 118 248 250 -f 249 119 117 251 -f 118 120 246 248 -f 247 121 119 249 -f 120 122 244 246 -f 245 123 121 247 -f 122 124 242 244 -f 243 125 123 245 -f 124 126 240 242 -f 241 127 125 243 -f 126 179 236 240 -f 237 180 127 241 -f 179 128 238 236 -f 239 129 180 237 -f 128 110 256 238 -f 257 111 129 239 -f 238 256 258 276 -f 259 257 239 277 -f 236 238 276 278 -f 277 239 237 279 -f 240 236 278 274 -f 279 237 241 275 -f 242 240 274 272 -f 275 241 243 273 -f 244 242 272 270 -f 273 243 245 271 -f 246 244 270 268 -f 271 245 247 269 -f 248 246 268 266 -f 269 247 249 267 -f 250 248 266 264 -f 267 249 251 265 -f 252 250 264 262 -f 265 251 253 263 -f 234 252 262 280 -f 263 253 235 281 -f 256 254 260 258 -f 261 255 257 259 -f 254 232 282 260 -f 283 233 255 261 -f 232 234 280 282 -f 281 235 233 283 -f 67 108 284 73 -f 285 109 67 73 -f 108 106 286 284 -f 287 107 109 285 -f 106 104 288 286 -f 289 105 107 287 -f 104 102 290 288 -f 291 103 105 289 -f 102 100 292 290 -f 293 101 103 291 -f 100 98 294 292 -f 295 99 101 293 -f 98 96 296 294 -f 297 97 99 295 -f 96 94 298 296 -f 299 95 97 297 -f 94 92 300 298 -f 301 93 95 299 -f 308 309 328 338 -f 329 309 308 339 -f 307 308 338 336 -f 339 308 307 337 -f 306 307 336 340 -f 337 307 306 341 -f 89 91 306 340 -f 306 91 90 341 -f 87 89 340 334 -f 341 90 88 335 -f 85 87 334 330 -f 335 88 86 331 -f 83 85 330 332 -f 331 86 84 333 -f 330 336 338 332 -f 339 337 331 333 -f 330 334 340 336 -f 341 335 331 337 -f 326 332 338 328 -f 339 333 327 329 -f 81 83 332 326 -f 333 84 82 327 -f 209 342 344 215 -f 345 343 210 216 -f 81 326 342 209 -f 343 327 82 210 -f 79 215 344 346 -f 345 216 80 347 -f 79 346 300 92 -f 301 347 80 93 -f 77 324 352 304 -f 353 325 77 304 -f 304 352 350 78 -f 351 353 304 78 -f 78 350 348 305 -f 349 351 78 305 -f 305 348 328 309 -f 329 349 305 309 -f 326 328 348 342 -f 349 329 327 343 -f 296 298 318 310 -f 319 299 297 311 -f 76 316 324 77 -f 325 317 76 77 -f 302 358 356 303 -f 357 359 302 303 -f 303 356 354 75 -f 355 357 303 75 -f 75 354 316 76 -f 317 355 75 76 -f 292 294 362 364 -f 363 295 293 365 -f 364 362 368 366 -f 369 363 365 367 -f 366 368 370 372 -f 371 369 367 373 -f 372 370 376 374 -f 377 371 373 375 -f 314 378 374 376 -f 375 379 315 377 -f 316 354 374 378 -f 375 355 317 379 -f 354 356 372 374 -f 373 357 355 375 -f 356 358 366 372 -f 367 359 357 373 -f 358 360 364 366 -f 365 361 359 367 -f 290 292 364 360 -f 365 293 291 361 -f 74 360 358 302 -f 359 361 74 302 -f 284 286 288 290 -f 289 287 285 291 -f 284 290 360 74 -f 361 291 285 74 -f 73 284 74 -f 74 285 73 -f 294 296 310 362 -f 311 297 295 363 -f 310 312 368 362 -f 369 313 311 363 -f 312 382 370 368 -f 371 383 313 369 -f 314 376 370 382 -f 371 377 315 383 -f 348 350 386 384 -f 387 351 349 385 -f 318 384 386 320 -f 387 385 319 321 -f 298 300 384 318 -f 385 301 299 319 -f 300 344 342 384 -f 343 345 301 385 -f 342 348 384 -f 385 349 343 -f 300 346 344 -f 345 347 301 -f 314 322 380 378 -f 381 323 315 379 -f 316 378 380 324 -f 381 379 317 325 -f 320 386 380 322 -f 381 387 321 323 -f 350 352 380 386 -f 381 353 351 387 -f 324 380 352 -f 353 381 325 -f 400 388 414 402 -f 415 389 401 403 -f 400 402 404 398 -f 405 403 401 399 -f 398 404 406 396 -f 407 405 399 397 -f 396 406 408 394 -f 409 407 397 395 -f 394 408 410 392 -f 411 409 395 393 -f 392 410 412 390 -f 413 411 393 391 -f 410 420 418 412 -f 419 421 411 413 -f 408 422 420 410 -f 421 423 409 411 -f 406 424 422 408 -f 423 425 407 409 -f 404 426 424 406 -f 425 427 405 407 -f 402 428 426 404 -f 427 429 403 405 -f 402 414 416 428 -f 417 415 403 429 -f 318 320 444 442 -f 445 321 319 443 -f 320 390 412 444 -f 413 391 321 445 -f 310 318 442 312 -f 443 319 311 313 -f 382 430 414 388 -f 415 431 383 389 -f 412 418 440 444 -f 441 419 413 445 -f 438 446 444 440 -f 445 447 439 441 -f 434 446 438 436 -f 439 447 435 437 -f 432 448 446 434 -f 447 449 433 435 -f 430 448 432 450 -f 433 449 431 451 -f 414 430 450 416 -f 451 431 415 417 -f 312 448 430 382 -f 431 449 313 383 -f 312 442 446 448 -f 447 443 313 449 -f 442 444 446 -f 447 445 443 -f 416 450 452 476 -f 453 451 417 477 -f 450 432 462 452 -f 463 433 451 453 -f 432 434 460 462 -f 461 435 433 463 -f 434 436 458 460 -f 459 437 435 461 -f 436 438 456 458 -f 457 439 437 459 -f 438 440 454 456 -f 455 441 439 457 -f 440 418 474 454 -f 475 419 441 455 -f 428 416 476 464 -f 477 417 429 465 -f 426 428 464 466 -f 465 429 427 467 -f 424 426 466 468 -f 467 427 425 469 -f 422 424 468 470 -f 469 425 423 471 -f 420 422 470 472 -f 471 423 421 473 -f 418 420 472 474 -f 473 421 419 475 -f 458 456 480 478 -f 481 457 459 479 -f 478 480 482 484 -f 483 481 479 485 -f 484 482 488 486 -f 489 483 485 487 -f 486 488 490 492 -f 491 489 487 493 -f 464 476 486 492 -f 487 477 465 493 -f 452 484 486 476 -f 487 485 453 477 -f 452 462 478 484 -f 479 463 453 485 -f 458 478 462 460 -f 463 479 459 461 -f 454 474 480 456 -f 481 475 455 457 -f 472 482 480 474 -f 481 483 473 475 -f 470 488 482 472 -f 483 489 471 473 -f 468 490 488 470 -f 489 491 469 471 -f 466 492 490 468 -f 491 493 467 469 -f 464 492 466 -f 467 493 465 -f 392 390 504 502 -f 505 391 393 503 -f 394 392 502 500 -f 503 393 395 501 -f 396 394 500 498 -f 501 395 397 499 -f 398 396 498 496 -f 499 397 399 497 -f 400 398 496 494 -f 497 399 401 495 -f 388 400 494 506 -f 495 401 389 507 -f 494 502 504 506 -f 505 503 495 507 -f 494 496 500 502 -f 501 497 495 503 -f 496 498 500 -f 501 499 497 -f 314 382 388 506 -f 389 383 315 507 -f 314 506 504 322 -f 505 507 315 323 -f 320 322 504 390 -f 505 323 321 391 diff --git a/tests/manual/displaymodel/qml/meshes/teapot.bez b/tests/manual/displaymodel/qml/meshes/teapot.bez deleted file mode 100644 index 02b2ac44..00000000 --- a/tests/manual/displaymodel/qml/meshes/teapot.bez +++ /dev/null @@ -1,340 +0,0 @@ -32 -1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 -4,17,18,19,8,20,21,22,12,23,24,25,16,26,27,28 -19,29,30,31,22,32,33,34,25,35,36,37,28,38,39,40 -31,41,42,1,34,43,44,5,37,45,46,9,40,47,48,13 -13,14,15,16,49,50,51,52,53,54,55,56,57,58,59,60 -16,26,27,28,52,61,62,63,56,64,65,66,60,67,68,69 -28,38,39,40,63,70,71,72,66,73,74,75,69,76,77,78 -40,47,48,13,72,79,80,49,75,81,82,53,78,83,84,57 -57,58,59,60,85,86,87,88,89,90,91,92,93,94,95,96 -60,67,68,69,88,97,98,99,92,100,101,102,96,103,104,105 -69,76,77,78,99,106,107,108,102,109,110,111,105,112,113,114 -78,83,84,57,108,115,116,85,111,117,118,89,114,119,120,93 -121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136 -124,137,138,121,128,139,140,125,132,141,142,129,136,143,144,133 -133,134,135,136,145,146,147,148,149,150,151,152,69,153,154,155 -136,143,144,133,148,156,157,145,152,158,159,149,155,160,161,69 -162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177 -165,178,179,162,169,180,181,166,173,182,183,170,177,184,185,174 -174,175,176,177,186,187,188,189,190,191,192,193,194,195,196,197 -177,184,185,174,189,198,199,186,193,200,201,190,197,202,203,194 -204,204,204,204,207,208,209,210,211,211,211,211,212,213,214,215,4 -204,204,204,204,210,217,218,219,211,211,211,211,215,220,221,222,4 -204,204,204,204,219,224,225,226,211,211,211,211,222,227,228,229,4 -204,204,204,204,226,230,231,207,211,211,211,211,229,232,233,212,4 -212,213,214,215,234,235,236,237,238,239,240,241,242,243,244,245 -215,220,221,222,237,246,247,248,241,249,250,251,245,252,253,254 -222,227,228,229,248,255,256,257,251,258,259,260,254,261,262,263 -229,232,233,212,257,264,265,234,260,266,267,238,263,268,269,242 -270,270,270,270,279,280,281,282,275,276,277,278,271,272,273,274,4 -270,270,270,270,282,289,290,291,278,286,287,288,274,283,284,285,4 -270,270,270,270,291,298,299,300,288,295,296,297,285,292,293,294,4 -270,270,270,270,300,305,306,279,297,303,304,275,294,301,302,271,4 -306 -0.700000,0.450000,-0.000000 -0.700000,0.450000,0.392000 -0.392000,0.450000,0.700000 -0.000000,0.450000,0.700000 -0.668750,0.515625,-0.000000 -0.668750,0.515625,0.374500 -0.374500,0.515625,0.668750 -0.000000,0.515625,0.668750 -0.718750,0.515625,-0.000000 -0.718750,0.515625,0.402500 -0.402500,0.515625,0.718750 -0.000000,0.515625,0.718750 -0.750000,0.450000,-0.000000 -0.750000,0.450000,0.420000 -0.420000,0.450000,0.750000 -0.000000,0.450000,0.750000 --0.392000,0.450000,0.700000 --0.700000,0.450000,0.392000 --0.700000,0.450000,-0.000000 --0.374500,0.515625,0.668750 --0.668750,0.515625,0.374500 --0.668750,0.515625,-0.000000 --0.402500,0.515625,0.718750 --0.718750,0.515625,0.402500 --0.718750,0.515625,-0.000000 --0.420000,0.450000,0.750000 --0.750000,0.450000,0.420000 --0.750000,0.450000,-0.000000 --0.700000,0.450000,-0.392000 --0.392000,0.450000,-0.700000 -0.000000,0.450000,-0.700000 --0.668750,0.515625,-0.374500 --0.374500,0.515625,-0.668750 -0.000000,0.515625,-0.668750 --0.718750,0.515625,-0.402500 --0.402500,0.515625,-0.718750 -0.000000,0.515625,-0.718750 --0.750000,0.450000,-0.420000 --0.420000,0.450000,-0.750000 -0.000000,0.450000,-0.750000 -0.392000,0.450000,-0.700000 -0.700000,0.450000,-0.392000 -0.374500,0.515625,-0.668750 -0.668750,0.515625,-0.374500 -0.402500,0.515625,-0.718750 -0.718750,0.515625,-0.402500 -0.420000,0.450000,-0.750000 -0.750000,0.450000,-0.420000 -0.875000,0.187500,-0.000000 -0.875000,0.187500,0.490000 -0.490000,0.187500,0.875000 -0.000000,0.187500,0.875000 -1.000000,-0.075000,-0.000000 -1.000000,-0.075000,0.560000 -0.560000,-0.075000,1.000000 -0.000000,-0.075000,1.000000 -1.000000,-0.300000,-0.000000 -1.000000,-0.300000,0.560000 -0.560000,-0.300000,1.000000 -0.000000,-0.300000,1.000000 --0.490000,0.187500,0.875000 --0.875000,0.187500,0.490000 --0.875000,0.187500,-0.000000 --0.560000,-0.075000,1.000000 --1.000000,-0.075000,0.560000 --1.000000,-0.075000,-0.000000 --0.560000,-0.300000,1.000000 --1.000000,-0.300000,0.560000 --1.000000,-0.300000,-0.000000 --0.875000,0.187500,-0.490000 --0.490000,0.187500,-0.875000 -0.000000,0.187500,-0.875000 --1.000000,-0.075000,-0.560000 --0.560000,-0.075000,-1.000000 -0.000000,-0.075000,-1.000000 --1.000000,-0.300000,-0.560000 --0.560000,-0.300000,-1.000000 -0.000000,-0.300000,-1.000000 -0.490000,0.187500,-0.875000 -0.875000,0.187500,-0.490000 -0.560000,-0.075000,-1.000000 -1.000000,-0.075000,-0.560000 -0.560000,-0.300000,-1.000000 -1.000000,-0.300000,-0.560000 -1.000000,-0.525000,-0.000000 -1.000000,-0.525000,0.560000 -0.560000,-0.525000,1.000000 -0.000000,-0.525000,1.000000 -0.750000,-0.637500,-0.000000 -0.750000,-0.637500,0.420000 -0.420000,-0.637500,0.750000 -0.000000,-0.637500,0.750000 -0.750000,-0.675000,-0.000000 -0.750000,-0.675000,0.420000 -0.420000,-0.675000,0.750000 -0.000000,-0.675000,0.750000 --0.560000,-0.525000,1.000000 --1.000000,-0.525000,0.560000 --1.000000,-0.525000,-0.000000 --0.420000,-0.637500,0.750000 --0.750000,-0.637500,0.420000 --0.750000,-0.637500,-0.000000 --0.420000,-0.675000,0.750000 --0.750000,-0.675000,0.420000 --0.750000,-0.675000,-0.000000 --1.000000,-0.525000,-0.560000 --0.560000,-0.525000,-1.000000 -0.000000,-0.525000,-1.000000 --0.750000,-0.637500,-0.420000 --0.420000,-0.637500,-0.750000 -0.000000,-0.637500,-0.750000 --0.750000,-0.675000,-0.420000 --0.420000,-0.675000,-0.750000 -0.000000,-0.675000,-0.750000 -0.560000,-0.525000,-1.000000 -1.000000,-0.525000,-0.560000 -0.420000,-0.637500,-0.750000 -0.750000,-0.637500,-0.420000 -0.420000,-0.675000,-0.750000 -0.750000,-0.675000,-0.420000 --0.800000,0.262500,-0.000000 --0.800000,0.262500,0.150000 --0.750000,0.375000,0.150000 --0.750000,0.375000,-0.000000 --1.150000,0.262500,-0.000000 --1.150000,0.262500,0.150000 --1.250000,0.375000,0.150000 --1.250000,0.375000,-0.000000 --1.350000,0.262500,-0.000000 --1.350000,0.262500,0.150000 --1.500000,0.375000,0.150000 --1.500000,0.375000,-0.000000 --1.350000,0.150000,-0.000000 --1.350000,0.150000,0.150000 --1.500000,0.150000,0.150000 --1.500000,0.150000,-0.000000 --0.750000,0.375000,-0.150000 --0.800000,0.262500,-0.150000 --1.250000,0.375000,-0.150000 --1.150000,0.262500,-0.150000 --1.500000,0.375000,-0.150000 --1.350000,0.262500,-0.150000 --1.500000,0.150000,-0.150000 --1.350000,0.150000,-0.150000 --1.350000,0.037500,-0.000000 --1.350000,0.037500,0.150000 --1.500000,-0.075000,0.150000 --1.500000,-0.075000,-0.000000 --1.250000,-0.187500,-0.000000 --1.250000,-0.187500,0.150000 --1.325000,-0.281250,0.150000 --1.325000,-0.281250,-0.000000 --1.000000,-0.300000,0.150000 --0.950000,-0.450000,0.150000 --0.950000,-0.450000,-0.000000 --1.500000,-0.075000,-0.150000 --1.350000,0.037500,-0.150000 --1.325000,-0.281250,-0.150000 --1.250000,-0.187500,-0.150000 --0.950000,-0.450000,-0.150000 --1.000000,-0.300000,-0.150000 -0.850000,-0.037500,-0.000000 -0.850000,-0.037500,0.330000 -0.850000,-0.450000,0.330000 -0.850000,-0.450000,-0.000000 -1.300000,-0.037500,-0.000000 -1.300000,-0.037500,0.330000 -1.550000,-0.337500,0.330000 -1.550000,-0.337500,-0.000000 -1.150000,0.300000,-0.000000 -1.150000,0.300000,0.125000 -1.200000,0.262500,0.125000 -1.200000,0.262500,-0.000000 -1.350000,0.450000,-0.000000 -1.350000,0.450000,0.125000 -1.650000,0.450000,0.125000 -1.650000,0.450000,-0.000000 -0.850000,-0.450000,-0.330000 -0.850000,-0.037500,-0.330000 -1.550000,-0.337500,-0.330000 -1.300000,-0.037500,-0.330000 -1.200000,0.262500,-0.125000 -1.150000,0.300000,-0.125000 -1.650000,0.450000,-0.125000 -1.350000,0.450000,-0.125000 -1.400000,0.487500,-0.000000 -1.400000,0.487500,0.125000 -1.762500,0.496875,0.125000 -1.762500,0.496875,-0.000000 -1.450000,0.487500,-0.000000 -1.450000,0.487500,0.075000 -1.725000,0.506250,0.075000 -1.725000,0.506250,-0.000000 -1.400000,0.450000,-0.000000 -1.400000,0.450000,0.075000 -1.600000,0.450000,0.075000 -1.600000,0.450000,-0.000000 -1.762500,0.496875,-0.125000 -1.400000,0.487500,-0.125000 -1.725000,0.506250,-0.075000 -1.450000,0.487500,-0.075000 -1.600000,0.450000,-0.075000 -1.400000,0.450000,-0.075000 -0.000000,0.825000,-0.000000 -0.000000,0.825000,0.001000 -0.001000,0.825000,-0.000000 -0.400000,0.825000,-0.000000 -0.400000,0.825000,0.225000 -0.225000,0.825000,0.400000 -0.000000,0.825000,0.400000 -0.000000,0.675000,-0.000000 -0.100000,0.600000,-0.000000 -0.100000,0.600000,0.056000 -0.056000,0.600000,0.100000 -0.000000,0.600000,0.100000 --0.001000,0.825000,-0.000000 --0.225000,0.825000,0.400000 --0.400000,0.825000,0.225000 --0.400000,0.825000,-0.000000 --0.056000,0.600000,0.100000 --0.100000,0.600000,0.056000 --0.100000,0.600000,-0.000000 -0.000000,0.825000,-0.001000 --0.400000,0.825000,-0.225000 --0.225000,0.825000,-0.400000 -0.000000,0.825000,-0.400000 --0.100000,0.600000,-0.056000 --0.056000,0.600000,-0.100000 -0.000000,0.600000,-0.100000 -0.225000,0.825000,-0.400000 -0.400000,0.825000,-0.225000 -0.056000,0.600000,-0.100000 -0.100000,0.600000,-0.056000 -0.200000,0.525000,-0.000000 -0.200000,0.525000,0.112000 -0.112000,0.525000,0.200000 -0.000000,0.525000,0.200000 -0.650000,0.525000,-0.000000 -0.650000,0.525000,0.364000 -0.364000,0.525000,0.650000 -0.000000,0.525000,0.650000 -0.650000,0.450000,-0.000000 -0.650000,0.450000,0.364000 -0.364000,0.450000,0.650000 -0.000000,0.450000,0.650000 --0.112000,0.525000,0.200000 --0.200000,0.525000,0.112000 --0.200000,0.525000,-0.000000 --0.364000,0.525000,0.650000 --0.650000,0.525000,0.364000 --0.650000,0.525000,-0.000000 --0.364000,0.450000,0.650000 --0.650000,0.450000,0.364000 --0.650000,0.450000,-0.000000 --0.200000,0.525000,-0.112000 --0.112000,0.525000,-0.200000 -0.000000,0.525000,-0.200000 --0.650000,0.525000,-0.364000 --0.364000,0.525000,-0.650000 -0.000000,0.525000,-0.650000 --0.650000,0.450000,-0.364000 --0.364000,0.450000,-0.650000 -0.000000,0.450000,-0.650000 -0.112000,0.525000,-0.200000 -0.200000,0.525000,-0.112000 -0.364000,0.525000,-0.650000 -0.650000,0.525000,-0.364000 -0.364000,0.450000,-0.650000 -0.650000,0.450000,-0.364000 -0.000000,-0.750000,-0.000000 -0.750000,-0.675000,-0.000000 -0.750000,-0.675000,-0.420000 -0.420000,-0.675000,-0.750000 -0.000000,-0.675000,-0.750000 -0.750000,-0.712500,-0.000000 -0.750000,-0.712500,-0.420000 -0.420000,-0.712500,-0.750000 -0.000000,-0.712500,-0.750000 -0.712500,-0.750000,-0.000000 -0.712500,-0.750000,-0.399000 -0.399000,-0.750000,-0.712500 -0.000000,-0.750000,-0.712500 --0.420000,-0.675000,-0.750000 --0.750000,-0.675000,-0.420000 --0.750000,-0.675000,-0.000000 --0.420000,-0.712500,-0.750000 --0.750000,-0.712500,-0.420000 --0.750000,-0.712500,-0.000000 --0.399000,-0.750000,-0.712500 --0.712500,-0.750000,-0.399000 --0.712500,-0.750000,-0.000000 --0.750000,-0.675000,0.420000 --0.420000,-0.675000,0.750000 -0.000000,-0.675000,0.750000 --0.750000,-0.712500,0.420000 --0.420000,-0.712500,0.750000 -0.000000,-0.712500,0.750000 --0.712500,-0.750000,0.399000 --0.399000,-0.750000,0.712500 -0.000000,-0.750000,0.712500 -0.420000,-0.675000,0.750000 -0.750000,-0.675000,0.420000 -0.420000,-0.712500,0.750000 -0.750000,-0.712500,0.420000 -0.399000,-0.750000,0.712500 -0.712500,-0.750000,0.399000 diff --git a/tests/manual/displaymodel/qml/tst_displaymodel.qml b/tests/manual/displaymodel/qml/tst_displaymodel.qml deleted file mode 100644 index 219d6993..00000000 --- a/tests/manual/displaymodel/qml/tst_displaymodel.qml +++ /dev/null @@ -1,371 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17392 / QTBUG-17391 -Item { - id: screen - width: 720 - height: 480 - - //ITEM 1: Points - Rectangle { - id: panel1 - x: 0; y:0 - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,3,15)} - picking: true - - Point { - vertices: [ - -1, 1, 0, - -1, -2, 0, - 1, -2, 0 - ] - pointSize: 3 - onClicked: console.log("Points clicked") - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text1.height + 10 - Text { - id: text1 - width: parent.width - wrapMode: "WordWrap" - text: " POINT CONSTRUCTION:\n 3 Points in an L shape should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 2: Lines - Rectangle { - id: panel2 - anchors.left: panel1.right - anchors.top: parent.top - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,3,15)} - picking: true - - Line { - vertices: [ - -1, 1, 0, - -1, -2, 0, - 1, -2, 0 - ] - width: 3 - onClicked: console.log("Line clicked") - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text2.height + 10 - Text { - id: text2 - width: parent.width - wrapMode: "WordWrap" - text: " LINE CONSTRUCTION:\n 2 Lines in an L shape should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 3: A Sphere - Rectangle { - id: panel3 - anchors.left: panel2.right - anchors.top: parent.top - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Sphere {onClicked: console.log("Sphere clicked")} - } - //text for item3 - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text3.height + 10 - Text { - id: text3 - width: parent.width - wrapMode: "WordWrap" - text: " SPHERE CONSTRUCTION:\n A shaded sphere should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 4: A Cylinder - Rectangle { - id: panel4 - anchors.left: parent.left - anchors.top: panel1.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Cylinder {height: 3; onClicked: console.log("Cylinder clicked");} - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text4.height + 10 - Text { - id: text4 - width: parent.width - wrapMode: "WordWrap" - text: " CYLINDER CONSTRUCTION:\n A shaded cylinder with 8 sides should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 5: A Capsule - Rectangle { - id: panel5 - anchors.left: panel4.right - anchors.top: panel2.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Capsule {onClicked: console.log("Capsule clicked");} - - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text5.height + 10 - Text { - id: text5 - width: parent.width - wrapMode: "WordWrap" - text: " CAPSULE CONSTRUCTION:\n A shaded capsule with 8 sides should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 6: A Quad - Rectangle { - id: panel6 - anchors.left: panel5.right - anchors.top: panel3.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera {eye: Qt.vector3d(0,5,10)} - picking: true - - Quad { - scale: 2; - onClicked: console.log("Quad clicked") - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text6.height + 10 - Text { - id: text6 - width: parent.width - wrapMode: "WordWrap" - text: " .OBJ LOADING:\n A planar quad should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 7: A Cube - Rectangle { - id: panel7 - anchors.left: parent.left - anchors.top: panel4.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Cube { - scale: 2 - onClicked: console.log("Cube clicked"); - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text7.height + 10 - Text { - id: text7 - width: parent.width - wrapMode: "WordWrap" - text: " .OBJ LOADING:\n A shaded cube should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 8: A Teapot - Rectangle { - id: panel8 - anchors.left: panel7.right - anchors.top: panel5.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Teapot { - scale: 1.3 - onClicked: console.log("Teapot clicked"); - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text8.height + 10 - Text { - id: text8 - width: parent.width - wrapMode: "WordWrap" - text: " .BEZ LOADING:\n A shaded teapot should be visible." - anchors.centerIn: parent - } - } - } - - //ITEM 9: A Lunar Lander - Rectangle { - id: panel9 - anchors.left: panel8.right - anchors.top: panel6.bottom - width: screen.width/3 - height: screen.height/3 - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - picking: true - - Item3D { - scale: 0.5 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/lunar-lander.3ds"} - onClicked: console.log("Lunar lander clicked") - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text9.height + 10 - Text { - id: text9 - width: parent.width - wrapMode: "WordWrap" - text: " .3DS LOADING:\n A lunar lander module should be visible." - anchors.centerIn: parent - } - } - } -} - diff --git a/tests/manual/fullreferencing/README b/tests/manual/fullreferencing/README deleted file mode 100644 index f7994e81..00000000 --- a/tests/manual/fullreferencing/README +++ /dev/null @@ -1,11 +0,0 @@ -This test renders a cube against a cleared black background. - -The cube should be able to be manipulated by dragging the mouse -pointer around the window. - -The aim is to have the simplest possible test which shows rendering -3D content with no 2D content. - -When the 3D content is free of 2D QML in this way optimized approaches may -be used and this test (along with "background") is meant to be the simplest test -of this behavior. diff --git a/tests/manual/fullreferencing/fullreferencing.pro b/tests/manual/fullreferencing/fullreferencing.pro deleted file mode 100644 index fead7f3a..00000000 --- a/tests/manual/fullreferencing/fullreferencing.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = tst_fullreferencing -CONFIG += qt warn_on -QT += declarative quick - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/fullreferencing/icon-l-qtquick3d.png b/tests/manual/fullreferencing/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/fullreferencing/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/fullreferencing/main.cpp b/tests/manual/fullreferencing/main.cpp deleted file mode 100644 index 646be1c0..00000000 --- a/tests/manual/fullreferencing/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_fullreferencing.qml") diff --git a/tests/manual/fullreferencing/qml/meshes/hazard.png b/tests/manual/fullreferencing/qml/meshes/hazard.png Binary files differdeleted file mode 100644 index a7c0b7fe..00000000 --- a/tests/manual/fullreferencing/qml/meshes/hazard.png +++ /dev/null diff --git a/tests/manual/fullreferencing/qml/meshes/robot.3ds b/tests/manual/fullreferencing/qml/meshes/robot.3ds Binary files differdeleted file mode 100644 index ed872c82..00000000 --- a/tests/manual/fullreferencing/qml/meshes/robot.3ds +++ /dev/null diff --git a/tests/manual/fullreferencing/qml/tst_fullreferencing.qml b/tests/manual/fullreferencing/qml/tst_fullreferencing.qml deleted file mode 100644 index 1a6819d0..00000000 --- a/tests/manual/fullreferencing/qml/tst_fullreferencing.qml +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: screen - width: 640 - height: 520 - objectName: "toplevelrect" - color: "black" - Item3D { - anchors.fill: parent - id: solo - objectName: "soloItem" - y: 1 - scale: 0.3 - transform: [ Rotation3D { axis: "1,0,0"; angle: -90 }, Rotation3D { axis: "0,1,0"; angle: 60 }] - mesh: Mesh { source: "meshes/robot.3ds"; dumpInfo: true; options: "ForceFaceted" } - } - Rectangle { - id: instructions - height: 80 - width: parent.width - anchors.bottom: parent.bottom - color: "#3333aa" - opacity: 0.5 - Text { - id: instructionsText - wrapMode: "WordWrap" - text: "Pick a cube, check log output. Drag in the black area to move all cubes." - anchors.centerIn: parent - } - } -} diff --git a/tests/manual/icon.png b/tests/manual/icon.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/icon.png +++ /dev/null diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro deleted file mode 100644 index f6ff91c8..00000000 --- a/tests/manual/manual.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += displaymodel \ - model3ds \ - navigation1 \ - rotation \ - scaling \ - submesh \ - translation \ - transformations \ - animations \ - qrc \ - basic \ - background \ - fullreferencing \ - shapes diff --git a/tests/manual/model3ds/README b/tests/manual/model3ds/README deleted file mode 100644 index 63630c78..00000000 --- a/tests/manual/model3ds/README +++ /dev/null @@ -1,12 +0,0 @@ - -This test renders a series of 3ds files to exercise currently supported functionality. - -The first model is comprised of a single mesh with no materials. - -The second model is a single mesh with coloured materials. - -The third mesh is a heirarchic mesh with no materials. - -The fourth mesh is a heirarchic mesh with colours/textures. - -All meshes should be lit & shaded, and can be manually rotated etc. as per QtQuick3D norms. diff --git a/tests/manual/model3ds/icon-l-qtquick3d.png b/tests/manual/model3ds/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/model3ds/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/model3ds/info.json b/tests/manual/model3ds/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/model3ds/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/model3ds/m5-tst_submesh_qml.desktop b/tests/manual/model3ds/m5-tst_submesh_qml.desktop deleted file mode 100644 index 537f1e8c..00000000 --- a/tests/manual/model3ds/m5-tst_submesh_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_submesh -Comment=Qt3D test application -Exec=/usr/bin/tst_submesh -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/model3ds/main.cpp b/tests/manual/model3ds/main.cpp deleted file mode 100644 index a82f9adf..00000000 --- a/tests/manual/model3ds/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_model3ds.qml") diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro deleted file mode 100644 index add17572..00000000 --- a/tests/manual/model3ds/model3ds.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_model3ds -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/model3ds/model3ds.qmlproject b/tests/manual/model3ds/model3ds.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/model3ds/model3ds.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/model3ds/model3ds.qrc b/tests/manual/model3ds/model3ds.qrc deleted file mode 100644 index 6dbd8edd..00000000 --- a/tests/manual/model3ds/model3ds.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>qml/tst_model3ds.qml</file> - <file>qml/meshes/lunar-lander.3ds</file> - <file>qml/meshes/monkey.3ds</file> - <file>qml/meshes/penguin.3ds</file> - <file>qml/meshes/robot.3ds</file> - <file>qml/meshes/hazard.png</file> - </qresource> -</RCC> diff --git a/tests/manual/model3ds/mt.qml b/tests/manual/model3ds/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/model3ds/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/model3ds/qml/desktop.qml b/tests/manual/model3ds/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/model3ds/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/model3ds/qml/meshes/hazard.png b/tests/manual/model3ds/qml/meshes/hazard.png Binary files differdeleted file mode 100644 index a7c0b7fe..00000000 --- a/tests/manual/model3ds/qml/meshes/hazard.png +++ /dev/null diff --git a/tests/manual/model3ds/qml/meshes/lunar-lander.3ds b/tests/manual/model3ds/qml/meshes/lunar-lander.3ds Binary files differdeleted file mode 100644 index 7403fdef..00000000 --- a/tests/manual/model3ds/qml/meshes/lunar-lander.3ds +++ /dev/null diff --git a/tests/manual/model3ds/qml/meshes/monkey.3ds b/tests/manual/model3ds/qml/meshes/monkey.3ds Binary files differdeleted file mode 100644 index e9a007b2..00000000 --- a/tests/manual/model3ds/qml/meshes/monkey.3ds +++ /dev/null diff --git a/tests/manual/model3ds/qml/meshes/penguin.3ds b/tests/manual/model3ds/qml/meshes/penguin.3ds Binary files differdeleted file mode 100644 index 26c09ac0..00000000 --- a/tests/manual/model3ds/qml/meshes/penguin.3ds +++ /dev/null diff --git a/tests/manual/model3ds/qml/meshes/robot.3ds b/tests/manual/model3ds/qml/meshes/robot.3ds Binary files differdeleted file mode 100644 index ed872c82..00000000 --- a/tests/manual/model3ds/qml/meshes/robot.3ds +++ /dev/null diff --git a/tests/manual/model3ds/qml/tst_model3ds.qml b/tests/manual/model3ds/qml/tst_model3ds.qml deleted file mode 100644 index 31cb9915..00000000 --- a/tests/manual/model3ds/qml/tst_model3ds.qml +++ /dev/null @@ -1,199 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17392 / QTBUG-17391 -Item { - id: screen - width: 720 - height: 480 - - //ITEM 1: Simple model without materials - Rectangle { - id: panel1 - x: 0; y:0 - width: screen.width/4 - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,3,15)} - - Item3D { - scale: 2 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/monkey.3ds"} - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text1.height + 10 - Text { - id: text1 - width: parent.width - wrapMode: "WordWrap" - text: " MULTI-COMPONENT: No\n MATERIALS: None\n\n A grey shaded monkey head\n should be visible.\n\n Use mouse to rotate/zoom." - anchors.centerIn: parent - } - } - } - - //ITEM 2: Simple model with materials - Rectangle { - id: panel2 - anchors.left: panel1.right - anchors.top: parent.top - width: screen.width/4 - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,3,15)} - - Item3D { - scale: 0.8 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/penguin.3ds"} - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text2.height + 10 - Text { - id: text2 - width: parent.width - wrapMode: "WordWrap" - text: " MULTI-COMPONENT: No\n MATERIALS: Yes\n\n A coloured, lit penguin\n should be visible.\n\n Use mouse to rotate/zoom." - anchors.centerIn: parent - } - } - } - - //ITEM 3: A complex model without materials - Rectangle { - id: panel3 - anchors.left: panel2.right - anchors.top: parent.top - width: screen.width/4 - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - - Item3D { - scale: 0.4 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/lunar-lander.3ds"} - } - } - //text for item3 - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text3.height + 10 - Text { - id: text3 - width: parent.width - wrapMode: "WordWrap" - text: " MULTI-COMPONENT: Yes\n MATERIALS: None\n\n A grey shaded lunar lander\n should be visible.\n\n Use mouse to rotate/zoom." - anchors.centerIn: parent - } - } - } - //ITEM 4: A Complex model with materials - Rectangle { - id: panel4 - anchors.left: panel3.right - anchors.top: parent.top - width: screen.width/4 - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,0,10)} - - Item3D { - scale: 0.4 - position: Qt.vector3d(0,-2,0) - - transform: [ - Rotation3D {id: correct; angle: 90; axis: Qt.vector3d(0,1,0)}, - Rotation3D {id: pitch; angle: -90; axis: Qt.vector3d(0,0,1)}, - Rotation3D {id: roll; angle: 0; axis: Qt.vector3d(1,0,0)}, - Rotation3D {id: yaw; angle: 0; axis: Qt.vector3d(0,1,0)} - ] - - mesh: Mesh {source: "meshes/robot.3ds"} - } - } - //text for item4 - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text4.height + 10 - Text { - id: text4 - width: parent.width - wrapMode: "WordWrap" - text: " MULTI-COMPONENT: Yes\n MATERIALS: Yes\n\n A lit, coloured, textured robot\n should be visible.\n\n Use mouse to rotate/zoom." - anchors.centerIn: parent - } - } - } -} - - diff --git a/tests/manual/model3ds/tst_submesh_qml.desktop b/tests/manual/model3ds/tst_submesh_qml.desktop deleted file mode 100644 index 361fd36e..00000000 --- a/tests/manual/model3ds/tst_submesh_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_submesh -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_submesh -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_submesh_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/navigation1/README b/tests/manual/navigation1/README deleted file mode 100644 index 29aaad44..00000000 --- a/tests/manual/navigation1/README +++ /dev/null @@ -1,8 +0,0 @@ -This tests navigation, specifically zooming and rotating the object using the default -navigation configuration for QML applications. - -The first panel shows a 3D monkey head, and uses positional zooming: zooming in will -move the camera physically closer to the object until it is clipped by the near plane. - -The second panel show a 3D monkey head, and uses field of view zooming: zooming is -based on adjusting the field of view: zooming in will not clip the object. diff --git a/tests/manual/navigation1/icon-l-qtquick3d.png b/tests/manual/navigation1/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/navigation1/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/navigation1/info.json b/tests/manual/navigation1/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/navigation1/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/navigation1/main.cpp b/tests/manual/navigation1/main.cpp deleted file mode 100644 index 3c82c659..00000000 --- a/tests/manual/navigation1/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_navigation1.qml") diff --git a/tests/manual/navigation1/mt.qml b/tests/manual/navigation1/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/navigation1/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro deleted file mode 100644 index 025937a8..00000000 --- a/tests/manual/navigation1/navigation1.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_navigation1 -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/navigation1/navigation1.qmlproject b/tests/manual/navigation1/navigation1.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/navigation1/navigation1.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/navigation1/qml/desktop.qml b/tests/manual/navigation1/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/navigation1/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/navigation1/qml/meshes/monkey.3ds b/tests/manual/navigation1/qml/meshes/monkey.3ds Binary files differdeleted file mode 100644 index e9a007b2..00000000 --- a/tests/manual/navigation1/qml/meshes/monkey.3ds +++ /dev/null diff --git a/tests/manual/navigation1/qml/tst_navigation1.qml b/tests/manual/navigation1/qml/tst_navigation1.qml deleted file mode 100644 index e259147c..00000000 --- a/tests/manual/navigation1/qml/tst_navigation1.qml +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17408 TEST -Item { - id: screen - width: 720 - height: 480 - - //ITEM 1: Simple model without materials - Rectangle { - id: panel1 - x: 0; y:0 - width: screen.width/2 - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - camera: Camera { eye: Qt.vector3d(0,3,15)} - - Item3D { - scale: 2 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/monkey.3ds"} - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text1.height + 10 - Text { - id: text1 - width: parent.width - wrapMode: "WordWrap" - text: " POSITIONAL ZOOM:\n\n" + - " A shaded lit monkey head should\n"+ - " be displayed. Left click-and-hold" + - " & move mouse to rotate.\n\n" + - " Wheel to zoom. Zooming in should\n"+ - " result in eventual clipping."; - anchors.centerIn: parent - } - } - } - - //ITEM 2: Simple model with materials - Rectangle { - id: panel2 - anchors.left: panel1.right - anchors.top: parent.top - anchors.right: parent.right - height: screen.height - border.width: 3 - color: "#3333aa" - - Viewport { - anchors.fill: parent - fovzoom: true - camera: Camera { eye: Qt.vector3d(0,3,15)} - - Item3D { - scale: 2 - position: Qt.vector3d(0,-1,0) - mesh: Mesh {source: "meshes/monkey.3ds"} - } - } - - Rectangle { - border.width: 3; radius: 5 - width: parent.width - height: text2.height + 10 - Text { - id: text2 - width: parent.width - wrapMode: "WordWrap" - text: " FIELD-OF-VIEW ZOOM:\n\n" + - " A shaded lit monkey head should\n"+ - " be displayed. Left click-and-hold" + - " & move mouse to rotate.\n\n" + - " Wheel to zoom. Zooming in should\n"+ - " not result in eventual clipping."; - anchors.centerIn: parent - } - } - } -} - - diff --git a/tests/manual/qrc/README b/tests/manual/qrc/README deleted file mode 100644 index 8adbd818..00000000 --- a/tests/manual/qrc/README +++ /dev/null @@ -1,4 +0,0 @@ -Test is to make sure that the qrc: loaders don't change their functionality -between releases. - -Both left and right cubes should be non-rotating and textured with Qt logo. diff --git a/tests/manual/qrc/icon-l-qtquick3d.png b/tests/manual/qrc/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/qrc/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/qrc/m5-tst_qrc_qml.desktop b/tests/manual/qrc/m5-tst_qrc_qml.desktop deleted file mode 100644 index 1484a0ff..00000000 --- a/tests/manual/qrc/m5-tst_qrc_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_submesh -Comment=Qt3D test application -Exec=/usr/bin/tst_qrc -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/qrc/main.cpp b/tests/manual/qrc/main.cpp deleted file mode 100644 index 2e7dd2a2..00000000 --- a/tests/manual/qrc/main.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtGui/QGuiApplication> -#include <QtQuick/qquickview.h> - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QSurfaceFormat format; - format.setSamples(16); - - QWindow root; - root.resize(640 * 2, 480); - - QQuickView viewL(&root); - viewL.setFormat(format); - viewL.setSource(QUrl("qrc:///qml/cube.qml")); - viewL.setGeometry(0, 0, 640, 480); - - QQuickView viewR(&root); - viewR.setFormat(format); - viewR.setSource(QUrl("Qrc:/qml/cube.qml")); - viewR.setGeometry(640, 0, 640, 480); - - root.show(); - - return app.exec(); -} diff --git a/tests/manual/qrc/qml/cube.qml b/tests/manual/qrc/qml/cube.qml deleted file mode 100644 index 89a7e669..00000000 --- a/tests/manual/qrc/qml/cube.qml +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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$ -** -****************************************************************************/ -//! [1] -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Viewport { - width: 640; height: 480 - - Cube { - scale: 1.5 - - transform: Rotation3D { - angle: 45 - axis: Qt.vector3d(1, 1, 1) - } - - effect: Effect { - color: "#aaca00" - texture: "qtlogo.png" - decal: true - } - } -} -//! [1] diff --git a/tests/manual/qrc/qml/qtlogo.png b/tests/manual/qrc/qml/qtlogo.png Binary files differdeleted file mode 100644 index 7d3e97eb..00000000 --- a/tests/manual/qrc/qml/qtlogo.png +++ /dev/null diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro deleted file mode 100644 index eb566e43..00000000 --- a/tests/manual/qrc/qrc.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = app -TARGET = tst_qrc -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() - -OTHER_FILES += \ - qml/tst_cube.qml - -RESOURCES += \ - qrc.qrc - diff --git a/tests/manual/qrc/qrc.qrc b/tests/manual/qrc/qrc.qrc deleted file mode 100644 index 168976b5..00000000 --- a/tests/manual/qrc/qrc.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>qml/cube.qml</file> - <file>qml/qtlogo.png</file> - </qresource> -</RCC> diff --git a/tests/manual/qrc/tst_qrc_qml.desktop b/tests/manual/qrc/tst_qrc_qml.desktop deleted file mode 100644 index aa5d520d..00000000 --- a/tests/manual/qrc/tst_qrc_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_qrc -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_qrc -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_qrc_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/rotation/icon-l-qtquick3d.png b/tests/manual/rotation/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/rotation/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/rotation/info.json b/tests/manual/rotation/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/rotation/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/rotation/m5-tst_rotation_qml.desktop b/tests/manual/rotation/m5-tst_rotation_qml.desktop deleted file mode 100644 index 687c7ee1..00000000 --- a/tests/manual/rotation/m5-tst_rotation_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_rotation -Comment=Qt3D test application -Exec=/usr/bin/tst_rotation -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/rotation/main.cpp b/tests/manual/rotation/main.cpp deleted file mode 100644 index a848d12f..00000000 --- a/tests/manual/rotation/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_rotation.qml") diff --git a/tests/manual/rotation/mt.qml b/tests/manual/rotation/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/rotation/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/rotation/qml/TestCase.qml b/tests/manual/rotation/qml/TestCase.qml deleted file mode 100644 index 76cc491d..00000000 --- a/tests/manual/rotation/qml/TestCase.qml +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - property string text; - property variant rotationAxis : Qt.vector3d(1,0,0) - property real defaultWidth: 220 - property real defaultHeight: 150 - property variant rotation: Rotation3D { - id: rotationTransform - axis: rotationAxis - PropertyAnimation on angle { - loops: Animation.Infinite - from: 0 - to: 360 - duration: 1500 - } - } - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - - anchors.left: parent.left - anchors.right: parent.right - } - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: Camera { eye: Qt.vector3d(0,15,50)} - Teapot - { - id: model - scale: 8.0 - transform: container.rotation - } - } - } -} diff --git a/tests/manual/rotation/qml/desktop.qml b/tests/manual/rotation/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/rotation/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/rotation/qml/tst_rotation.qml b/tests/manual/rotation/qml/tst_rotation.qml deleted file mode 100644 index 20916014..00000000 --- a/tests/manual/rotation/qml/tst_rotation.qml +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17408 -Item { - id: screen - width: aTestCase.defaultWidth * 3 - height: aTestCase.defaultHeight * 3 - - Flow { - anchors.fill: parent - - TestCase { - id: aTestCase - text: "Rotation: X axis\n(Rolling towards you)" - rotationAxis: Qt.vector3d(1,0,0) - } - - TestCase { - text: "Rotation on Y Axis\n(Cube front rotating left to right)" - rotationAxis: Qt.vector3d(0,1,0) - } - - TestCase { - text: "Rotation: Z axis\n(Rolling to the left)" - rotationAxis: Qt.vector3d(0,0,1) - } - - - TestCase { - text: "Rotation: -X axis\n(Rolling away)" - rotationAxis: Qt.vector3d(-1,0,0) - } - - TestCase { - text: "Rotation on -Y Axis\n(Cube front rotating right to left)" - rotationAxis: Qt.vector3d(0,-1,0) - } - - TestCase { - text: "Rotation: -Z axis\n(Rolling to the right)" - rotationAxis: Qt.vector3d(0,0,-1) - } - - TestCase { - text: "Rotation: 3 axis\n(top-right-front corner stationary)" - rotationAxis: Qt.vector3d(1,1,1) - } - - TestCase { - text: "Axis Normalization\n(Identical to previous case)" - rotationAxis: Qt.vector3d(12.3,12.3,12.3) - } - - TestCase { - text: "Degenerate Axis\n(Anything but a crash is ok)" - rotationAxis: Qt.vector3d(0,0,0) - } - } -} diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro deleted file mode 100644 index e154ee1d..00000000 --- a/tests/manual/rotation/rotation.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_rotation -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/rotation/rotation.qmlproject b/tests/manual/rotation/rotation.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/rotation/rotation.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/rotation/tst_rotation_qml.desktop b/tests/manual/rotation/tst_rotation_qml.desktop deleted file mode 100644 index e5675b13..00000000 --- a/tests/manual/rotation/tst_rotation_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_rotation -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_rotation -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_rotation_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/scaling/icon-l-qtquick3d.png b/tests/manual/scaling/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/scaling/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/scaling/info.json b/tests/manual/scaling/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/scaling/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/scaling/m5-tst_scaling_qml.desktop b/tests/manual/scaling/m5-tst_scaling_qml.desktop deleted file mode 100644 index 7b9cc943..00000000 --- a/tests/manual/scaling/m5-tst_scaling_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_scaling -Comment=Qt3D test application -Exec=/usr/bin/tst_scaling -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/scaling/main.cpp b/tests/manual/scaling/main.cpp deleted file mode 100644 index 5e84cbde..00000000 --- a/tests/manual/scaling/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_scaling.qml") diff --git a/tests/manual/scaling/mt.qml b/tests/manual/scaling/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/scaling/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/scaling/qml/ScalingTestCase.qml b/tests/manual/scaling/qml/ScalingTestCase.qml deleted file mode 100644 index fe83e412..00000000 --- a/tests/manual/scaling/qml/ScalingTestCase.qml +++ /dev/null @@ -1,122 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - // Parameters for editting - property string text; - property variant testTransform: defaultTransform - property real scaleFactor: 1.0 - property variant scaleVectorA: Qt.vector3d(1,1,1) - property variant scaleVectorB: Qt.vector3d(1,1,1) - property variant camera: defaultCamera - - // Default values: - property variant defaultCamera: Camera { eye: Qt.vector3d(0,5,5)} - property real defaultWidth: 220 - property real defaultHeight: 150 - property variant defaultTransform: Scale3D { - scale: Qt.vector3d((scaleVectorA.x * animationFactor + - scaleVectorB.x * (1.0 - animationFactor)), - scaleVectorA.y * animationFactor + - scaleVectorB.y * (1.0 - animationFactor), - scaleVectorA.z * animationFactor + - scaleVectorB.z * (1.0 - animationFactor)) - property real animationFactor: 1.0 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 1.0 - to: 0.0 - duration: 2000 - } - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: 2000 - } - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - Teapot - { - id: model - scale: container.scaleFactor - transform: container.testTransform - } - } - } -} diff --git a/tests/manual/scaling/qml/desktop.qml b/tests/manual/scaling/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/scaling/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/scaling/qml/tst_scaling.qml b/tests/manual/scaling/qml/tst_scaling.qml deleted file mode 100644 index 9f978682..00000000 --- a/tests/manual/scaling/qml/tst_scaling.qml +++ /dev/null @@ -1,150 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17408 -Item { - id: screen - width: aTestCase.defaultWidth * 3 - height: aTestCase.defaultHeight * 4 - property variant scalingCamera: Camera {eye: Qt.vector3d(0,20,20) } - - Flow { - anchors.fill: parent - - ScalingTestCase { - id: aTestCase - text: "Scaling up" - camera: scalingCamera - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(4,4,4) - } - - ScalingTestCase { - text: "Scaling down" - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(0.1,0.1,0.1) - } - - ScalingTestCase { - text: "Scaling using real\n(scaling and inversion)" - testTransform: Scale3D {} - camera: scalingCamera - scaleFactor: 1 - SequentialAnimation on scaleFactor { - loops: Animation.Infinite - PropertyAnimation { - from: -3 - to: 3 - duration: 1500 - } - PropertyAnimation { - from: 3 - to: -3 - duration: 1500 - } - } - } - - ScalingTestCase { - text: "Scaling in X\n(mirroring horizontally)" - camera: scalingCamera - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(4,1,1) - } - - ScalingTestCase { - text: "Scaling in Y\n(stretching vertically)" - camera: scalingCamera - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(1,4,1) - } - - ScalingTestCase { - text: "Scaling in Z\n(depth-wise)" - camera: scalingCamera - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(1,1,4) - } - - ScalingTestCase { - text: "Negative Scaling in X\n(mirroring horizontally)" - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(-1,1,1) - } - - ScalingTestCase { - text: "Negative Scaling in Y\n(flipping upside-down)" - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(1,-1,1) - } - - ScalingTestCase { - text: "Negative Scaling in Z\n(depth-wise)" - scaleVectorA: Qt.vector3d(1,1,1) - scaleVectorB: Qt.vector3d(1,1,-1) - } - - ScalingTestCase { - text: "Zero Z\n(Probable artifacts)" - scaleVectorA: Qt.vector3d(1,1,0) - scaleVectorB: Qt.vector3d(1,1,0) - } - - ScalingTestCase { - text: "Zero Y\n(Probable artifacts)" - scaleVectorA: Qt.vector3d(1,0,1) - scaleVectorB: Qt.vector3d(1,0,1) - } - - // Skipping zero X because it would be invisible with the - // camera position all the other tests have - - ScalingTestCase { - text: "Zero Vector\n(Not visible and shouldn't crash)" - scaleVectorA: Qt.vector3d(0,0,0) - scaleVectorB: Qt.vector3d(0,0,0) - } - } -} diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro deleted file mode 100644 index 49688fe4..00000000 --- a/tests/manual/scaling/scaling.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_scaling -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/scaling/scaling.qmlproject b/tests/manual/scaling/scaling.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/scaling/scaling.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/scaling/tst_scaling_qml.desktop b/tests/manual/scaling/tst_scaling_qml.desktop deleted file mode 100644 index 293a5fee..00000000 --- a/tests/manual/scaling/tst_scaling_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_scaling -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_scaling -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_scaling_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/shapes/README b/tests/manual/shapes/README deleted file mode 100644 index 0d2d97a3..00000000 --- a/tests/manual/shapes/README +++ /dev/null @@ -1,6 +0,0 @@ -This is a basic manual test for the shapes classes in QML. -It needs to be extended greatly to deal with level-of-detail, and the -other properties which can be changed, such as radius and length, -also checking on the animations of these, and creation of larger -numbers of shapes. This last item is to confirm that only one copy -of the geometry is created in this case. diff --git a/tests/manual/shapes/main.cpp b/tests/manual/shapes/main.cpp deleted file mode 100644 index fa785e2f..00000000 --- a/tests/manual/shapes/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_shapes.qml") diff --git a/tests/manual/shapes/qml/tst_shapes.qml b/tests/manual/shapes/qml/tst_shapes.qml deleted file mode 100644 index e402e90d..00000000 --- a/tests/manual/shapes/qml/tst_shapes.qml +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Item { - id: screen - width: 720 - height: 480 - Rectangle { - id: description - border.width: 3 - radius: 5 - width: parent.width - height: text.height + 10 - Text { - id: text - width: parent.width - wrapMode: "WordWrap" - text: "There should be a green cylinder on the left, a beige sphere in the middle,\n" + - "and a red capsule on the right hand side.\n\n" + - "They should be the same diameter, but the capsule & cylinder twice the height.\n" + - "The capsule and cylinder should be oriented with their length vertically.\n" + - "Click & drag in the window to rotate the objects to confirm." - anchors.centerIn: parent - } - } - Rectangle { - width: parent.width - anchors.top: description.bottom - anchors.bottom: screen.bottom - anchors.left: screen.left - anchors.right: screen.right - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - showSceneGraph: true - Cylinder { - x: -2.2 - y: 1.5 - transform: Rotation3D { axis: "1, 0, 0"; angle: 90 } - length: 3 - effect: Effect { color: "green" } - } - Sphere { - effect: Effect { color: "burlywood" } - } - Capsule { - x: 2.2 - length: 3 - transform: Rotation3D { axis: "1, 0, 0"; angle: 90 } - effect: Effect { color: "red" } - } - } - } -} diff --git a/tests/manual/shapes/qtquick3d.png b/tests/manual/shapes/qtquick3d.png Binary files differdeleted file mode 100644 index 8351083e..00000000 --- a/tests/manual/shapes/qtquick3d.png +++ /dev/null diff --git a/tests/manual/shapes/shapes.pro b/tests/manual/shapes/shapes.pro deleted file mode 100644 index ba944a4b..00000000 --- a/tests/manual/shapes/shapes.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_shapes -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/shapes/tst_shapes_qml.desktop b/tests/manual/shapes/tst_shapes_qml.desktop deleted file mode 100644 index 7bd7fd92..00000000 --- a/tests/manual/shapes/tst_shapes_qml.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_submesh -Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png -Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_submesh -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_submesh_qml diff --git a/tests/manual/submesh/README b/tests/manual/submesh/README deleted file mode 100644 index 4dc84f04..00000000 --- a/tests/manual/submesh/README +++ /dev/null @@ -1,9 +0,0 @@ - -This test renders a lander model and submeshes to validate functionality. -A radar dish submesh is stripped off, and duplicated three times. -One instance rotates near the original position on the lander. -If the submesh is not successfully removed from the model, there will be a second -stationary dish underneath/near this rotating dish. -A second model moves left and right, and should appear close to the right of lander. -The third dish is testing scaling. Because of the way the scaling works, it may also appear to -be moving left and right, and this is acceptable. diff --git a/tests/manual/submesh/icon-l-qtquick3d.png b/tests/manual/submesh/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/submesh/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/submesh/info.json b/tests/manual/submesh/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/submesh/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/submesh/m5-tst_submesh_qml.desktop b/tests/manual/submesh/m5-tst_submesh_qml.desktop deleted file mode 100644 index 537f1e8c..00000000 --- a/tests/manual/submesh/m5-tst_submesh_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_submesh -Comment=Qt3D test application -Exec=/usr/bin/tst_submesh -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/submesh/main.cpp b/tests/manual/submesh/main.cpp deleted file mode 100644 index 3ebf514a..00000000 --- a/tests/manual/submesh/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_submesh.qml") diff --git a/tests/manual/submesh/mt.qml b/tests/manual/submesh/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/submesh/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/submesh/qml/desktop.qml b/tests/manual/submesh/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/submesh/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/submesh/qml/meshes/lunar-lander.3ds b/tests/manual/submesh/qml/meshes/lunar-lander.3ds Binary files differdeleted file mode 100644 index 7403fdef..00000000 --- a/tests/manual/submesh/qml/meshes/lunar-lander.3ds +++ /dev/null diff --git a/tests/manual/submesh/qml/tst_submesh.qml b/tests/manual/submesh/qml/tst_submesh.qml deleted file mode 100644 index 39967c1e..00000000 --- a/tests/manual/submesh/qml/tst_submesh.qml +++ /dev/null @@ -1,207 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 - -// QTBUG-17418 -Item { - id: screen - width: 720 - height: 480 - Rectangle { - id: description - border.width: 3 - radius: 5 - property variant radarPostion: recieverItem.localToWorld(); - x: radarPostion.x * view.width - width: parent.width - height: text.height + 10 - Text { - id: text - width: parent.width - wrapMode: "WordWrap" - text: "There should be a stationary lander model with a rotating radar dish attached. \n" + - "The lander and attached radar dish should show no scaling or translation.\n" + - "There should be a second radar dish colored red, oscillating horizontally without scaling.\n" + - "There should be a third radar dish colored blue, scaling but not rotating.. \n" + - "It is acceptable if the scaling dish appears to be moving due to the scaling." - anchors.centerIn: parent - } - } - Rectangle { - width: parent.width - anchors.top: description.bottom - anchors.bottom: screen.bottom - anchors.left: screen.left - anchors.right: screen.right - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - // showPicking: true - camera: Camera { eye: Qt.vector3d(0,15,50)} - - Effect { - id: redEffect; material: red - objectName: "redEffect" - } - - Effect { - id: blueEffect; material: blue - objectName: "blueEffect" - } - - Mesh { - id:landerMesh - source: "meshes/lunar-lander.3ds" - } - - // A second lander mesh so we can have two different colors - Mesh { - id:landerMesh2 - source: "meshes/lunar-lander.3ds" - } - - Item3D { - mesh: landerMesh - objectName: "lander" - effect: Effect { material: green ; objectName: "greenEffect"} - Item3D { - // Correct context loss from "pulling off" of graph - transform: [ - Rotation3D { axis: Qt.vector3d(1.0, 0.0, 0.0) ; angle: -90}, - Rotation3D { - id: radarSpin2 ; axis: Qt.vector3d(0.0, 1.0, 0.0); - angle: 0 - origin: Qt.vector3d(0.55,0.0,0.0) - NumberAnimation on angle { - running: true; loops: Animation.Infinite - from: 360; to: 0; duration: 3000; - } - } - ] - Item3D { mesh: landerMesh; meshNode: "Rod.001" } - Item3D { mesh: landerMesh; meshNode: "Receiver.001" } - Item3D { mesh: landerMesh; meshNode: "Dish.001" } - } - } - - Item3D { - // Check that you can duplicate items - id: scalingRadarDish - SequentialAnimation on scale { - loops: Animation.Infinite; running: true - NumberAnimation { from:1.0 ; to: 3.0; duration: 500 } - NumberAnimation { from:3.0 ; to: 1.0; duration: 500 } - } - // rotate object to remove ambiguity - scaling causes - // movement, and if this is in the z axis, the scaling - // could be confused with perspective. - position: Qt.vector3d(3.0,0.0,0.0) - transform: Rotation3D { - axis: Qt.vector3d(0.0,1.0,0.0) - angle: -90 - } - Material { - // Distinctive green Color - id: green - ambientColor: "#448844" - diffuseColor: "#88EE44" - specularColor: "#88FF88" - shininess: 200 - } - - Material { - // Distinctive red Color - id: red - ambientColor: "#884422" - diffuseColor: "#EE4422" - specularColor: "#FF6644" - shininess: 200 - } - - Material { - // Distinctive blue Color - id: blue - ambientColor: "#224488" - diffuseColor: "#2244EE" - specularColor: "#4466FF" - shininess: 200 - } - - Item3D { mesh: landerMesh2; meshNode: "Rod.001" - effect: blueEffect - } - Item3D { id: recieverItem; mesh: landerMesh2; meshNode: "Receiver.001" ; - effect: blueEffect - } - Item3D { mesh: landerMesh2; meshNode: "Dish.001" ; - effect: blueEffect - } - } - Item3D { - // Check that you can duplicate items - id: translatingRadarDish - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: 0.0; to: 5.0 ; duration: 600 } - NumberAnimation { from: 5.0; to: 0.0 ; duration: 600 } - } - - Item3D { mesh: landerMesh; meshNode: "Rod.001"; - effect: redEffect - objectName: "Rod" - } - Item3D { mesh: landerMesh; meshNode: "Receiver.001"; - effect: redEffect - objectName: "Receiver" - } - Item3D { mesh: landerMesh; meshNode: "Dish.001"; - effect: redEffect - objectName: "Dish" - } - } - } - } -} diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro deleted file mode 100644 index c0289024..00000000 --- a/tests/manual/submesh/submesh.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_submesh -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/submesh/submesh.qmlproject b/tests/manual/submesh/submesh.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/submesh/submesh.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/submesh/tst_submesh_qml.desktop b/tests/manual/submesh/tst_submesh_qml.desktop deleted file mode 100644 index 361fd36e..00000000 --- a/tests/manual/submesh/tst_submesh_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_submesh -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_submesh -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_submesh_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/transformations/icon-l-qtquick3d.png b/tests/manual/transformations/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/transformations/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/transformations/info.json b/tests/manual/transformations/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/transformations/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/transformations/m5-tst_transformations_qml.desktop b/tests/manual/transformations/m5-tst_transformations_qml.desktop deleted file mode 100644 index 13fc93c6..00000000 --- a/tests/manual/transformations/m5-tst_transformations_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_transformations -Comment=Qt3D test application -Exec=/usr/bin/tst_transformations -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/transformations/main.cpp b/tests/manual/transformations/main.cpp deleted file mode 100644 index 5f4a9567..00000000 --- a/tests/manual/transformations/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_transformations.qml") diff --git a/tests/manual/transformations/mt.qml b/tests/manual/transformations/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/transformations/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml b/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml deleted file mode 100644 index c1e29f3b..00000000 --- a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml +++ /dev/null @@ -1,149 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - property string text: - "This example nests Item3Ds with a rotation, a scale and a translate" + - " transformation. It should show a teapot spinning anti-clockwise, " + - "growing and moving up-right relative to the initial camera, " + - "and then reversing."; - property variant camera: defaultCamera - - // Default values: - property variant defaultCamera: Camera { eye: Qt.vector3d(0,5,30) } - property real defaultWidth: 440 - property real defaultHeight: 300 - property real animationFactor: 0.0 - property real animationDuration: 2000 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: animationDuration - } - PropertyAnimation { - from: 1.0 - to: 0.0 - duration: animationDuration - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - - Item3D { - transform: Translation3D { - translate: Qt.vector3d(testModel.translationX, - testModel.translationY, - testModel.translationZ) - } - Item3D { - transform: Rotation3D { - axis: Qt.vector3d(testModel.rotationAxisX, - testModel.rotationAxisY, - testModel.rotationAxisZ) - angle: testModel.rotationAngle - } - - Teapot { - id: testModel - property real scaleX: 1 + (2.0 * animationFactor); - property real scaleY: 1 + (2.0 * animationFactor); - property real scaleZ: 1 + (2.0 * animationFactor); - - property real rotationAngle: 360.0 * animationFactor; - property real rotationAxisX: 0.0; - property real rotationAxisY: 0.0; - property real rotationAxisZ: 1.0; - - property real translationX: - 4 * (2.0 * (animationFactor -0.5)); - property real translationY: - 3 * (2.0 * (animationFactor - 0.5)); - property real translationZ: - 2 * (2.0 * (animationFactor - 0.5)); - - transform: Scale3D { - scale: Qt.vector3d(testModel.scaleX, - testModel.scaleY, - testModel.scaleZ) - } - } - } - } - } - } -} diff --git a/tests/manual/transformations/qml/TransformationListTestCase.qml b/tests/manual/transformations/qml/TransformationListTestCase.qml deleted file mode 100644 index 449268d7..00000000 --- a/tests/manual/transformations/qml/TransformationListTestCase.qml +++ /dev/null @@ -1,144 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - property string text: - "This example combines a rotation, scale and translate in one " + - "Item3D. It should show a teapot spinning anti-clockwise, growing " + - "and moving up-right relative to the initial camera, and then " + - "reversing."; - property variant camera: defaultCamera - - // Default values: - property variant defaultCamera: Camera { eye: Qt.vector3d(0,5,30) } - property real defaultWidth: 440 - property real defaultHeight: 300 - property real animationFactor: 0.0 - property real animationDuration: 2000 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: animationDuration - } - PropertyAnimation { - from: 1.0 - to: 0.0 - duration: animationDuration - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - - Teapot - { - id: testModel - property real scaleX: 1 + (2.0 * animationFactor); - property real scaleY: 1 + (2.0 * animationFactor); - property real scaleZ: 1 + (2.0 * animationFactor); - - property real rotationAngle: 360.0 * animationFactor; - property real rotationAxisX: 0.0; - property real rotationAxisY: 0.0; - property real rotationAxisZ: 1.0; - - property real translationX: 4 * (2.0 * (animationFactor -0.5)); - property real translationY: 3 * (2.0 * (animationFactor - 0.5)); - property real translationZ: 0; - - transform: [ - Scale3D { - scale: Qt.vector3d(testModel.scaleX, - testModel.scaleY, - testModel.scaleZ) - }, - Rotation3D { - axis: Qt.vector3d(testModel.rotationAxisX, - testModel.rotationAxisY, - testModel.rotationAxisZ) - angle: testModel.rotationAngle - }, - Translation3D { - translate: Qt.vector3d(testModel.translationX, - testModel.translationY, - testModel.translationZ) - } - ] - } - } - } -} diff --git a/tests/manual/transformations/qml/desktop.qml b/tests/manual/transformations/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/transformations/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/transformations/qml/tst_transformations.qml b/tests/manual/transformations/qml/tst_transformations.qml deleted file mode 100644 index 1e7138ba..00000000 --- a/tests/manual/transformations/qml/tst_transformations.qml +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 - -// QTBUG-17408 -Flickable { - - contentWidth: aTestCase.defaultWidth * 2 - contentHeight: aTestCase.defaultHeight * 1 - - width: aTestCase.defaultWidth * 2 - height: aTestCase.defaultHeight * 1 - - Flow { - ComposedItemTransformationsTestCase { - id: aTestCase - focus: false - } - - TransformationListTestCase { - focus: false - } - } -} diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro deleted file mode 100644 index b68bdc15..00000000 --- a/tests/manual/transformations/transformations.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_transformations -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/transformations/transformations.qmlproject b/tests/manual/transformations/transformations.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/transformations/transformations.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/transformations/tst_transformations_qml.desktop b/tests/manual/transformations/tst_transformations_qml.desktop deleted file mode 100644 index f26dac55..00000000 --- a/tests/manual/transformations/tst_transformations_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_transformations -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_transformations -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_transformations_qml -X-MeeGo-Translation-Catalog=essentials diff --git a/tests/manual/translation/README b/tests/manual/translation/README deleted file mode 100644 index bbffedd5..00000000 --- a/tests/manual/translation/README +++ /dev/null @@ -1 +0,0 @@ -The "One teapot" test is ensuring that the two different ways of specifying position (x,y,z vs position) both have the same result. Two teapots are being rendered. To pass, the two teapots should be rendered in exactly the same position, so it looks like only one teapot. This test fails if the teapots are not aligned - e.g. there are two spouts, or the teapot is distorted. diff --git a/tests/manual/translation/icon-l-qtquick3d.png b/tests/manual/translation/icon-l-qtquick3d.png Binary files differdeleted file mode 100644 index 69deef3f..00000000 --- a/tests/manual/translation/icon-l-qtquick3d.png +++ /dev/null diff --git a/tests/manual/translation/info.json b/tests/manual/translation/info.json deleted file mode 100644 index 048e4756..00000000 --- a/tests/manual/translation/info.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "info-version": "1.0", - "dict": { - "Category": "application", - "Runtime": "qml", - "DisplayName": "Thing", - "Subcategory": "utility", - "MainQML": "mt.qml", - "Version": "1.0", - "Identifier": "com.nokia.qtquick3d.thing", - "Depends": { - "com.nokia.components": "1.0", - }, - "Summary": "Thing QML Demo" - } -} diff --git a/tests/manual/translation/m5-tst_translation_qml.desktop b/tests/manual/translation/m5-tst_translation_qml.desktop deleted file mode 100644 index aaaa76eb..00000000 --- a/tests/manual/translation/m5-tst_translation_qml.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=tst_translation -Comment=Qt3D test application -Exec=/usr/bin/tst_translation -fullscreen -Icon=icon-l-qtquick3d -Terminal=false -Type=Application -Categories=Development; -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -X-Text-Domain=qt3d - diff --git a/tests/manual/translation/main.cpp b/tests/manual/translation/main.cpp deleted file mode 100644 index f59c66dc..00000000 --- a/tests/manual/translation/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../shared/qmlres.h" - -QUICK3D_EXAMPLE_MAIN("qml/tst_translation.qml") diff --git a/tests/manual/translation/mt.qml b/tests/manual/translation/mt.qml deleted file mode 100644 index 95732fe3..00000000 --- a/tests/manual/translation/mt.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "qml" - -Item { - width: 320 - height: 480 - - Thing { - } -} diff --git a/tests/manual/translation/qml/AxesVsVectorTestCase.qml b/tests/manual/translation/qml/AxesVsVectorTestCase.qml deleted file mode 100644 index bedabba5..00000000 --- a/tests/manual/translation/qml/AxesVsVectorTestCase.qml +++ /dev/null @@ -1,155 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - // Parameters for editting - property string text; - property variant translationVectorA: Qt.vector3d(1,1,1) - property variant translationVectorB: Qt.vector3d(1,1,1) - property variant camera: defaultCamera - property real itemX: 0 - property real itemY: 0 - property real itemZ: 0 - property int animationDuration: 2000 - - // Default values: - property variant defaultCamera: Camera {eye: Qt.vector3d(0,5,30)} - property real defaultWidth: 220 - property real defaultHeight: 150 - property variant itemPosition: - Qt.vector3d((translationVectorB.x * animationFactor + - translationVectorA.x * (1.0 - animationFactor)), - translationVectorB.y * animationFactor + - translationVectorA.y * (1.0 - animationFactor), - translationVectorB.z * animationFactor + - translationVectorA.z * (1.0 - animationFactor)) - property real animationFactor: 0.0 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: animationDuration - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - - Material { - // Distinctive red Color - id: red - ambientColor: "#884422" - diffuseColor: "#EE4422" - specularColor: "#FF6644" - shininess: 200 - } - - Material { - // Distinctive blue Color - id: blue - ambientColor: "#224488" - diffuseColor: "#2244EE" - specularColor: "#4466FF" - shininess: 200 - } - - Effect { - id: redEffect; material: red - objectName: "redEffect" - } - - Effect { - id: blueEffect; material: blue - objectName: "blueEffect" - } - - Teapot - { - id: vectorModel -// effect: redEffect - position: itemPosition - } - Teapot - { - id: axesModel -// effect: blueEffect - x: itemX - y: itemY - z: itemZ - } - } - } -} diff --git a/tests/manual/translation/qml/TranslationTestCase.qml b/tests/manual/translation/qml/TranslationTestCase.qml deleted file mode 100644 index 9a41033b..00000000 --- a/tests/manual/translation/qml/TranslationTestCase.qml +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - // Parameters for editting - property string text; - property real itemX: 0 - property real itemY: 0 - property real itemZ: 0 - property variant camera: defaultCamera - - // Default values: - property variant defaultCamera: Camera { eye: Qt.vector3d(0,5,30) } - property real defaultWidth: 220 - property real defaultHeight: 150 - property real animationFactor: 0.0 - property real animationDuration: 2000 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: animationDuration - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - Teapot - { - id: model - x: itemX - y: itemY - z: itemZ - } - } - } -} diff --git a/tests/manual/translation/qml/TranslationVectorTestCase.qml b/tests/manual/translation/qml/TranslationVectorTestCase.qml deleted file mode 100644 index 9e5103a5..00000000 --- a/tests/manual/translation/qml/TranslationVectorTestCase.qml +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -Rectangle { - id: container - // Parameters for editting - property string text; - property variant translationVectorA: Qt.vector3d(1,1,1) - property variant translationVectorB: Qt.vector3d(1,1,1) - property variant camera: defaultCamera - - // Default values: - property variant defaultCamera: Camera {eye: Qt.vector3d(0,5,30)} - property real defaultWidth: 220 - property real defaultHeight: 150 - property variant itemPosition: - Qt.vector3d((translationVectorB.x * animationFactor + - translationVectorA.x * (1.0 - animationFactor)), - translationVectorB.y * animationFactor + - translationVectorA.y * (1.0 - animationFactor), - translationVectorB.z * animationFactor + - translationVectorA.z * (1.0 - animationFactor)) - property real animationFactor: 0.0 - property int animationDuration: 2000 - - SequentialAnimation on animationFactor { - loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1.0 - duration: animationDuration - } - } - - border.width: 2 - border.color: "black" - radius: 5 - width: defaultWidth - height: defaultHeight - - Text { - id: textItem - wrapMode: "WordWrap" - horizontalAlignment: "AlignHCenter" - text: container.text - anchors.left: parent.left - anchors.right: parent.right - } - - Rectangle { - id: viewportContainer - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 1 - anchors.topMargin: 2 - anchors.top: textItem.bottom - anchors.bottom: container.bottom - color: "#aaccee" - - Viewport { - id: view - anchors.fill: parent - picking: true - camera: container.camera - Teapot - { - id: model - position: itemPosition - } - } - } -} diff --git a/tests/manual/translation/qml/desktop.qml b/tests/manual/translation/qml/desktop.qml deleted file mode 100644 index ddc8f23a..00000000 --- a/tests/manual/translation/qml/desktop.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 Nokia Corporation and its Subsidiary(-ies) 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.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 -import "." - -Item { - width: 640 - height: 480 - - Thing { - } -} diff --git a/tests/manual/translation/qml/tst_translation.qml b/tests/manual/translation/qml/tst_translation.qml deleted file mode 100644 index c70d6a71..00000000 --- a/tests/manual/translation/qml/tst_translation.qml +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 - -// QTBUG-17408 -Item { - id: screen - width: aTestCase.defaultWidth * 3 - height: aTestCase.defaultHeight * 4 - - Flow { - anchors.fill: parent - TranslationVectorTestCase { - id: aTestCase - text: "X Translation\n(Left to Right)" - translationVectorA: Qt.vector3d(-4,1,1) - translationVectorB: Qt.vector3d(4,1,1) - } - - TranslationVectorTestCase { - text: "Y Translation\n(Bottom to Top)" - translationVectorA: Qt.vector3d(1,-4,1) - translationVectorB: Qt.vector3d(1,4,1) - } - - TranslationVectorTestCase { - text: "Z Translation\n(Back to Front)" - translationVectorA: Qt.vector3d(1,1,-4) - translationVectorB: Qt.vector3d(1,1,4) - } - - TranslationVectorTestCase { - text: "-X Translation\n(Right to Left)" - translationVectorA: Qt.vector3d(4,1,1) - translationVectorB: Qt.vector3d(-4,1,1) - } - - TranslationVectorTestCase { - text: "-Y Translation\n(Top to Bottom)" - translationVectorA: Qt.vector3d(1,4,1) - translationVectorB: Qt.vector3d(1,-4,1) - } - - TranslationVectorTestCase { - text: "-Z Translation\n(Front to Back)" - translationVectorA: Qt.vector3d(1,1,4) - translationVectorB: Qt.vector3d(1,1,-4) - } - - TranslationVectorTestCase { - text: "Sequential Translation in X,Y,Z\n(Previous 6 in order)" - id: sequentialTestCase - property real itemX:-4; - property real itemY:-4; - property real itemZ:-4; - itemPosition: Qt.vector3d(itemX,itemY,itemZ) - // itemPosition: Qt.vector3d(itemX,4,4) - SequentialAnimation { - loops: Animation.Infinite - running: true - PropertyAnimation { - target: sequentialTestCase; property: "itemX"; - to: 4; duration: 1000 - } - PropertyAnimation { - target: sequentialTestCase; property: "itemY"; - to: 4; duration: 1000 - } - PropertyAnimation { - target: sequentialTestCase; property: "itemZ"; - to: 4; duration: 1000 - } - PropertyAnimation { - target: sequentialTestCase; property: "itemX"; - to: -4; duration: 1000 - } - PropertyAnimation { - target: sequentialTestCase; property: "itemY"; - to: -4; duration: 1000 - } - PropertyAnimation { - target: sequentialTestCase; property: "itemZ"; - to: -4; duration: 1000 - } - } - } - - TranslationTestCase { - text: "Translation in X,Y,Z properties\n(Smooth Animation)" - id: attributeTestCase - itemX: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 3.0); - itemY: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 5.0); - itemZ: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 7.0); - animationDuration: 15000 - } - - TranslationVectorTestCase { - text: "Translation in Qt.Vector3d(X,Y,Z)\n(Smooth Animation)" - id: combinedVectorTestCase - property real itemX: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 3.0); - property real itemY: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 5.0); - property real itemZ: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 7.0); - itemPosition: Qt.vector3d(itemX,itemY,itemZ) - animationDuration: 15000 - } - - AxesVsVectorTestCase { - text: "Last two overlaid\n(Should look like one teapot)" - id: axesVsVectorTestCase - itemX: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 3.0); - itemY: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 5.0); - itemZ: 4 * Math.sin(animationFactor * Math.PI * 2.0 * 7.0); - itemPosition: Qt.vector3d(itemX,itemY,itemZ) - animationDuration: 15000 - } - } -} diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro deleted file mode 100644 index eb86409d..00000000 --- a/tests/manual/translation/translation.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = tst_translation -CONFIG += qt warn_on - -QT += quick3d - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/translation/translation.qmlproject b/tests/manual/translation/translation.qmlproject deleted file mode 100644 index 37c467f1..00000000 --- a/tests/manual/translation/translation.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [".", "../../imports/"] -} diff --git a/tests/manual/translation/tst_translation_qml.desktop b/tests/manual/translation/tst_translation_qml.desktop deleted file mode 100644 index 23c5ac8d..00000000 --- a/tests/manual/translation/tst_translation_qml.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=tst_translation -Icon=icon-l-qtquick3d -Exec=/usr/bin/tst_translation -fullscreen -OnlyShowIn=X-MeeGo; -X-MeeGo-Logical-Id=qtn_comm_appname_tst_translation_qml -X-MeeGo-Translation-Catalog=essentials |
