Skip to content

Commit 7e8517c

Browse files
vanruescvanruesc
committed
Update blend functions
1 parent 582f897 commit 7e8517c

31 files changed

Lines changed: 121 additions & 105 deletions

‎src/effects/blending/glsl/add.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4(x.rgb + y.rgb, y.a), y.a * opacity);
3+
vec3 c = dst.rgb + src.rgb;
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/average.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4((x.rgb + y.rgb) * 0.5, y.a), y.a * opacity);
3+
vec3 c = (dst.rgb + src.rgb) * 0.5;
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/color-burn.frag‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
vec3 a = x.rgb, b = y.rgb;
4-
vec3 z = mix(step(0.0, b) * (1.0 - min(vec3(1.0), (1.0 - a) / b)), vec3(1.0), step(1.0, a));
5-
return mix(x, vec4(z, y.a), y.a * opacity);
3+
vec3 a = dst.rgb, b = src.rgb;
4+
vec3 c = mix(step(0.0, b) * (1.0 - min(vec3(1.0), (1.0 - a) / max(b, 1e-9))), vec3(1.0), step(1.0, a));
5+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
66

77
}

‎src/effects/blending/glsl/color-dodge.frag‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
vec3 a = x.rgb, b = y.rgb;
4-
vec3 z = step(0.0, a) * mix(min(vec3(1.0), a / max(1.0 - b, 1e-9)), vec3(1.0), step(1.0, b));
5-
return mix(x, vec4(z, y.a), y.a * opacity);
3+
vec3 a = dst.rgb, b = src.rgb;
4+
vec3 c = step(0.0, a) * mix(min(vec3(1.0), a / max(1.0 - b, 1e-9)), vec3(1.0), step(1.0, b));
5+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
66

77
}

‎src/effects/blending/glsl/color.frag‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
vec3 xHSL = RGBToHSL(x.rgb);
4-
vec3 yHSL = RGBToHSL(y.rgb);
5-
vec3 z = HSLToRGB(vec3(yHSL.xy, xHSL.z));
6-
return mix(x, vec4(z, y.a), y.a * opacity);
3+
vec3 a = RGBToHSL(dst.rgb);
4+
vec3 b = RGBToHSL(src.rgb);
5+
vec3 c = HSLToRGB(vec3(b.xy, a.z));
6+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
77

88
}

‎src/effects/blending/glsl/darken.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4(min(x.rgb, y.rgb), y.a), y.a * opacity);
3+
vec3 c = min(dst.rgb, src.rgb);
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/difference.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4(abs(x.rgb - y.rgb), y.a), y.a * opacity);
3+
vec3 c = abs(dst.rgb - src.rgb);
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/divide.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4(x.rgb / max(y.rgb, 1e-12), y.a), y.a * opacity);
3+
vec3 c = dst.rgb / max(src.rgb, 1e-9);
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/exclusion.frag‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
return mix(x, vec4((x.rgb + y.rgb - 2.0 * x.rgb * y.rgb), y.a), y.a * opacity);
3+
vec3 c = dst.rgb + src.rgb - 2.0 * dst.rgb * src.rgb;
4+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
45

56
}

‎src/effects/blending/glsl/hard-light.frag‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
vec4 blend(const in vec4 x, const in vec4 y, const in float opacity) {
1+
vec4 blend(const in vec4 dst, const in vec4 src, const in float opacity) {
22

3-
vec3 a = min(x.rgb, 1.0);
4-
vec3 b = min(y.rgb, 1.0);
5-
vec3 z = mix(2.0 * a * b, 1.0 - 2.0 * (1.0 - a) * (1.0 - b), step(0.5, b));
6-
return mix(x, vec4(z, y.a), y.a * opacity);
3+
vec3 a = min(dst.rgb, 1.0);
4+
vec3 b = min(src.rgb, 1.0);
5+
vec3 c = mix(2.0 * a * b, 1.0 - 2.0 * (1.0 - a) * (1.0 - b), step(0.5, b));
6+
return mix(dst, vec4(c, max(dst.a, src.a)), opacity);
77

88
}

0 commit comments

Comments
 (0)