From 17982e661c50a0472e93e7e7d19389162dcd250e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 13 May 2022 13:15:25 +0300 Subject: [PATCH] QmlDesigner: Disable shadows for gizmos Some gizmos (selection box and helper grid) are drawn to main 3D editor scene. Disabled receiving and casting shadows for those gizmos so they do not interfere with scene lighting. Change-Id: Ia589d3896c2591061966f6a4d532a0dedbf6fe12 Reviewed-by: Mahmoud Badri --- .../qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml | 8 ++++++++ .../qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml | 3 +++ .../qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml | 8 ++++++++ .../qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml | 3 +++ 4 files changed, 22 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml index dbd7f38523c..e450a5a796c 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/HelperGrid.qml @@ -39,6 +39,8 @@ Node { // Note: Only one instance of HelperGrid is supported, as the geometry names are fixed Model { // Main grid lines + castsShadows: false + receivesShadows: false geometry: GridGeometry { id: gridGeometry name: "3D Edit View Helper Grid" @@ -55,6 +57,8 @@ Node { } Model { // Subdivision lines + castsShadows: false + receivesShadows: false geometry: GridGeometry { lines: gridGeometry.lines step: gridGeometry.step @@ -73,6 +77,8 @@ Node { } Model { // Z Axis + castsShadows: false + receivesShadows: false geometry: GridGeometry { lines: gridGeometry.lines step: gridGeometry.step @@ -89,6 +95,8 @@ Node { ] } Model { // X Axis + castsShadows: false + receivesShadows: false eulerRotation.z: 90 geometry: GridGeometry { lines: gridGeometry.lines diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml index 201d1a63775..5ab4a599c44 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt5/SelectionBox.qml @@ -54,6 +54,9 @@ Node { visible: selectionBox.targetNode && !selectionBoxGeometry.isEmpty + castsShadows: false + receivesShadows: false + materials: [ DefaultMaterial { diffuseColor: "#fff600" diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml index 10c7afd65b8..66f383518eb 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/HelperGrid.qml @@ -40,6 +40,8 @@ Node { Model { // Main grid lines readonly property bool _edit3dLocked: true // Make this non-pickable + castsShadows: false + receivesShadows: false geometry: GridGeometry { id: gridGeometry name: "3D Edit View Helper Grid" @@ -57,6 +59,8 @@ Node { Model { // Subdivision lines readonly property bool _edit3dLocked: true // Make this non-pickable + castsShadows: false + receivesShadows: false geometry: GridGeometry { lines: gridGeometry.lines step: gridGeometry.step @@ -76,6 +80,8 @@ Node { Model { // Z Axis readonly property bool _edit3dLocked: true // Make this non-pickable + castsShadows: false + receivesShadows: false geometry: GridGeometry { lines: gridGeometry.lines step: gridGeometry.step @@ -93,6 +99,8 @@ Node { } Model { // X Axis readonly property bool _edit3dLocked: true // Make this non-pickable + castsShadows: false + receivesShadows: false eulerRotation.z: 90 geometry: GridGeometry { lines: gridGeometry.lines diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml index dd3300fd941..76fc14e3213 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/qt6/SelectionBox.qml @@ -55,6 +55,9 @@ Node { visible: selectionBox.targetNode && !selectionBoxGeometry.isEmpty + castsShadows: false + receivesShadows: false + materials: [ DefaultMaterial { diffuseColor: "#fff600"