summaryrefslogtreecommitdiffstats
path: root/tests/manual/submesh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/submesh')
-rw-r--r--tests/manual/submesh/README9
-rw-r--r--tests/manual/submesh/main.cpp63
-rw-r--r--tests/manual/submesh/qml/meshes/lunar-lander.3dsbin23456 -> 0 bytes
-rw-r--r--tests/manual/submesh/qml/tst_submesh.qml207
-rw-r--r--tests/manual/submesh/qtquick3d.pngbin4050 -> 0 bytes
-rw-r--r--tests/manual/submesh/submesh.pro10
-rw-r--r--tests/manual/submesh/tst_submesh_qml.desktop7
7 files changed, 0 insertions, 296 deletions
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/main.cpp b/tests/manual/submesh/main.cpp
deleted file mode 100644
index 67e68746..00000000
--- a/tests/manual/submesh/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_submesh.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/submesh/qml/meshes/lunar-lander.3ds b/tests/manual/submesh/qml/meshes/lunar-lander.3ds
deleted file mode 100644
index 7403fdef..00000000
--- a/tests/manual/submesh/qml/meshes/lunar-lander.3ds
+++ /dev/null
Binary files differ
diff --git a/tests/manual/submesh/qml/tst_submesh.qml b/tests/manual/submesh/qml/tst_submesh.qml
deleted file mode 100644
index 2fb42e66..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 ([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
-
-// 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/qtquick3d.png b/tests/manual/submesh/qtquick3d.png
deleted file mode 100644
index 8351083e..00000000
--- a/tests/manual/submesh/qtquick3d.png
+++ /dev/null
Binary files differ
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
deleted file mode 100644
index 6f39b010..00000000
--- a/tests/manual/submesh/submesh.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = tst_submesh
-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/submesh/tst_submesh_qml.desktop b/tests/manual/submesh/tst_submesh_qml.desktop
deleted file mode 100644
index 7bd7fd92..00000000
--- a/tests/manual/submesh/tst_submesh_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