diff options
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/manual.pro | 3 | ||||
| -rw-r--r-- | tests/manual/shapes/README | 6 | ||||
| -rw-r--r-- | tests/manual/shapes/main.cpp | 63 | ||||
| -rw-r--r-- | tests/manual/shapes/qml/tst_shapes.qml | 98 | ||||
| -rw-r--r-- | tests/manual/shapes/qtquick3d.png | bin | 0 -> 4050 bytes | |||
| -rw-r--r-- | tests/manual/shapes/shapes.pro | 10 | ||||
| -rw-r--r-- | tests/manual/shapes/tst_shapes_qml.desktop | 7 |
7 files changed, 186 insertions, 1 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index cdeb40e6..8200a5da 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -9,4 +9,5 @@ SUBDIRS += displaymodel \ translation \ transformations \ animations \ - qrc + qrc \ + shapes diff --git a/tests/manual/shapes/README b/tests/manual/shapes/README new file mode 100644 index 00000000..0d2d97a3 --- /dev/null +++ b/tests/manual/shapes/README @@ -0,0 +1,6 @@ +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 new file mode 100644 index 00000000..374b7c73 --- /dev/null +++ b/tests/manual/shapes/main.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** 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/QApplication> +#include "qdeclarativeview3d.h" + +#include "../../shared/qmlres.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + QDeclarativeView3D view; + QString qml = q_get_qmldir(QLatin1String("qml/tst_shapes.qml")); + view.setSource(QUrl::fromLocalFile(qml)); + + if (QApplication::arguments().contains(QLatin1String("-maximize"))) + view.showMaximized(); + else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) + view.showFullScreen(); + else + view.show(); + + return app.exec(); +} diff --git a/tests/manual/shapes/qml/tst_shapes.qml b/tests/manual/shapes/qml/tst_shapes.qml new file mode 100644 index 00000000..e402e90d --- /dev/null +++ b/tests/manual/shapes/qml/tst_shapes.qml @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** 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 differnew file mode 100644 index 00000000..8351083e --- /dev/null +++ b/tests/manual/shapes/qtquick3d.png diff --git a/tests/manual/shapes/shapes.pro b/tests/manual/shapes/shapes.pro new file mode 100644 index 00000000..d4950ff5 --- /dev/null +++ b/tests/manual/shapes/shapes.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +TARGET = tst_shapes +CONFIG += qt warn_on + +INSTALL_DIRS = qml +CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg +include(../../../pkg.pri) +qtcAddDeployment() + +SOURCES += main.cpp diff --git a/tests/manual/shapes/tst_shapes_qml.desktop b/tests/manual/shapes/tst_shapes_qml.desktop new file mode 100644 index 00000000..7bd7fd92 --- /dev/null +++ b/tests/manual/shapes/tst_shapes_qml.desktop @@ -0,0 +1,7 @@ +[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 |
