From 1adca7f2cc1255beca70c89c1a2053e0014a2358 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 28 Mar 2019 13:07:48 +1100 Subject: [PATCH] restored radius setting to gaussian blur, fixes #702 --- effects/shaders/gaussianblur.frag | 6 +++--- effects/shaders/gaussianblur.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/effects/shaders/gaussianblur.frag b/effects/shaders/gaussianblur.frag index 80aaedb18..da83e1389 100644 --- a/effects/shaders/gaussianblur.frag +++ b/effects/shaders/gaussianblur.frag @@ -4,7 +4,7 @@ uniform sampler2D image; -// uniform float radius; +uniform float radius; uniform float sigma; uniform vec2 resolution; uniform bool horiz_blur; @@ -22,13 +22,13 @@ float gaussian2(float x, float y, float sigma) { } void main(void) { - float rad = ceil(sigma); + float rad = ceil(radius); float sum = 0.0; vec4 color = vec4(0.0); - bool radius_is_zero = (rad == 0.0); + bool radius_is_zero = (rad == 0.0 || sigma == 0.0); if (!radius_is_zero) { for (float x=-rad+0.5;x<=rad;x+=2.0) { diff --git a/effects/shaders/gaussianblur.xml b/effects/shaders/gaussianblur.xml index d0d669f6d..def19b73e 100644 --- a/effects/shaders/gaussianblur.xml +++ b/effects/shaders/gaussianblur.xml @@ -1,8 +1,8 @@ - +