summaryrefslogtreecommitdiffstats
path: root/tests/manual/lighting
diff options
context:
space:
mode:
authordpope <[email protected]>2012-02-03 15:45:25 +1000
committerRohan McGovern <[email protected]>2012-02-10 07:24:48 +0100
commitbc66ec0bc5f548a72d21557d529f2d03c7417f09 (patch)
tree53aa0444fc698cde712fb8e0486e3da1a56f853d /tests/manual/lighting
parent98451b5e136af38b00b008ae58ec8243c981eee4 (diff)
Deprecation of the qt/quick3d repository.HEADmaster
Change-Id: I271146636615ab16f79ad3e66985076e2bd7a95c Reviewed-by: Sarah Jane Smith <[email protected]>
Diffstat (limited to 'tests/manual/lighting')
-rw-r--r--tests/manual/lighting/lighting.pro10
-rw-r--r--tests/manual/lighting/main.cpp63
-rw-r--r--tests/manual/lighting/qml/LightingTestCase.qml132
-rw-r--r--tests/manual/lighting/qml/tst_lighting.qml76
-rw-r--r--tests/manual/lighting/qtquick3d.pngbin4050 -> 0 bytes
-rw-r--r--tests/manual/lighting/tst_lighting_qml.desktop7
6 files changed, 0 insertions, 288 deletions
diff --git a/tests/manual/lighting/lighting.pro b/tests/manual/lighting/lighting.pro
deleted file mode 100644
index 2f62efdd..00000000
--- a/tests/manual/lighting/lighting.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = tst_lighting
-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/lighting/main.cpp b/tests/manual/lighting/main.cpp
deleted file mode 100644
index 8aa66508..00000000
--- a/tests/manual/lighting/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** 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_lighting.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/lighting/qml/LightingTestCase.qml b/tests/manual/lighting/qml/LightingTestCase.qml
deleted file mode 100644
index 35a3ead4..00000000
--- a/tests/manual/lighting/qml/LightingTestCase.qml
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** 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
-
-Rectangle {
- id: container
- // Parameters for editting and access
- property string text;
- property variant camera: defaultCamera
- property variant light: defaultLight // The actual Light
- // lightItem contains the defaultLight and a small white sphere at the same
- // position.
- property alias lightItem: lightItem
- // lightSphere is the sphere in lightItem. It's intended use is to be a
- // visible object at the source of the light, to make it easier to see
- // where the light should be coming from.
- property alias lightSphere: lightSphere
- // The teapotContainer is an item containing the 5 teapots, to make it
- // easier to move them around if necessary
- property alias teapotContainer: teapotContainer
- // view is the viewport that displays the test
- property alias view: view
-
- // Default values:
- property variant defaultCamera: Camera { eye: Qt.vector3d(0,0,15)}
- property variant defaultLight: Light {}
- property real defaultWidth: 440
- property real defaultHeight: 300
-
- // Utility values
- property real theta: 0.0
- SequentialAnimation on theta {
- running: true
- loops: Animation.Infinite
- PropertyAnimation {
- from: 0.0
- to: 2.0 * Math.PI
- 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
- light: container.light
- Item3D {
- id:lightItem
- // This sphere is small enough to be obscured by the center
- // teapot if it's not manipulated
- Sphere { id: lightSphere; scale: 0.3;
- }
- Light{ id: testLight; }
- }
- Item3D {
- id: teapotContainer
- Teapot { id: centerTeapot }
- Teapot { id: topRightTeapot; x:2; y:2 }
- Teapot { id: topLeftTeapot; x:-2; y:2 }
- Teapot { id: bottomRightTeapot; x:2; y:-2 }
- Teapot { id: bottomLeftTeapot; x:-2; y:-2 }
- }
- }
- }
-}
diff --git a/tests/manual/lighting/qml/tst_lighting.qml b/tests/manual/lighting/qml/tst_lighting.qml
deleted file mode 100644
index d5c9c4ee..00000000
--- a/tests/manual/lighting/qml/tst_lighting.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** 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
-
-// QTBUG-17408
-Item {
- id: screen
-
- width: aTestCase.defaultWidth * 2
- height: aTestCase.defaultHeight * 1
-
- Flow {
- anchors.fill: parent
-
- LightingTestCase {
- id: aTestCase
- text: "Positional Lighting Direct Position Test. The light should appear to be emanating from the sphere, rotating around the middle teapot and lighting the insides of the other 4 teapots dynamically."
-
- onThetaChanged: {
- light.position = Qt.vector3d(1.5 * Math.sin(theta),
- 1.5 * Math.cos(theta), 0);
- lightSphere.position = light.position;
- }
- }
-
- LightingTestCase {
- text: "Directional Lighting Test.
- Lighting should look the same on all teapots"
- onThetaChanged: {
- light.direction = Qt.vector3d(1.5 * Math.sin(theta),
- 1.5 * Math.cos(theta),0);
- }
- }
- }
-}
diff --git a/tests/manual/lighting/qtquick3d.png b/tests/manual/lighting/qtquick3d.png
deleted file mode 100644
index 8351083e..00000000
--- a/tests/manual/lighting/qtquick3d.png
+++ /dev/null
Binary files differ
diff --git a/tests/manual/lighting/tst_lighting_qml.desktop b/tests/manual/lighting/tst_lighting_qml.desktop
deleted file mode 100644
index 6cb79035..00000000
--- a/tests/manual/lighting/tst_lighting_qml.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=tst_lighting
-Icon=/usr/share/icons/hicolor/80x80/apps/qtquick3d.png
-Exec=/usr/bin/invoker --type=e -s /usr/bin/tst_lighting -fullscreen
-OnlyShowIn=X-MeeGo;
-X-MeeGo-Logical-Id=qtn_comm_appname_tst_lighting_qml