summaryrefslogtreecommitdiffstats
path: root/tests/auto/qml3d/item3d
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml3d/item3d')
-rw-r--r--tests/auto/qml3d/item3d/square.3dsbin120 -> 0 bytes
-rw-r--r--tests/auto/qml3d/item3d/test_data/test-image.pngbin4445 -> 0 bytes
-rw-r--r--tests/auto/qml3d/item3d/tst_item3d.qml400
-rw-r--r--tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml213
-rw-r--r--tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml74
5 files changed, 0 insertions, 687 deletions
diff --git a/tests/auto/qml3d/item3d/square.3ds b/tests/auto/qml3d/item3d/square.3ds
deleted file mode 100644
index 60c3be93..00000000
--- a/tests/auto/qml3d/item3d/square.3ds
+++ /dev/null
Binary files differ
diff --git a/tests/auto/qml3d/item3d/test_data/test-image.png b/tests/auto/qml3d/item3d/test_data/test-image.png
deleted file mode 100644
index 9a25b489..00000000
--- a/tests/auto/qml3d/item3d/test_data/test-image.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/qml3d/item3d/tst_item3d.qml b/tests/auto/qml3d/item3d/tst_item3d.qml
deleted file mode 100644
index 8689fd6a..00000000
--- a/tests/auto/qml3d/item3d/tst_item3d.qml
+++ /dev/null
@@ -1,400 +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 Qt 4.7
-import Qt3D 1.0
-import QtQuickTest 1.0
-
-Viewport {
- id: viewport
-
- Item3DClicker {
- id: mouseClicker
- }
-
- Item3D {
- id: "other"
- scale: 12
- position: Qt.vector3d(1.0, 3.0, 5.0);
- mesh: Mesh {
-
- }
- pretransform: [
- Rotation3D { id: other_item_pretransform1 ; angle: 30 ; axis: Qt.vector3d(0, 1, 0)},
- Rotation3D { id: other_item_pretransform2; angle: 90 ; axis: Qt.vector3d(1, 0, 0)}
- ]
-
- transform: [
- Rotation3D { id: other_teapot_rotate1 ; angle: 0 ; axis: Qt.vector3d(0, 1, 0)},
- Rotation3D { id: other_teapot_rotate2; angle: 0 ; axis: Qt.vector3d(0, 0, 1)}
- ]
- }
-
- Effect {
- id: "testEffect"
- }
-
- Light {
- id: "testLight"
- }
-
- Item3D {
- id: item
- property int positionHasBeenChanged: 0
- onPositionChanged : positionHasBeenChanged = positionHasBeenChanged + 1;
-
- property bool onScaleChangedSignalTriggered: false
- onScaleChanged: onScaleChangedSignalTriggered = true
-
- property bool onMeshChangedSignalTriggered: false
- onMeshChanged: onMeshChangedSignalTriggered = true
-
- property bool onEnabledChangedSignalTriggered:false
- onEnabledChanged: onEnabledChangedSignalTriggered = true
-
- property bool onEffectChangedSignalTriggered: false
- onEffectChanged: onEffectChangedSignalTriggered = true
-
- property int childrenHasBeenChanged: 0
- onChildrenChanged: childrenHasBeenChanged = childrenHasBeenChanged + 1
-
- property bool onLightChangedSignalTriggered: false
- onLightChanged: onLightChangedSignalTriggered = true
-
- property int stateChangeTestVariable: 0
-
- property bool onStateChangedSignalTriggered: false
- onStateChanged: onStateChangedSignalTriggered = true
-
- property bool onSortChildrenSignalTriggered: false
- onSortChildrenChanged: onSortChildrenSignalTriggered = true
-
- property bool onClickedSignalTriggered: false
- onClicked: onClickedSignalTriggered = true
-
- Item3D {
- id: child1
- }
-
- Item3D {
- id: child2
- }
-
- Item3D {
- id: inheritEventTestChild
- }
-
- states: [
- State {
- name: "testState1"
- PropertyChanges { target: item; stateChangeTestVariable: 1}
- },
- State {
- name: "testState2"
- PropertyChanges { target: item; stateChangeTestVariable: 2}
- }
- ]
-
- TestCase {
- name: "Item3D"
-
- // Helper function that finds the index of an object in a list
- function indexOf(list, object)
- {
- for (var i = 0; i < list.length; i++)
- if (list[i] == object)
- return i;
- return -1;
- }
-
- function test_position()
- {
- verify(item.position.x == 0, "Default position x");
- verify(item.position.y == 0, "Default position y");
- verify(item.position.z == 0, "Default position z");
-
- verify(item.x == 0, "Default x");
- verify(item.y == 0, "Default y");
- verify(item.z == 0, "Default z");
-
- verify(!item.positionHasBeenChanged, "pre signal test");
- item.position = Qt.vector3d(1,-6,1234567);
- compare(item.positionHasBeenChanged, 1, "onPositionChanged signal");
- verify(item.position.x == 1, "Set position x");
- verify(item.position.y == -6, "Set position y negative");
- verify(item.position.z == 1234567, "seven significant digits");
-
- verify(item.x == 1, "position changes x");
- verify(item.y == -6, "position changes y");
- verify(item.z == 1234567, "position changex z");
-
- item.position.x = -1;
- compare(item.positionHasBeenChanged, 2, "onPositionChanged signal from position.x property");
- item.position.y = 12;
- compare(item.positionHasBeenChanged, 3, "onPositionChanged signal from position.y property");
- item.position.z = 83461;
- compare(item.positionHasBeenChanged, 4, "onPositionChanged signal from position.z property");
- verify(item.x == -1, "position.x changes x");
- verify(item.y == 12, "position.y changes y");
- verify(item.z == 83461, "position.z changes z");
- }
-
- function test_x()
- {
- item.positionHasBeenChanged = 0;
- verify(!item.positionHasBeenChanged, "pre signal test");
-
- item.x = 324;
- verify(item.x == 324, "Set x");
- verify(item.position.x == 324, "position modified by setting x");
- compare(item.positionHasBeenChanged, 1, "onPositionChanged signal after setting x");
-
- item.x = -7;
- verify(item.x == -7, "Set x negative");
- verify(item.position.x == -7, "position modified by setting x negative");
- compare(item.positionHasBeenChanged, 2, "onPositionChanged signal after setting x negative");
-
- item.position = Qt.vector3d(2,-7,2345671);
- verify(item.x == 2, "x changed by setting postion");
- }
-
- function test_y()
- {
- item.positionHasBeenChanged = 0;
- verify(!item.positionHasBeenChanged, "pre signal test");
-
- item.y = 346;
- verify(item.y == 346, "Set y");
- verify(item.position.y == 346, "position modified by setting y");
- compare(item.positionHasBeenChanged, 1, "onPositionChanged signal after setting y");
-
- item.y = -12;
- verify(item.y == -12, "Set y negative");
- verify(item.position.y == -12, "position modified by setting y negative");
- compare(item.positionHasBeenChanged, 2, "onPositionChanged signal after setting y negative");
-
- item.position = Qt.vector3d(2, 13,2345671);
- verify(item.y == 13, "y changed by setting postion");
- }
-
- function test_z()
- {
- item.positionHasBeenChanged = 0;
- verify(!item.positionHasBeenChanged, "pre signal test");
-
- item.z = 19375;
- verify(item.z == 19375, "Set z");
- verify(item.position.z == 19375, "position modified by setting z");
- compare(item.positionHasBeenChanged, 1, "onPositionChanged signal after setting z");
-
- item.z = -74635;
- verify(item.z == -74635, "Set z negative");
- verify(item.position.z == -74635, "position modified by setting z negative");
- compare(item.positionHasBeenChanged, 2, "onPositionChanged signal after setting z negative");
-
- item.z = 0.435;
- compare(item.z, 0.435, "setting z to a real number")
- compare(item.position.z, 0.435, "position modified by setting z to a real");
- compare(item.positionHasBeenChanged, 3, "onPositionChanged signal after setting z to a real");
-
- item.position = Qt.vector3d(2, 67,2345671);
- verify(item.z == 2345671, "z changed by setting postion");
- }
-
- function test_scale()
- {
- verify(!item.onScaleChangedSignalTriggered);
- compare(item.scale, 1, "default value");
- item.scale = 2.5;
- compare(item.scale, 2.5, "setScale");
- verify(item.onScaleChangedSignalTriggered, "scaleChanged signal");
- item.scale = other.scale;
- compare(item.scale, 12, "setScale from other item");
- }
-
- function test_transform()
- {
- compare(item.transform.length, 0, "Default transformations are empty");
- compare(other.transform.length, 2, "non-empty transform");
- // no public set function
- }
-
- function test_pretransform()
- {
- compare(item.pretransform.length, 0, "Default pretransformations are empty");
- compare(other.pretransform.length, 2, "non-empty pretransform");
- // no public set function
- }
-
- function test_inheritEvents()
- {
- verify(!item.inheritEvents, "default inheritEvents is false");
- compare(item.onClickedSignalTriggered, false, "pretest onClickedSignalTriggered check");
- compare(inheritEventTestChild.parent, item, "pretest parent check");
-
- mouseClicker.click(inheritEventTestChild);
- compare(item.onClickedSignalTriggered, false,
- "no parent event when inheritEvents is false");
-
- item.inheritEvents = true;
- verify(item.inheritEvents, "setInheritEvents()");
- mouseClicker.click(inheritEventTestChild);
- compare(item.onClickedSignalTriggered, true, "parent event when inheritEvents is true");
- }
-
- function test_mesh()
- {
- verify(!item.mesh, "default mesh value");
- verify(other.mesh != null, "non-null mesh");
- item.mesh = other.mesh;
- verify(item.onMeshChangedSignalTriggered, "MeshChanged signal");
- verify(item.mesh == other.mesh, "setMesh()");
- }
-
- function test_effect()
- {
- verify(!item.effect, "default effect is null");
- item.effect = testEffect;
- verify(item.onEffectChangedSignalTriggered, "onEffectChanged signal");
- verify(item.effect == testEffect, "setEffect()");
- }
-
- function test_light()
- {
- verify(!item.light, "default lightparamters is null");
- item.light = testLight;
- verify(item.onLightChangedSignalTriggered, "onLightChangedSignal");
- verify(item.light == testLight, "setLight()");
- }
-
- function test_resources()
- {
- verify(item.resources != undefined, "item has resources");
- verify(other.resources != undefined, "other item has resources");
- // No public write method
- }
-
- function test_data()
- {
- verify(item.data != undefined, "item has data");
- verify(other.data != undefined, "other item has data");
- // No public write method
- }
-
- function test_children()
- {
- verify(item.children.length >= 0, "item.children can be called");
- verify(indexOf(item.children, child1) != -1, "item.children contains child1")
- verify(indexOf(item.children, child2) != -1, "item.children contains child2")
- verify(indexOf(item.children, inheritEventTestChild) != -1, "item.children contains inheritEventTestChild")
- }
-
- function test_states()
- {
-
- }
-
- function test_state()
- {
- verify(!item.state, "Default state is null");
- verify(item.stateChangeTestVariable == 0, "property check before state change");
- item.state = "testState1";
- verify(item.onStateChangedSignalTriggered, "onStateChanged signal");
- verify(item.state == "testState1", "setState()");
- verify(item.stateChangeTestVariable == 1, "property changed with new state");
- }
-
- function test_enabled()
- {
- verify(item.enabled, "default value")
- item.enabled = false;
- verify(!item.enabled, "setEnabled false")
- verify(item.onEnabledChangedSignalTriggered, "enabledChanged signal")
- }
-
- function test_parent()
- {
- compare(item.childrenHasBeenChanged,0, "pretest marker verification");
-
- // Test the initial Item3D parent/child relationships.
- verify(item.parent == viewport, "root item")
- verify(child1.parent == item, "child1 item")
- verify(child2.parent == item, "child2 item")
- compare(child1.children.length, 0, "child1 children")
- verify(indexOf(item.children, child1) != -1, "children contains child1")
- verify(indexOf(item.children, child2) != -1, "children contains child2")
-
- // Reparent the second child and re-test.
- child2.parent = child1
- compare(item.childrenHasBeenChanged,1, "childrenChanged triggered by removing child");
-
- verify(item.parent == viewport, "root item (B)")
- verify(child1.parent == item, "child1's parent (B)")
- verify(child2.parent == child1, "child2's parent (B)")
- compare(child1.children.length, 1, "child1 children (B)")
- verify(indexOf(item.children, child1) != -1, "item.children contains child1 (B)")
- verify(indexOf(item.children, child2) == -1, "reparented child not removed from old parent (B)");
- verify(indexOf(child1.children, child2) != -1, "child1.children contains child2");
-
- // Change the parent back and test again
- child2.parent = item
- compare(item.childrenHasBeenChanged,2, "childrenChanged triggered by re-adding child");
-
- verify(item.parent == viewport, "root item after revert")
- verify(child1.parent == item, "child1 item after revert")
- verify(child2.parent == item, "child2 item after revert")
- compare(child1.children.length, 0, "child1 has no children after revert")
-
- verify(indexOf(item.children, child1) != -1, "item.children contains child1 after revert");
- verify(indexOf(item.children, child2) != -1, "item.children contains child2 after revert");
- verify(indexOf(child1.children, child2) == -1, "child1.children does not contain child2 after revert");
- }
-
- function test_sortChildren()
- {
- verify(item.sortChildren == Item3D.DefaultSorting, "default value")
- item.sortChildren = Item3D.BackToFront;
- verify(item.sortChildren == Item3D.BackToFront, "back-to-front")
- verify(item.onSortChildrenSignalTriggered, "sortChildren signal")
- }
- }
- }
-}
diff --git a/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml b/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml
deleted file mode 100644
index 66982035..00000000
--- a/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml
+++ /dev/null
@@ -1,213 +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 Qt 4.7
-import Qt3D 1.0
-import QtQuickTest 1.0
-
-Viewport {
- id: viewport
-
-
- Item3D {
- id: rotateTestItem
- Item3D {
- id: rotateTestItemChild
- transform: Rotation3D {angle: 90 ; axis: Qt.vector3d(0,1,0)}
- }
- transform: Rotation3D {angle: 90 ; axis: Qt.vector3d(0,1,0)}
- }
-
- Item3D {
- id: rotateZTestItem
- Item3D {
- id: rotateZChild
- }
- transform: Rotation3D {angle: 90 ; axis: Qt.vector3d(0,0,1)}
- }
-
- Item3D {
- id: scaleTestItem
- Item3D {
- id: scaleTestItemChild
- transform: Scale3D { scale: 0.5 }
- }
- transform: Scale3D { scale: 2.0 }
- }
-
- Item3D {
- id: translateTestItem
- position: Qt.vector3d(1,1,1)
-
- Item3D {
- id: child
- position: Qt.vector3d(1,1,1)
- }
-
- TestCase {
- name: "Item3DRelativeTransformTests"
-
- function test_localToWorld_translate()
- {
- var testVectorNull = Qt.vector3d(0,0,0);
- var resultVector = translateTestItem.localToWorld(testVectorNull);
-
- compare(resultVector.x, translateTestItem.position.x, "testVectorNull x translation");
- compare(resultVector.y, translateTestItem.position.y, "testVectorNull y translation");
- compare(resultVector.z, translateTestItem.position.z, "testVectorNull z translation");
-
- var childResult = child.localToWorld(testVectorNull);
- compare(childResult.x, translateTestItem.x + child.x, "child testVectorNull x translation");
- compare(childResult.y, translateTestItem.y + child.y, "child testVectorNull y translation");
- compare(childResult.z, translateTestItem.z + child.z, "child testVectorNull z translation");
-
- var testVector2 = Qt.vector3d(-1,0,123456);
- var childResult2 = child.localToWorld(testVector2);
- compare(childResult2.x, translateTestItem.x + child.x + testVector2.x, "non-zero point, x translation");
- compare(childResult2.y, translateTestItem.y + child.y, "non-zero point, y translation");
- compare(childResult2.z, translateTestItem.z + child.z + testVector2.z, "non-zero point, z translation");
- }
-
- function test_localToWorld_rotate()
- {
- var testVectorX = Qt.vector3d(1,0,0);
- var resultVector = rotateTestItem.localToWorld(testVectorX);
- compare(resultVector.x, 0, "x value of testVectorX rotated 90 degrees around y unit vector");
- compare(resultVector.y, 0, "y value of testVectorX rotated 90 degrees around y unit vector");
- compare(resultVector.z, -1, "z value of testVectorX rotated 90 degrees around y unit vector");
-
- var testVectorY = Qt.vector3d(0,1,0);
- var resultVectorY = rotateTestItem.localToWorld(testVectorY);
- compare(resultVectorY.x, 0, "x value of testVectorY rotated 90 degrees around y unit vector");
- compare(resultVectorY.y, 1, "y value of testVectorY rotated 90 degrees around y unit vector");
- compare(resultVectorY.z, 0, "z value of testVectorY rotated 90 degrees around y unit vector");
-
- var testVectorXY = Qt.vector3d(1,2,0);
- var resultVectorXY = rotateZChild.localToWorld(testVectorXY);
- compare(resultVectorXY.x, -testVectorXY.y, "x value of testVectorY rotated 90 degrees around y unit vector");
- compare(resultVectorXY.y, testVectorXY.x, "y value of testVectorY rotated 90 degrees around y unit vector");
- compare(resultVectorXY.z, testVectorXY.z, "z value of testVectorY rotated 90 degrees around y unit vector");
- }
-
- function test_localToWorld_scale()
- {
- var testVectorNull = Qt.vector3d(0,0,0);
- var testVectorX = Qt.vector3d(1,0,0);
-
- var resultVector = scaleTestItem.localToWorld(testVectorNull);
- compare(resultVector.x, 0, "x value of testVectorNull scale: 2.0");
- compare(resultVector.y, 0, "y value of testVectorNull scale: 2.0");
- compare(resultVector.z, 0, "z value of testVectorNull scale: 2.0");
-
- resultVector = scaleTestItem.localToWorld(testVectorX);
- compare(resultVector.x, 2, "testVectorX.x scale: 2.0");
- compare(resultVector.y, 0, "testVectorX.y scale: 2.0");
- compare(resultVector.z, 0, "testVectorX.z scale: 2.0");
-
- resultVector = scaleTestItemChild.localToWorld(testVectorNull);
- compare(resultVector.x, testVectorNull.x, "testVectorNull.x scaled up and back down");
- compare(resultVector.y, testVectorNull.y, "testVectorNull.y scaled up and back down");
- compare(resultVector.z, testVectorNull.z, "testVectorNull.z scaled up and back down");
-
- resultVector = scaleTestItemChild.localToWorld(testVectorX);
- compare(resultVector.x, testVectorX.x, "testVectorX.x scaled up and back down");
- compare(resultVector.y, testVectorX.y, "testVectorX.y scaled up and back down");
- compare(resultVector.z, testVectorX.z, "testVectorX.z scaled up and back down");
- }
-
- function test_worldToLocal_rotate()
- {
- var testVector = Qt.vector3d(0,0,-1);
- var resultVector = rotateTestItem.worldToLocal(testVector);
- compare(resultVector.x, 1, "x value of x unitVector rotated 90 degrees around y unit vector");
- compare(resultVector.y, 0, "y value of x unitVector rotated 90 degrees around y unit vector");
- compare(resultVector.z, 0, "z value of x unitVector rotated 90 degrees around y unit vector");
- }
-
- function test_worldToLocal_scale()
- {
- var testVectorNull = Qt.vector3d(0,0,0);
- var testVectorX = Qt.vector3d(1,0,0);
-
- var resultVector = scaleTestItem.worldToLocal(testVectorNull);
- compare(resultVector.x, 0, "x value of testVectorNull scale: 2.0");
- compare(resultVector.y, 0, "y value of testVectorNull scale: 2.0");
- compare(resultVector.z, 0, "z value of testVectorNull scale: 2.0");
-
- resultVector = scaleTestItem.worldToLocal(testVectorX);
- compare(resultVector.x, 0.5, "testVectorX.x scale: 2.0");
- compare(resultVector.y, 0, "testVectorX.y scale: 2.0");
- compare(resultVector.z, 0, "testVectorX.z scale: 2.0");
-
- resultVector = scaleTestItemChild.worldToLocal(testVectorNull);
- compare(resultVector.x, testVectorNull.x, "testVectorNull.x scaled up and back down");
- compare(resultVector.y, testVectorNull.y, "testVectorNull.y scaled up and back down");
- compare(resultVector.z, testVectorNull.z, "testVectorNull.z scaled up and back down");
-
- resultVector = scaleTestItemChild.worldToLocal(testVectorX);
- compare(resultVector.x, testVectorX.x, "testVectorX.x scaled up and back down");
- compare(resultVector.y, testVectorX.y, "testVectorX.y scaled up and back down");
- compare(resultVector.z, testVectorX.z, "testVectorX.z scaled up and back down");
- }
-
- function test_worldToLocal_translate()
- {
- var testVectorNull = Qt.vector3d(0,0,0);
- var resultVectorNull = translateTestItem.worldToLocal(testVectorNull);
-
- compare(resultVectorNull.x, -translateTestItem.position.x, "testVectorNull x translation");
- compare(resultVectorNull.y, -translateTestItem.position.y, "testVectorNull y translation");
- compare(resultVectorNull.z, -translateTestItem.position.z, "testVectorNull z translation");
-
- var childResult = child.worldToLocal(testVectorNull);
- compare(childResult.x, -translateTestItem.x - child.x, "child x translation");
- compare(childResult.y, -translateTestItem.y - child.y, "child y translation");
- compare(childResult.z, -translateTestItem.z - child.z, "child z translation");
-
- var testVector2 = Qt.vector3d(-1,0,123456);
- var childResult2 = child.worldToLocal(testVector2);
- compare(childResult2.x, testVector2.x -translateTestItem.x - child.x, "non-zero point, x translation");
- compare(childResult2.y, testVector2.y -translateTestItem.y - child.y, "non-zero point, y translation");
- compare(childResult2.z, testVector2.z -translateTestItem.z - child.z, "non-zero point, z translation");
- }
- }
- }
-}
diff --git a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
deleted file mode 100644
index 55fc2e45..00000000
--- a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
+++ /dev/null
@@ -1,74 +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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
- width: 1000
- height: 800
- camera: Camera {
- eye.z: 10
- }
-
- Item3D {
- id: testItem
- mesh: Mesh { source: "square.3ds" }
- effect: Effect { texture: "test_data/test-image.png" }
- }
-
- // HACK.
- // The test requires that actual drawing happen,
- // and it would be better to verify that directly.
- Timer {
- running: true
- interval: 5
- onTriggered: Qt.quit()
- }
-
- // This test is simply testing to see if the item crashes on startup,
- // so this dummy test is probably not even required
- function test_exists()
- {
- verify(testItem.visible);
- Qt.quit();
- }
-}