diff options
author | Jiu Shanheng <shanheng.jiu@qt.io> | 2024-09-10 19:15:25 +0900 |
---|---|---|
committer | Jiu Shanheng <shanheng.jiu@qt.io> | 2024-09-11 18:40:18 +0900 |
commit | 5c8f09d2c3c99f621b467ed5c1be4fac3a708e85 (patch) | |
tree | 9312e269961b14945a00db47ed236ca53ffbb149 /GUIModel/MeterEffect | |
parent | 17b016d08cf1680f58cbb9102f35949c8436207c (diff) |
Port the cluster-refgui demo supports both Qt5 and Qt6HEADtrout_19.90.0trout/19.90.019.90.0master
This demo can now run on both Qt5 and Qt6, also added a macro to switch with or without the backend so that it can be developed easily on the Windows desktop.
Bug-AGL: SPEC-5243
Change-Id: I99b12ad9779a477784df13b83a850387747bb588
Signed-off-by: Jiu Shanheng <shanheng.jiu@qt.io>
Diffstat (limited to 'GUIModel/MeterEffect')
-rw-r--r-- | GUIModel/MeterEffect/Effect.qrc | 8 | ||||
-rw-r--r-- | GUIModel/MeterEffect/GaussianBlur.qml | 4 | ||||
-rw-r--r-- | GUIModel/MeterEffect/OpacityMask.qml | 3 | ||||
-rw-r--r-- | GUIModel/MeterEffect/Qt5/Effect.qrc | 8 | ||||
-rw-r--r-- | GUIModel/MeterEffect/Qt5/GaussianBlur.qml | 3 | ||||
-rw-r--r-- | GUIModel/MeterEffect/Qt5/OpacityMask.qml | 3 | ||||
-rw-r--r-- | GUIModel/MeterEffect/Qt5/ShaderPath.qml | 7 | ||||
-rw-r--r-- | GUIModel/MeterEffect/Qt5/qmldir | 3 | ||||
-rw-r--r-- | GUIModel/MeterEffect/ShaderPath.qml | 7 | ||||
-rw-r--r-- | GUIModel/MeterEffect/qmldir | 3 |
10 files changed, 49 insertions, 0 deletions
diff --git a/GUIModel/MeterEffect/Effect.qrc b/GUIModel/MeterEffect/Effect.qrc new file mode 100644 index 0000000..776f80d --- /dev/null +++ b/GUIModel/MeterEffect/Effect.qrc @@ -0,0 +1,8 @@ +<RCC> + <qresource prefix="/MeterEffect"> + <file>qmldir</file> + <file>GaussianBlur.qml</file> + <file>OpacityMask.qml</file> + <file>ShaderPath.qml</file> + </qresource> +</RCC> diff --git a/GUIModel/MeterEffect/GaussianBlur.qml b/GUIModel/MeterEffect/GaussianBlur.qml new file mode 100644 index 0000000..f729329 --- /dev/null +++ b/GUIModel/MeterEffect/GaussianBlur.qml @@ -0,0 +1,4 @@ +//import QtGraphicalEffects 1.0 as E +import Qt5Compat.GraphicalEffects as E + +E.GaussianBlur {} diff --git a/GUIModel/MeterEffect/OpacityMask.qml b/GUIModel/MeterEffect/OpacityMask.qml new file mode 100644 index 0000000..18a8ec4 --- /dev/null +++ b/GUIModel/MeterEffect/OpacityMask.qml @@ -0,0 +1,3 @@ +import Qt5Compat.GraphicalEffects as E + +E.OpacityMask {} diff --git a/GUIModel/MeterEffect/Qt5/Effect.qrc b/GUIModel/MeterEffect/Qt5/Effect.qrc new file mode 100644 index 0000000..776f80d --- /dev/null +++ b/GUIModel/MeterEffect/Qt5/Effect.qrc @@ -0,0 +1,8 @@ +<RCC> + <qresource prefix="/MeterEffect"> + <file>qmldir</file> + <file>GaussianBlur.qml</file> + <file>OpacityMask.qml</file> + <file>ShaderPath.qml</file> + </qresource> +</RCC> diff --git a/GUIModel/MeterEffect/Qt5/GaussianBlur.qml b/GUIModel/MeterEffect/Qt5/GaussianBlur.qml new file mode 100644 index 0000000..3a4b1ba --- /dev/null +++ b/GUIModel/MeterEffect/Qt5/GaussianBlur.qml @@ -0,0 +1,3 @@ +import QtGraphicalEffects 1.0 as E + +E.GaussianBlur {} diff --git a/GUIModel/MeterEffect/Qt5/OpacityMask.qml b/GUIModel/MeterEffect/Qt5/OpacityMask.qml new file mode 100644 index 0000000..73df0a3 --- /dev/null +++ b/GUIModel/MeterEffect/Qt5/OpacityMask.qml @@ -0,0 +1,3 @@ +import QtGraphicalEffects 1.0 as E + +E.OpacityMask {} diff --git a/GUIModel/MeterEffect/Qt5/ShaderPath.qml b/GUIModel/MeterEffect/Qt5/ShaderPath.qml new file mode 100644 index 0000000..bdafa05 --- /dev/null +++ b/GUIModel/MeterEffect/Qt5/ShaderPath.qml @@ -0,0 +1,7 @@ +pragma Singleton +import QtQuick 2.15 + +QtObject { + readonly property string guageMaskVert: "qrc:/Shaders/vert/guageMask.vert" + readonly property string guageMaskFrag: "qrc:/Shaders/frag/guageMask.frag" +} diff --git a/GUIModel/MeterEffect/Qt5/qmldir b/GUIModel/MeterEffect/Qt5/qmldir new file mode 100644 index 0000000..f0a0d1e --- /dev/null +++ b/GUIModel/MeterEffect/Qt5/qmldir @@ -0,0 +1,3 @@ +singleton ShaderPath 1.0 ShaderPath.qml +GaussianBlur 1.0 GaussianBlur.qml +OpacityMask 1.0 OpacityMask.qml diff --git a/GUIModel/MeterEffect/ShaderPath.qml b/GUIModel/MeterEffect/ShaderPath.qml new file mode 100644 index 0000000..ebf1f9d --- /dev/null +++ b/GUIModel/MeterEffect/ShaderPath.qml @@ -0,0 +1,7 @@ +pragma Singleton +import QtQuick 2.15 + +QtObject { + readonly property string guageMaskVert: "qrc:/Assets/Common/Shaders/Qt6/guageMask.vert.qsb" + readonly property string guageMaskFrag: "qrc:/Assets/Common/Shaders/Qt6/guageMask.frag.qsb" +} diff --git a/GUIModel/MeterEffect/qmldir b/GUIModel/MeterEffect/qmldir new file mode 100644 index 0000000..f0a0d1e --- /dev/null +++ b/GUIModel/MeterEffect/qmldir @@ -0,0 +1,3 @@ +singleton ShaderPath 1.0 ShaderPath.qml +GaussianBlur 1.0 GaussianBlur.qml +OpacityMask 1.0 OpacityMask.qml |