From 233fd0232621774d9517d32d3402cfe4a7109499 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Wed, 21 Oct 2020 08:58:28 +0200
Subject: [PATCH] Improve background on the old principled-material lancelot
scenes
Less noisy, and easier to notice transparency.
As a driveby, remove duplicated copies of the checkerboard pngs.
Change-Id: I3430f4a800dd79f6282386ad1196d0bc0440e8d9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
.../data/principled/alpha.qml | 43 ++++++++++++------
.../data/principled/basecolor.qml | 8 ++--
.../data/principled/metalness.qml | 8 ++--
.../quick3d_lancelot/data/principled/misc.qml | 8 ++--
.../data/principled/normal.qml | 8 ++--
.../data/principled/occlusion.qml | 9 ++--
.../data/principled/roughness.qml | 8 ++--
.../data/principled/specular.qml | 8 ++--
.../data/shared/checkerboard_1.png | Bin 3779 -> 0 bytes
.../data/shared/checkerboard_2.png | Bin 3910 -> 0 bytes
10 files changed, 57 insertions(+), 43 deletions(-)
delete mode 100644 tests/auto/quick3d_lancelot/data/shared/checkerboard_1.png
delete mode 100644 tests/auto/quick3d_lancelot/data/shared/checkerboard_2.png
diff --git a/tests/auto/quick3d_lancelot/data/principled/alpha.qml b/tests/auto/quick3d_lancelot/data/principled/alpha.qml
index 76ddc8384..632cca094 100644
--- a/tests/auto/quick3d_lancelot/data/principled/alpha.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/alpha.qml
@@ -52,8 +52,8 @@ import QtQuick 2.14
import QtQuick3D 1.15
Rectangle {
- width: 600
- height: 600
+ width: 400
+ height: 500
color: "lightgray"
View3D {
@@ -83,12 +83,27 @@ Rectangle {
source: "../shared/maps/oulu_2.jpeg"
}
+ Model {
+ source: "#Rectangle"
+ materials: [ DefaultMaterial {
+ lighting: DefaultMaterial.NoLighting
+ diffuseMap: Texture {
+ source: "../shared/maps/checkers1.png"
+ tilingModeHorizontal: Texture.Repeat
+ tilingModeVertical: Texture.Repeat
+ scaleU: 100
+ scaleV: 100
+ }
+ } ]
+ z: -500
+ scale: Qt.vector3d(10, 10, 1)
+ }
// Row 1, just baseColor with alpha == 64
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(-125, 200, 0)
+ position: Qt.vector3d(-125, 175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColor: "#404080A0"
@@ -100,7 +115,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(0, 200, 0)
+ position: Qt.vector3d(0, 175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColor: "#404080A0"
@@ -112,7 +127,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(125, 200, 0)
+ position: Qt.vector3d(125, 175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColor: "#404080A0"
@@ -125,7 +140,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(-125, 50, 0)
+ position: Qt.vector3d(-125, 60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -137,7 +152,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(0, 50, 0)
+ position: Qt.vector3d(0, 60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -149,7 +164,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(125, 50, 0)
+ position: Qt.vector3d(125, 60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -162,7 +177,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(-125, -100, 0)
+ position: Qt.vector3d(-125, -60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -175,7 +190,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(0, -100, 0)
+ position: Qt.vector3d(0, -60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -188,7 +203,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(125, -100, 0)
+ position: Qt.vector3d(125, -60, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -202,7 +217,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(-125, -250, 0)
+ position: Qt.vector3d(-125, -175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -215,7 +230,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(0, -250, 0)
+ position: Qt.vector3d(0, -175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
@@ -228,7 +243,7 @@ Rectangle {
Model {
source: "#Cube"
scale: Qt.vector3d(0.8, 0.8, 0.8)
- position: Qt.vector3d(125, -250, 0)
+ position: Qt.vector3d(125, -175, 0)
eulerRotation.y: 60
materials: [ PrincipledMaterial {
baseColorMap: tex_rgba
diff --git a/tests/auto/quick3d_lancelot/data/principled/basecolor.qml b/tests/auto/quick3d_lancelot/data/principled/basecolor.qml
index 3e72e16a0..1755ddc68 100644
--- a/tests/auto/quick3d_lancelot/data/principled/basecolor.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/basecolor.qml
@@ -82,15 +82,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
// Row 1
diff --git a/tests/auto/quick3d_lancelot/data/principled/metalness.qml b/tests/auto/quick3d_lancelot/data/principled/metalness.qml
index 6f6e36114..c1a7420d9 100644
--- a/tests/auto/quick3d_lancelot/data/principled/metalness.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/metalness.qml
@@ -83,15 +83,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
// Row 1
diff --git a/tests/auto/quick3d_lancelot/data/principled/misc.qml b/tests/auto/quick3d_lancelot/data/principled/misc.qml
index 18bd7478f..b49a26e9b 100644
--- a/tests/auto/quick3d_lancelot/data/principled/misc.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/misc.qml
@@ -87,15 +87,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
Node {
diff --git a/tests/auto/quick3d_lancelot/data/principled/normal.qml b/tests/auto/quick3d_lancelot/data/principled/normal.qml
index 131f7af6d..d8d29062c 100644
--- a/tests/auto/quick3d_lancelot/data/principled/normal.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/normal.qml
@@ -96,15 +96,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
Node {
diff --git a/tests/auto/quick3d_lancelot/data/principled/occlusion.qml b/tests/auto/quick3d_lancelot/data/principled/occlusion.qml
index f99ea4cd1..de106775d 100644
--- a/tests/auto/quick3d_lancelot/data/principled/occlusion.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/occlusion.qml
@@ -83,21 +83,20 @@ Rectangle {
source: "../shared/maps/oulu_2.jpeg"
}
-
Model {
source: "#Rectangle"
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
// Row 1
diff --git a/tests/auto/quick3d_lancelot/data/principled/roughness.qml b/tests/auto/quick3d_lancelot/data/principled/roughness.qml
index df718980c..cf2e0568a 100644
--- a/tests/auto/quick3d_lancelot/data/principled/roughness.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/roughness.qml
@@ -83,15 +83,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
// Row 1
diff --git a/tests/auto/quick3d_lancelot/data/principled/specular.qml b/tests/auto/quick3d_lancelot/data/principled/specular.qml
index 58f78e0d4..1ed7ab1c6 100644
--- a/tests/auto/quick3d_lancelot/data/principled/specular.qml
+++ b/tests/auto/quick3d_lancelot/data/principled/specular.qml
@@ -86,15 +86,15 @@ Rectangle {
materials: [ DefaultMaterial {
lighting: DefaultMaterial.NoLighting
diffuseMap: Texture {
- source: "../shared/maps/checkerboard_1.png"
+ source: "../shared/maps/checkers1.png"
tilingModeHorizontal: Texture.Repeat
tilingModeVertical: Texture.Repeat
- scaleU: 8
- scaleV: 8
+ scaleU: 100
+ scaleV: 100
}
} ]
z: -500
- scale: Qt.vector3d(8, 12, 1)
+ scale: Qt.vector3d(10, 10, 1)
}
Node {
diff --git a/tests/auto/quick3d_lancelot/data/shared/checkerboard_1.png b/tests/auto/quick3d_lancelot/data/shared/checkerboard_1.png
deleted file mode 100644
index d08883fa2da75564bc017cf7f106b11268915c2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3779
zcmeAS@N?(olHy`uVBq!ia0y~yU~~ZD2OP{mk;g$UWk8CtILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmF3=GT+0X`wFK=Dy98UiCW1U4Id=>X;vhLRw^;Qu2VFa&>RR|O^n&H|6f
zVg?4j!ywFfJby(B0|S?Xr;B4qMcmtq8+n->d5#=-y+6}>CfAR~NpqPv62CrMecxPb
zuHVv2FGHjQmfvcyy2^HCrP%_%t&F9scvl4HI?T;tel<j;R-TcazaqqHuGiBE&RSFb
zmIqlrnc%hb^2!iC%OycCOSGms^Q|0}9uC3stj|AWG!>5~@}Zr%M^o`=Q9bmlsL@nB
eoKo?k@Ba=c+TGB0?7t7{X?VK&xvX<aXaWF|Ex?Tc
diff --git a/tests/auto/quick3d_lancelot/data/shared/checkerboard_2.png b/tests/auto/quick3d_lancelot/data/shared/checkerboard_2.png
deleted file mode 100644
index 505b8ad9cbfd8782554fb1857699fde06a17b57b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3910
zcmeAS@N?(olHy`uVBq!ia0y~yU~~ZD2OP{mk;g$UWk8CtILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmF3=GT+0X`wFK=Dy98UiCW1U4Id=>X;vhLRw^;Qu2VFa&>RR|O^n&H|6f
zVg?4j!ywFfJby(B0|VD#PZ!6KinzBIH}Wz&@*Hvae*cT*Os*dX)n+kuw0^P9elI=M
zZ+VcU(UPE-C0bJzowY`}!yz;*t?dF=mRL>oS{{6tv2>O70>4uBD=XhMSY4G3SiXz-
zRY<wR+*f=nhJ~b7`f>HqWIG%)@n|X@j<Gt@Dx1+%JerD!e*0>GQnAVVzl`$F(i{}u
SANd99?0CBRxvX<aXaWE$Y?OKc
--
GitLab