diff options
author | Patrick Burke <patrick.burke@nokia.com> | 2011-11-15 12:15:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-15 03:17:13 +0100 |
commit | ef7047077f4424faec558d27b8afb3630ff1df0c (patch) | |
tree | 961885309dc13a2174f609293695827841a015f3 /tests | |
parent | f05af7cd00ef88dcfabb4b62c81b661684ef94e6 (diff) |
Revert "Make standalone Item3Ds work."
This reverts commit f05af7cd00ef88dcfabb4b62c81b661684ef94e6.
Change-Id: I3f2f376013c56f2583fbf5974435980158f0e265
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/manual/fullreferencing/README | 11 | ||||
-rw-r--r-- | tests/manual/fullreferencing/fullreferencing.pro | 11 | ||||
-rw-r--r-- | tests/manual/fullreferencing/main.cpp | 67 | ||||
-rw-r--r-- | tests/manual/fullreferencing/qml/meshes/hazard.png | bin | 64685 -> 0 bytes | |||
-rw-r--r-- | tests/manual/fullreferencing/qml/meshes/robot.3ds | bin | 76250 -> 0 bytes | |||
-rw-r--r-- | tests/manual/fullreferencing/qml/tst_fullreferencing.qml | 81 | ||||
-rw-r--r-- | tests/manual/manual.pro | 1 |
7 files changed, 0 insertions, 171 deletions
diff --git a/tests/manual/fullreferencing/README b/tests/manual/fullreferencing/README deleted file mode 100644 index f7994e818..000000000 --- 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 01577f56f..000000000 --- a/tests/manual/fullreferencing/fullreferencing.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = tst_fullreferencing -CONFIG += qt warn_on - -SOURCES += main.cpp - -INSTALL_DIRS = qml - -CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg -include(../../../pkg.pri) -qtcAddDeployment() diff --git a/tests/manual/fullreferencing/main.cpp b/tests/manual/fullreferencing/main.cpp deleted file mode 100644 index e7d3c406f..000000000 --- a/tests/manual/fullreferencing/main.cpp +++ /dev/null @@ -1,67 +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/QApplication> -#include <QtDeclarative/QDeclarativeEngine> - -#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_fullreferencing.qml")); - view.setSource(QUrl::fromLocalFile(qml)); - - QObject::connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit())); - - 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/fullreferencing/qml/meshes/hazard.png b/tests/manual/fullreferencing/qml/meshes/hazard.png Binary files differdeleted file mode 100644 index a7c0b7fea..000000000 --- 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 ed872c82a..000000000 --- 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 d3c8f18de..000000000 --- a/tests/manual/fullreferencing/qml/tst_fullreferencing.qml +++ /dev/null @@ -1,81 +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: screen - width: 640 - height: 520 - objectName: "toplevelrect" - color: "black" - // Test displaying of an object that has no parent viewport - Item3D { - height: screen.height - 80 - width: screen.width - id: solo - objectName: "soloItem" - y: -1.2 - scale: 0.3 - transform: [ Rotation3D { axis: "1,0,0"; angle: 90 }, Rotation3D { axis: "0,1,0"; angle: 60 }] - mesh: Mesh { source: "meshes/robot.3ds"; 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: "A robot model should be visible in the window above. (Tap here to Quit)" - anchors.centerIn: parent - } - MouseArea { - anchors.fill: parent - onClicked: Qt.quit() - } - } -} diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index d5d583190..cdeb40e60 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -9,5 +9,4 @@ SUBDIRS += displaymodel \ translation \ transformations \ animations \ - fullreferencing \ qrc |