From de6095224a1cd7a6886d5044902a976fe2ca1623 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 1 May 2020 22:48:20 +0200 Subject: [PATCH] Add opacity support to EdgesWork --- .../org/openrndr/extra/fx/gl3/edges/edges-work-1.frag | 3 ++- .../org/openrndr/extra/fx/gl3/edges/edges-work-2.frag | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-1.frag b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-1.frag index 696163ad..fc4429d5 100644 --- a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-1.frag +++ b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-1.frag @@ -12,6 +12,7 @@ float random(vec3 scale, float seed) { // Implementation by Evan Wallace (glfx.js) void main() { + vec4 center = texture(tex0, v_texCoord0); vec2 color = vec2(0.0); vec2 total = vec2(0.0); @@ -33,5 +34,5 @@ void main() { } } - o_color = vec4(color / total, 0.0, 1.0); + o_color = vec4(color / total, 0.0, 1.0) * center.a; } \ No newline at end of file diff --git a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-2.frag b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-2.frag index 7a47d252..d0b56c02 100644 --- a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-2.frag +++ b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/edges/edges-work-2.frag @@ -13,6 +13,7 @@ float random(vec3 scale, float seed) { // Implementation by Evan Wallace (glfx.js) void main() { + vec4 center = texture(tex0, v_texCoord0); vec2 color = vec2(0.0); vec2 total = vec2(0.0); @@ -34,5 +35,5 @@ void main() { } float c = clamp(10000.0 * (color.y / total.y - color.x / total.x) + 0.5, 0.0, 1.0); - o_color = vec4(c, c, c, 1.0); + o_color = vec4(c, c, c, 1.0) * center.a; } \ No newline at end of file