Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-quickeffectmaker for
openSUSE:Factory checked in at 2024-10-17 18:39:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-quickeffectmaker (Old)
and /work/SRC/openSUSE:Factory/.qt6-quickeffectmaker.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quickeffectmaker"
Thu Oct 17 18:39:17 2024 rev:13 rq:1207625 version:6.8.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/qt6-quickeffectmaker/qt6-quickeffectmaker.changes
2024-10-03 17:37:59.274237129 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-quickeffectmaker.new.19354/qt6-quickeffectmaker.changes
2024-10-17 18:39:55.375736329 +0200
@@ -1,0 +2,6 @@
+Tue Oct 8 09:29:49 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.8.0:
+ * https://www.qt.io/blog/qt-6.8-released
+
+-------------------------------------------------------------------
Old:
----
qtquickeffectmaker-everywhere-src-6.7.3.tar.xz
New:
----
qtquickeffectmaker-everywhere-src-6.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-quickeffectmaker.spec ++++++
--- /var/tmp/diff_new_pack.MecA5U/_old 2024-10-17 18:39:56.071765519 +0200
+++ /var/tmp/diff_new_pack.MecA5U/_new 2024-10-17 18:39:56.071765519 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-quickeffectmaker
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.7.3
-%define short_version 6.7
+%define real_version 6.8.0
+%define short_version 6.8
%define tar_name qtquickeffectmaker-everywhere-src
%define tar_suffix %{nil}
#
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-quickeffectmaker%{?pkg_suffix}
-Version: 6.7.3
+Version: 6.8.0
Release: 0
Summary: Tool for creating shader effects for Qt Quick
License: GPL-3.0-only
@@ -47,7 +47,6 @@
BuildRequires: cmake(Qt6Quick) = %{real_version}
BuildRequires: cmake(Qt6Quick3DGlslParserPrivate) = %{real_version}
BuildRequires: cmake(Qt6ShaderTools) = %{real_version}
-
%if "%{qt6_flavor}" == "docs"
BuildRequires: qt6-tools
%{qt6_doc_packages}
++++++ qtquickeffectmaker-everywhere-src-6.7.3.tar.xz ->
qtquickeffectmaker-everywhere-src-6.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.3/.cmake.conf
new/qtquickeffectmaker-everywhere-src-6.8.0/.cmake.conf
--- old/qtquickeffectmaker-everywhere-src-6.7.3/.cmake.conf 2024-09-19
22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/.cmake.conf 2024-10-02
18:31:06.000000000 +0200
@@ -1,3 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.7.3")
+set(QT_REPO_MODULE_VERSION "6.8.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickeffectmaker-everywhere-src-6.7.3/.tag
new/qtquickeffectmaker-everywhere-src-6.8.0/.tag
--- old/qtquickeffectmaker-everywhere-src-6.7.3/.tag 2024-09-19
22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/.tag 2024-10-02
18:31:06.000000000 +0200
@@ -1 +1 @@
-830d21c264c631ddfb913e0f7852215533dfc94b
+5cc7ec29f700f4d5049ab2dbc7d513d713cf1ad8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/dependencies.yaml
new/qtquickeffectmaker-everywhere-src-6.8.0/dependencies.yaml
--- old/qtquickeffectmaker-everywhere-src-6.7.3/dependencies.yaml
2024-09-19 22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/dependencies.yaml
2024-10-02 18:31:06.000000000 +0200
@@ -1,13 +1,13 @@
dependencies:
../qtbase:
- ref: 92b685784960eea6eb353688cf0edeb94d69c6cd
+ ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969
required: true
../qtdeclarative:
- ref: 34ffe0c15a9564fefcf01a738eb0bde370399959
+ ref: 2884c601242f030307a5acdca984b3aa0d34e064
required: true
../qtquick3d:
- ref: b342cba39e702e35c2e670308dbfc9764ba6105e
+ ref: 517d2aebc7bc791e4b45288e8a7422481481ead7
required: false
../qtshadertools:
- ref: 0d1782b43e6262f8592bee5dbbe638d65c8e9dfd
+ ref: 79c340e5632f3487c9fa08b9efedca4762c651ec
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/basic/glow.qen
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/basic/glow.qen
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/basic/glow.qen
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/basic/glow.qen
2024-10-02 18:31:06.000000000 +0200
@@ -0,0 +1,109 @@
+{
+ "QEN": {
+ "description": "The Glow effect adds soft glowing effect for the
source content.",
+ "fragmentCode": [
+ "@requires BlurHelper",
+ "@main",
+ "{",
+ " vec4 glow = texture(iSource, texCoord) * blurWeight1[0];",
+ " glow += texture(iSourceBlur1, texCoord) * blurWeight1[1];",
+ "#if (BLUR_HELPER_MAX_LEVEL > 2)",
+ " glow += texture(iSourceBlur2, texCoord) * blurWeight1[2];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 8)",
+ " glow += texture(iSourceBlur3, texCoord) * blurWeight1[3];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 16)",
+ " glow += texture(iSourceBlur4, texCoord) * blurWeight2[0];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 32)",
+ " glow += texture(iSourceBlur5, texCoord) * blurWeight2[1];",
+ "#endif",
+ "",
+ " glow = min(glow * glowBloom, vec4(glowMaxBrightness));",
+ " glow = mix(glow, glow.a * glowColor, glowColor.a);",
+ " ",
+ " // Blend in the Glow",
+ " if (glowBlendMode == 0) {",
+ " // Additive",
+ " fragColor += glow;",
+ " } else if (glowBlendMode == 1) {",
+ " // Screen",
+ " fragColor = clamp(fragColor, vec4(0.0), vec4(1.0));",
+ " fragColor = max((fragColor + glow) - (fragColor * glow),
vec4(0.0));",
+ " } else if (glowBlendMode == 2) {",
+ " // Replace",
+ " fragColor = glow;",
+ " } else {",
+ " // Outer",
+ " fragColor = mix(glow, fragColor, fragColor.a);",
+ " }",
+ "}"
+ ],
+ "name": "Glow",
+ "properties": [
+ {
+ "defaultValue": "1",
+ "description": "Blending mode for the glow effect. 0 =
Additive, 1 = Screen, 2 = Replace, 3 = Outer.",
+ "maxValue": "3",
+ "minValue": "0",
+ "name": "glowBlendMode",
+ "type": "int"
+ },
+ {
+ "defaultValue": "1",
+ "description": "This value defines the softness of the glow.
Values are between 0..1.",
+ "maxValue": "1",
+ "minValue": "0",
+ "name": "glowBlurAmount",
+ "type": "float"
+ },
+ {
+ "defaultValue": "1",
+ "description": "This value defines the bloom strength of the
glow. Suitable values are between 0..2.",
+ "maxValue": "2",
+ "minValue": "0",
+ "name": "glowBloom",
+ "type": "float"
+ },
+ {
+ "defaultValue": "1",
+ "description": "Sets the maximum brightness of the glow.",
+ "maxValue": "1",
+ "minValue": "0",
+ "name": "glowMaxBrightness",
+ "type": "float"
+ },
+ {
+ "defaultValue": "1, 1, 1, 0.5",
+ "description": "Color of the glow. Alpha chanel defines how
much color is applied vs. using the colors of the source item. The default
value is white with 0.5 alpha.",
+ "name": "glowColor",
+ "type": "color"
+ }
+ ],
+ "version": 1,
+ "vertexCode": [
+ "out vec4 blurWeight1;",
+ "out vec2 blurWeight2;",
+ "",
+ "float blurWeight(float v) {",
+ " return max(0.0, min(1.0, 1.0 - v * 2.0));",
+ "}",
+ "",
+ "@main",
+ "{",
+ " float blurLod = sqrt(glowBlurAmount * (BLUR_HELPER_MAX_LEVEL
/ 64.0)) * 1.2 - 0.2;",
+ " float bw1 = blurWeight(abs(blurLod - 0.1));",
+ " float bw2 = blurWeight(abs(blurLod - 0.3));",
+ " float bw3 = blurWeight(abs(blurLod - 0.5));",
+ " float bw4 = blurWeight(abs(blurLod - 0.7));",
+ " float bw5 = blurWeight(abs(blurLod - 0.9));",
+ " float bw6 = blurWeight(abs(blurLod - 1.1));",
+ "",
+ " float bsum = bw1 + bw2 + bw3 + bw4 + bw5 + bw6;",
+ " blurWeight1 = vec4(bw1 / bsum, bw2 / bsum, bw3 / bsum, bw4 /
bsum);",
+ " blurWeight2 = vec2(bw5 / bsum, bw6 / bsum);",
+ "}"
+ ]
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/common/BlurHelper.qml
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/common/BlurHelper.qml
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/common/BlurHelper.qml
2024-09-19 22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/common/BlurHelper.qml
2024-10-02 18:31:06.000000000 +0200
@@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/bars.qen
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/bars.qen
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/bars.qen
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/bars.qen
2024-10-02 18:31:06.000000000 +0200
@@ -0,0 +1,58 @@
+{
+ "QEN": {
+ "description": "Animated bars effect.",
+ "fragmentCode": [
+ "@main",
+ "{",
+ " float px = 1.0 / iResolution.x;",
+ " float sbar = iResolution.x / barsBarWidth * 0.5;",
+ " float movement = -iTime * px * barsAnimationSpeed;",
+ " float p = ((fragCoord.x + fragCoord.y * barsBarAngle) * px +
movement) * sbar;",
+ " float bar = abs(2.0 * fract(p) - 1.0);",
+ " float barSmoothness = 2.0 / barsBarWidth;",
+ " bar = smoothstep(0.5 - barSmoothness, 0.5 + barSmoothness,
bar);",
+ " fragColor = mix(barsColor1, barsColor2, bar);",
+ "}"
+ ],
+ "name": "Bars",
+ "properties": [
+ {
+ "defaultValue": "0, 0, 0, 1",
+ "description": "First color of the bars.",
+ "name": "barsColor1",
+ "type": "color"
+ },
+ {
+ "defaultValue": "1, 1, 1, 1",
+ "description": "Second color of the bars.",
+ "name": "barsColor2",
+ "type": "color"
+ },
+ {
+ "defaultValue": "30",
+ "description": "Width of the bars in pixels.",
+ "maxValue": "100",
+ "minValue": "4",
+ "name": "barsBarWidth",
+ "type": "float"
+ },
+ {
+ "defaultValue": "50",
+ "description": "How fast the bars animate in pixels per
second.",
+ "maxValue": "200",
+ "minValue": "-200",
+ "name": "barsAnimationSpeed",
+ "type": "float"
+ },
+ {
+ "defaultValue": "0.5",
+ "description": "Rotation angle of the bars.",
+ "maxValue": "1",
+ "minValue": "-1",
+ "name": "barsBarAngle",
+ "type": "float"
+ }
+ ],
+ "version": 1
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/circlebend.qen
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/circlebend.qen
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/circlebend.qen
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/circlebend.qen
2024-10-02 18:31:06.000000000 +0200
@@ -0,0 +1,57 @@
+{
+ "QEN": {
+ "description": "Bends the source to circle / arc in the vertex
shader.",
+ "name": "CircleBend",
+ "properties": [
+ {
+ "defaultValue": "0",
+ "description": "Start angle for the circle bending in
radians.",
+ "maxValue": "6.283",
+ "minValue": "0",
+ "name": "circleBendStartAngle",
+ "type": "float"
+ },
+ {
+ "defaultValue": "6.283",
+ "description": "Spanning angle for the circle bending in
radians.",
+ "maxValue": "6.283",
+ "minValue": "0",
+ "name": "circleBendSpanAngle",
+ "type": "float"
+ },
+ {
+ "defaultValue": "0.2",
+ "description": "Width of the bending ring. Values are between
0.0 and 1.0 (full size of the source item).",
+ "maxValue": "1",
+ "minValue": "0",
+ "name": "circleBendRingWidth",
+ "type": "float"
+ },
+ {
+ "customValue": "Qt.point(width, height)",
+ "defaultValue": "0, 0",
+ "maxValue": "1, 1",
+ "minValue": "0, 0",
+ "name": "circleBendTexSize",
+ "type": "vec2",
+ "useCustomValue": true
+ }
+ ],
+ "version": 1,
+ "vertexCode": [
+ "@mesh 512, 1",
+ "@main",
+ "{",
+ " const float PI_H = 1.5707964;",
+ " vec2 vPos = vec2(0.5);",
+ " float s = 0.5 - 0.5 * circleBendRingWidth + texCoord.y * 0.5
* circleBendRingWidth;",
+ " float spanX = texCoord.x * circleBendSpanAngle;",
+ " vPos.x += s * sin(circleBendStartAngle + spanX);",
+ " vPos.y += s * sin(circleBendStartAngle + spanX + PI_H);",
+ " vPos *= circleBendTexSize;",
+ " vertCoord = vPos;",
+ "}",
+ ""
+ ]
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/maskedblur.qen
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/maskedblur.qen
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/maskedblur.qen
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/maskedblur.qen
2024-10-02 18:31:06.000000000 +0200
@@ -0,0 +1,97 @@
+{
+ "QEN": {
+ "description": "The MaskedBlur effect softens the source content by
blurring it with algorithm which uses the source content downscaling and
bilinear filtering. The intensity of the blur can be controlled for each pixel
so that some parts of the source are blurred more than others.",
+ "fragmentCode": [
+ "@requires BlurHelper",
+ "",
+ "float blurWeight(float v) {",
+ " return max(0.0, min(1.0, 1.0 - v * 2.0));",
+ "}",
+ "",
+ "@main",
+ "{",
+ "#if MASKED_BLUR_IMAGE_MASKING == 1",
+ " // Enable this to use image as a mask.",
+ " float blurAmount = maskedBlurAmount *
texture(maskedBlurMaskSource, texCoord).a;",
+ "#else",
+ " // Enable these to use position & radius as a mask.",
+ " float b = distance(texCoord, maskedBlurPos) /
maskedBlurRadius;",
+ " b = min(1.0, max(0.0, b));",
+ " float blurAmount = maskedBlurAmount * b;",
+ "#endif",
+ " // Enable this to invert the blur",
+ " //blurAmount = 1.0 - blurAmount;",
+ "",
+ " float blurLod = sqrt(blurAmount * (BLUR_HELPER_MAX_LEVEL /
64.0)) * 1.2 - 0.2;",
+ " float bw1 = blurWeight(abs(blurLod - 0.1));",
+ " float bw2 = blurWeight(abs(blurLod - 0.3));",
+ " float bw3 = blurWeight(abs(blurLod - 0.5));",
+ " float bw4 = blurWeight(abs(blurLod - 0.7));",
+ " float bw5 = blurWeight(abs(blurLod - 0.9));",
+ " float bw6 = blurWeight(abs(blurLod - 1.1));",
+ "",
+ " float bsum = bw1 + bw2 + bw3 + bw4 + bw5 + bw6;",
+ " vec4 blurWeight1 = vec4(bw1 / bsum, bw2 / bsum, bw3 / bsum,
bw4 / bsum);",
+ " vec2 blurWeight2 = vec2(bw5 / bsum, bw6 / bsum);",
+ " ",
+ " vec4 blurredColor = texture(iSource, texCoord) *
blurWeight1[0];",
+ " blurredColor += texture(iSourceBlur1, texCoord) *
blurWeight1[1];",
+ "#if (BLUR_HELPER_MAX_LEVEL > 2)",
+ " blurredColor += texture(iSourceBlur2, texCoord) *
blurWeight1[2];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 8)",
+ " blurredColor += texture(iSourceBlur3, texCoord) *
blurWeight1[3];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 16)",
+ " blurredColor += texture(iSourceBlur4, texCoord) *
blurWeight2[0];",
+ "#endif",
+ "#if (BLUR_HELPER_MAX_LEVEL > 32)",
+ " blurredColor += texture(iSourceBlur5, texCoord) *
blurWeight2[1];",
+ "#endif",
+ "",
+ " fragColor = blurredColor;",
+ "}",
+ ""
+ ],
+ "name": "MaskedBlur",
+ "properties": [
+ {
+ "defaultValue": "0",
+ "description": "Set this to 1 to use image as blur intensity
instead of position and radius values.",
+ "name": "MASKED_BLUR_IMAGE_MASKING",
+ "type": "define"
+ },
+ {
+ "defaultValue": "0",
+ "description": "This value defines the softness of the shadow.
A larger value causes the edges of the shadow to appear more blurry.",
+ "maxValue": "1",
+ "minValue": "0",
+ "name": "maskedBlurAmount",
+ "type": "float"
+ },
+ {
+ "defaultValue": "",
+ "description": "This property defines the item that is
controlling the intensity of the blur. The pixel alpha channel value defines
the actual blur radius that is going to be used for blurring the corresponding
source pixel. Note: This is only functional when the MASKED_BLUR_IMAGE_MASKING
is enabled.",
+ "name": "maskedBlurMaskSource",
+ "type": "image"
+ },
+ {
+ "defaultValue": "0.5, 0.5",
+ "description": "Center position of the masked blur.",
+ "maxValue": "1, 1",
+ "minValue": "0, 0",
+ "name": "maskedBlurPos",
+ "type": "vec2"
+ },
+ {
+ "defaultValue": "0.5",
+ "description": "Radius of the masked blur.",
+ "maxValue": "2",
+ "minValue": "0",
+ "name": "maskedBlurRadius",
+ "type": "float"
+ }
+ ],
+ "version": 1
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/spriteanimation.qen
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/spriteanimation.qen
--- old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/extra/spriteanimation.qen
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/extra/spriteanimation.qen
2024-10-02 18:31:06.000000000 +0200
@@ -0,0 +1,108 @@
+{
+ "QEN": {
+ "description": "SpriteAnimation node for animating sprite sequences.",
+ "fragmentCode": [
+ "@main",
+ "{",
+ " vec4 sprite = vec4(0.0);",
+ "#if (SPRITE_ANIMATION_INTERPOLATE == 1)",
+ " vec2 spriteUV;",
+ " spriteUV.x = spriteArea.x + texCoord.x * spriteArea.z;",
+ " spriteUV.y = spriteArea.y + texCoord.y * spriteArea.w;",
+ " vec4 sprite1 = texture(spriteAnimationImage, spriteUV);",
+ "",
+ " vec2 spriteUV2;",
+ " spriteUV2.x = spriteArea2.x + texCoord.x * spriteArea2.z;",
+ " spriteUV2.y = spriteArea2.y + texCoord.y * spriteArea2.w;",
+ " vec4 sprite2 = texture(spriteAnimationImage, spriteUV2);",
+ "",
+ " float anim = clamp(mod(iTime * (1.0 /
spriteAnimationFrameDuration), 1.0), 0.0, 1.0);",
+ " sprite = mix(sprite1, sprite2, anim);",
+ "#else",
+ " vec2 spriteUV;",
+ " spriteUV.x = spriteArea.x + texCoord.x * spriteArea.z;",
+ " spriteUV.y = spriteArea.y + texCoord.y * spriteArea.w;",
+ " sprite = texture(spriteAnimationImage, spriteUV);",
+ "#endif",
+ " fragColor = mix(fragColor, sprite, sprite.a);",
+ "}"
+ ],
+ "name": "SpriteAnimation",
+ "properties": [
+ {
+ "defaultValue": "0",
+ "description": "If 1, interpolation will occur between sprite
frames to make the animation appear smoother. Interpolation requires 2 texture
lookups.",
+ "name": "SPRITE_ANIMATION_INTERPOLATE",
+ "type": "define"
+ },
+ {
+ "defaultValue": "../images/qt-logo-sheet.png",
+ "description": "Sprite sheet Image.",
+ "name": "spriteAnimationImage",
+ "type": "image"
+ },
+ {
+ "defaultValue": "4",
+ "description": "The amount of rows in the sprite image.",
+ "maxValue": "8",
+ "minValue": "1",
+ "name": "spriteAnimationRows",
+ "type": "int"
+ },
+ {
+ "defaultValue": "4",
+ "description": "The amount of columns in the sprite image.",
+ "maxValue": "16",
+ "minValue": "1",
+ "name": "spriteAnimationColumns",
+ "type": "int"
+ },
+ {
+ "defaultValue": "16",
+ "description": "Total amount of frames in the image sequence.
This is often rows * columns, but can be also smaller if grid is not full of
images or only want to animate part of the sprite images.",
+ "maxValue": "64",
+ "minValue": "1",
+ "name": "spriteAnimationFrameCount",
+ "type": "int"
+ },
+ {
+ "defaultValue": "0.1",
+ "description": "How long a single frame is shown in seconds.",
+ "maxValue": "1",
+ "minValue": "0.01",
+ "name": "spriteAnimationFrameDuration",
+ "type": "float"
+ }
+ ],
+ "version": 1,
+ "vertexCode": [
+ "out vec4 spriteArea;",
+ "#if (SPRITE_ANIMATION_INTERPOLATE == 1)",
+ "out vec4 spriteArea2;",
+ "#endif",
+ "@main",
+ "{",
+ " float columnSize = 1.0 / spriteAnimationColumns;",
+ " float rowSize = 1.0 / spriteAnimationRows; ",
+ " float frameIndexF = mod(iTime / spriteAnimationFrameDuration,
spriteAnimationFrameCount);",
+ " ",
+ " float frameIndex = floor(frameIndexF);",
+ " float frameColumn = mod(frameIndex, spriteAnimationColumns);",
+ " float frameRow = floor(float(frameIndex) /
spriteAnimationColumns);",
+ " spriteArea = vec4(frameColumn * columnSize,",
+ " frameRow * rowSize,",
+ " columnSize,",
+ " rowSize);",
+ "#if (SPRITE_ANIMATION_INTERPOLATE == 1)",
+ " float frameIndex2 = mod(ceil(frameIndexF),
spriteAnimationFrameCount);",
+ " float frameColumn2 = mod(frameIndex2,
spriteAnimationColumns);",
+ " float frameRow2 = floor(float(frameIndex2) /
spriteAnimationColumns);",
+ " spriteArea2 = vec4(frameColumn2 * columnSize,",
+ " frameRow2 * rowSize,",
+ " columnSize,",
+ " rowSize);",
+ "#endif",
+ "}"
+ ]
+ }
+}
Binary files
old/qtquickeffectmaker-everywhere-src-6.7.3/nodes/images/qt-logo-sheet.png and
new/qtquickeffectmaker-everywhere-src-6.8.0/nodes/images/qt-logo-sheet.png
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/applicationsettings.cpp
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/applicationsettings.cpp
---
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/applicationsettings.cpp
2024-09-19 22:20:11.000000000 +0200
+++
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/applicationsettings.cpp
2024-10-02 18:31:06.000000000 +0200
@@ -305,7 +305,7 @@
int projectListIndex = -1;
QList<MenusModel::MenusData> recentProjectsList;
// Recent projects menu will contain max this amount of item
- const int max_items = 6;
+ const int max_items = 10;
if (!projectFile.isEmpty() && !m_recentProjectsModel->m_modelList.isEmpty()
&& m_recentProjectsModel->m_modelList.first().file == projectFile)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/fpshelper.cpp
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/fpshelper.cpp
--- old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/fpshelper.cpp
2024-09-19 22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/fpshelper.cpp
2024-10-02 18:31:06.000000000 +0200
@@ -7,7 +7,7 @@
{
setFlag(QQuickItem::ItemHasContents);
- connect(this, &QQuickItem::enabledChanged, [this]() {
+ connect(this, &QQuickItem::enabledChanged, this, [this]() {
if (isEnabled()) {
m_frames = 0;
m_timer.start();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/main.cpp
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/main.cpp
--- old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/main.cpp
2024-09-19 22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/main.cpp
2024-10-02 18:31:06.000000000 +0200
@@ -21,7 +21,7 @@
// QQEM version number which is shown in About dialog and saved into files.
// Note: Use string which can be converted to decimal number.
// So e.g. "0.41" and no "0.41.2", "0.41beta" etc.
-#define APP_VERSION_STR "0.43"
+#define APP_VERSION_STR "0.44"
int main(int argc, char *argv[])
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/nodeview.cpp
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/nodeview.cpp
--- old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/nodeview.cpp
2024-09-19 22:20:11.000000000 +0200
+++ new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/nodeview.cpp
2024-10-02 18:31:06.000000000 +0200
@@ -30,9 +30,8 @@
m_activeArrow.startNodeId = -1;
m_activeArrow.endNodeId = -1;
- connect(m_nodesModel, &QAbstractItemModel::modelReset, [this]() {
- updateCodeSelectorModel();
- });
+ connect(m_nodesModel, &QAbstractItemModel::modelReset,
+ this, &NodeView::updateCodeSelectorModel);
}
void NodeView::mouseMoveEvent(QMouseEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/about_effect/AboutEffect1.qep
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/qml/about_effect/AboutEffect1.qep
---
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/about_effect/AboutEffect1.qep
2024-09-19 22:20:11.000000000 +0200
+++
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/qml/about_effect/AboutEffect1.qep
2024-10-02 18:31:06.000000000 +0200
@@ -151,7 +151,7 @@
"settings": {
"headings": [
"// Copyright (C) 2022 The Qt Company Ltd.",
- "// SPDX-License-Identifier: BSD-3-Clause",
+ "// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR
BSD-3-Clause",
""
]
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/about_effect/AboutEffect1.qml
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/qml/about_effect/AboutEffect1.qml
---
old/qtquickeffectmaker-everywhere-src-6.7.3/tools/qqem/qml/about_effect/AboutEffect1.qml
2024-09-19 22:20:11.000000000 +0200
+++
new/qtquickeffectmaker-everywhere-src-6.8.0/tools/qqem/qml/about_effect/AboutEffect1.qml
2024-10-02 18:31:06.000000000 +0200
@@ -1,5 +1,5 @@
// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
// Created with Qt Quick Effect Maker (version 0.43), Mon Mar 27 11:23:23 2023
