aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-08-25 14:08:14 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-08-26 08:15:15 +0000
commit3e17d8eed406ad1fecdee26d9276e1d007c0c0ea (patch)
treee444d2920387cf4ee5b40488f8d6a8a4354108c3 /share/qtcreator/qml
parent70343084badaca0ae8a05f2e4c150a893e929275 (diff)
QmlDesigner: Change default material preview env to studio env
Since "Default" option is no longer default, it was changed to "Basic" Change-Id: I8654efbd98fe62f6c4817141fc8559757f5e58e8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'share/qtcreator/qml')
-rw-r--r--share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml18
1 files changed, 10 insertions, 8 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
index 12fdd3048e..ed44b85559 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/MaterialNodeView.qml
@@ -29,7 +29,8 @@ View3D {
id: root
anchors.fill: parent
environment: sceneEnv
- camera: envMode === "SkyBox" && envValue === "preview_studio" ? studioCamera : defaultCamera
+ camera: !envMode || (envMode === "SkyBox" && envValue === "preview_studio") ? studioCamera
+ : defaultCamera
property Material previewMaterial
property string envMode
@@ -46,15 +47,16 @@ View3D {
antialiasingMode: SceneEnvironment.MSAA
antialiasingQuality: SceneEnvironment.High
backgroundMode: envMode === "Color" ? SceneEnvironment.Color
- : envMode === "SkyBox" ? SceneEnvironment.SkyBox
- : SceneEnvironment.Transparent
+ : envMode === "Basic" ? SceneEnvironment.Transparent
+ : SceneEnvironment.SkyBox
clearColor: envMode === "Color" ? envValue : "#000000"
- lightProbe: envMode === "SkyBox" ? skyBoxTex : null
+ lightProbe: !envMode || envMode === "SkyBox" ? skyBoxTex : null
Texture {
id: skyBoxTex
- source: envMode === "SkyBox" ? "../images/" + envValue + ".hdr"
- : ""
+ source: !envMode ? "../images/preview_studio.hdr"
+ : envMode === "SkyBox" ? "../images/" + envValue + ".hdr"
+ : ""
}
}
@@ -62,7 +64,7 @@ View3D {
DirectionalLight {
eulerRotation.x: -26
eulerRotation.y: modelSrc === "#Cube" ? -10 : -50
- brightness: envMode !== "SkyBox" ? 1 : 0
+ brightness: envMode && envMode !== "SkyBox" ? 1 : 0
}
PerspectiveCamera {
@@ -106,7 +108,7 @@ View3D {
scale.y: 8
scale.x: 8
eulerRotation.x: -60
- visible: !envMode || envMode === "Default"
+ visible: envMode === "Basic"
materials: floorMaterial
DefaultMaterial {
id: floorMaterial