From e25bbe5223781131be17c8b0d6737887deeacb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= <kaj.gronholm@qt.io>
Date: Fri, 27 Mar 2020 14:15:54 +0200
Subject: [PATCH] Add more lancelot tests for multiple views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These render incorrectly currently, to be fixed.
Task-number: QTBUG-83136
Task-number: QTBUG-83137
Change-Id: Ied4ef8c9a417bc3c4784474eb8dee16ad5523082
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
tests/auto/quick3d_lancelot/data/Ignore | 1 +
.../data/view3d/MultipleViews.qml | 152 +++++++++++++++
.../data/view3d/RenderModeMultiple.qml | 176 ++++++++++++++++++
.../data/view3d/SceneComponent.qml | 68 +++++++
4 files changed, 397 insertions(+)
create mode 100644 tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml
create mode 100644 tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml
create mode 100644 tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml
diff --git a/tests/auto/quick3d_lancelot/data/Ignore b/tests/auto/quick3d_lancelot/data/Ignore
index 38cc43f9c..d1bacfc7f 100644
--- a/tests/auto/quick3d_lancelot/data/Ignore
+++ b/tests/auto/quick3d_lancelot/data/Ignore
@@ -16,3 +16,4 @@ lighting/materials/Material.qml
# Dynamic component
quick/Component.qml
defaultmaterial/BlendComponent.qml
+view3d/SceneComponent.qml
diff --git a/tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml b/tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml
new file mode 100644
index 000000000..2cf7de592
--- /dev/null
+++ b/tests/auto/quick3d_lancelot/data/view3d/MultipleViews.qml
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick3D 1.15
+
+Item {
+ width: 460
+ height: 460
+
+ // This exactly same content should appear 4 times, in different ways.
+ Node {
+ id: sceneRoot
+ PerspectiveCamera {
+ position: Qt.vector3d(0, 0, 200)
+ }
+ DirectionalLight {
+ brightness: 100
+ }
+ Model {
+ source: "#Cube"
+ materials: DefaultMaterial {
+ diffuseColor: "green"
+ }
+ eulerRotation: Qt.vector3d(45, 45, 45)
+ }
+ }
+
+ SceneComponent {
+ id: sceneRoot2
+ }
+
+ // View1, importScene with node id of local component
+ View3D {
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: Qt.rgba(0.5, 0.5, 0.5, 1)
+ }
+ importScene: sceneRoot
+ }
+
+ // View2, importScene with node id of external component
+ View3D {
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: Qt.rgba(0.5, 0.5, 0.5, 1)
+ }
+ importScene: sceneRoot2
+ }
+
+ // View3, importScene with external component
+ View3D {
+ anchors.left: parent.left
+ anchors.bottom: parent.bottom
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: Qt.rgba(0.5, 0.5, 0.5, 1)
+ }
+ importScene: SceneComponent {
+ id: sceneRoot3
+ }
+ }
+
+ // View4, content inside
+ View3D {
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: Qt.rgba(0.5, 0.5, 0.5, 1)
+ }
+ Node {
+ id: sceneRoot4
+ PerspectiveCamera {
+ position: Qt.vector3d(0, 0, 200)
+ }
+ DirectionalLight {
+ brightness: 100
+ }
+ Model {
+ source: "#Cube"
+ materials: DefaultMaterial {
+ diffuseColor: "green"
+ }
+ eulerRotation: Qt.vector3d(45, 45, 45)
+ }
+ }
+ }
+}
diff --git a/tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml b/tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml
new file mode 100644
index 000000000..c7a160fd4
--- /dev/null
+++ b/tests/auto/quick3d_lancelot/data/view3d/RenderModeMultiple.qml
@@ -0,0 +1,176 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick3D 1.15
+
+Item {
+ width: 480
+ height: 480
+
+ // Rectangles below and above View3D items
+ Rectangle {
+ z: 1
+ width: 200
+ height: 200
+ anchors.centerIn: parent
+ color: "#808080"
+ }
+ Rectangle {
+ z: 10
+ width: 150
+ height: 150
+ anchors.centerIn: parent
+ color: "#606060"
+ }
+
+ Node {
+ id: sceneRoot
+ PerspectiveCamera {
+ position: Qt.vector3d(0, 0, 350)
+ }
+ DirectionalLight {
+ brightness: 100
+ }
+ Model {
+ source: "#Cube"
+ scale: Qt.vector3d(2,2,2)
+ materials: DefaultMaterial {
+ diffuseColor: "green"
+ }
+ eulerRotation: Qt.vector3d(45, 45, 45)
+ }
+ }
+
+ View3D {
+ z: 2
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: "red"
+ }
+ renderMode: View3D.Offscreen
+ importScene: sceneRoot
+ Node {
+ z: 220
+ Text {
+ font.pixelSize: 22
+ text: "Offscreen"
+ }
+ }
+ }
+ View3D {
+ z: 3
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: "red"
+ }
+ renderMode: View3D.Inline
+ importScene: sceneRoot
+ Node {
+ z: 220
+ Text {
+ font.pixelSize: 22
+ text: "Inline"
+ }
+ }
+ }
+ View3D {
+ z: 4
+ anchors.left: parent.left
+ anchors.bottom: parent.bottom
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: "red"
+ }
+ renderMode: View3D.Underlay
+ importScene: sceneRoot
+ Node {
+ z: 220
+ Text {
+ font.pixelSize: 22
+ text: "Underlay"
+ }
+ }
+ }
+ View3D {
+ z: 5
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.margins: 20
+ width: 200
+ height: 200
+ environment: SceneEnvironment {
+ backgroundMode: SceneEnvironment.Color
+ clearColor: "red"
+ }
+ renderMode: View3D.Overlay
+ importScene: sceneRoot
+ Node {
+ z: 220
+ Text {
+ font.pixelSize: 22
+ text: "Overlay"
+ }
+ }
+ }
+}
diff --git a/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml b/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml
new file mode 100644
index 000000000..a6c4eda02
--- /dev/null
+++ b/tests/auto/quick3d_lancelot/data/view3d/SceneComponent.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.15
+import QtQuick3D 1.15
+
+Node {
+ PerspectiveCamera {
+ position: Qt.vector3d(0, 0, 200)
+ }
+ DirectionalLight {
+ brightness: 100
+ }
+ Model {
+ source: "#Cube"
+ materials: DefaultMaterial {
+ diffuseColor: "green"
+ }
+ eulerRotation: Qt.vector3d(45, 45, 45)
+ }
+}
--
GitLab