diff --git a/src/filters/blur/BlurFilter.js b/src/filters/blur/BlurFilter.js index 46946f0..164f6bd 100644 --- a/src/filters/blur/BlurFilter.js +++ b/src/filters/blur/BlurFilter.js @@ -30,6 +30,7 @@ BlurFilter.prototype.apply = function (filterManager, input, output) { + var renderTarget = filterManager.getRenderTarget(true); this.blurXFilter.apply(filterManager, input, renderTarget, true); @@ -53,7 +54,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = this.blurYFilter.blur = value; } }, @@ -72,6 +73,7 @@ }, set: function (value) { + this.blurXFilter.passes = this.blurYFilter.passes = value; } }, @@ -90,6 +92,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = value; } }, @@ -108,6 +111,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurYFilter.blur = value; } } diff --git a/src/filters/blur/BlurFilter.js b/src/filters/blur/BlurFilter.js index 46946f0..164f6bd 100644 --- a/src/filters/blur/BlurFilter.js +++ b/src/filters/blur/BlurFilter.js @@ -30,6 +30,7 @@ BlurFilter.prototype.apply = function (filterManager, input, output) { + var renderTarget = filterManager.getRenderTarget(true); this.blurXFilter.apply(filterManager, input, renderTarget, true); @@ -53,7 +54,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = this.blurYFilter.blur = value; } }, @@ -72,6 +73,7 @@ }, set: function (value) { + this.blurXFilter.passes = this.blurYFilter.passes = value; } }, @@ -90,6 +92,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = value; } }, @@ -108,6 +111,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurYFilter.blur = value; } } diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 56cbd3b..cecb1d7 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -40,9 +40,9 @@ module.exports = BlurXFilter; BlurXFilter.prototype.apply = function (filterManager, input, output, clear) -{ +{ if(this.firstRun) - { + { var gl = filterManager.renderer.gl; var kernelSize = getMaxBlurKernelSize(gl); @@ -52,7 +52,7 @@ this.firstRun = false; } - + this.uniforms.strength = (1/output.destinationFrame.width) * (output.size.width/input.size.width); /// // * 2 //4//this.strength / 4 / this.passes * (input.frame.width / input.size.width); @@ -99,7 +99,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.abs(value) * 2; this.strength = value; } } diff --git a/src/filters/blur/BlurFilter.js b/src/filters/blur/BlurFilter.js index 46946f0..164f6bd 100644 --- a/src/filters/blur/BlurFilter.js +++ b/src/filters/blur/BlurFilter.js @@ -30,6 +30,7 @@ BlurFilter.prototype.apply = function (filterManager, input, output) { + var renderTarget = filterManager.getRenderTarget(true); this.blurXFilter.apply(filterManager, input, renderTarget, true); @@ -53,7 +54,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = this.blurYFilter.blur = value; } }, @@ -72,6 +73,7 @@ }, set: function (value) { + this.blurXFilter.passes = this.blurYFilter.passes = value; } }, @@ -90,6 +92,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurXFilter.blur = value; } }, @@ -108,6 +111,7 @@ }, set: function (value) { + this.padding = Math.max( Math.abs(this.blurYFilter.strength), Math.abs(this.blurYFilter.strength)) * 2; this.blurYFilter.blur = value; } } diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 56cbd3b..cecb1d7 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -40,9 +40,9 @@ module.exports = BlurXFilter; BlurXFilter.prototype.apply = function (filterManager, input, output, clear) -{ +{ if(this.firstRun) - { + { var gl = filterManager.renderer.gl; var kernelSize = getMaxBlurKernelSize(gl); @@ -52,7 +52,7 @@ this.firstRun = false; } - + this.uniforms.strength = (1/output.destinationFrame.width) * (output.size.width/input.size.width); /// // * 2 //4//this.strength / 4 / this.passes * (input.frame.width / input.size.width); @@ -99,7 +99,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.abs(value) * 2; this.strength = value; } } diff --git a/src/filters/blur/BlurYFilter.js b/src/filters/blur/BlurYFilter.js index 56fc380..e2253f6 100644 --- a/src/filters/blur/BlurYFilter.js +++ b/src/filters/blur/BlurYFilter.js @@ -34,10 +34,10 @@ BlurYFilter.prototype.apply = function (filterManager, input, output, clear) { if(this.firstRun) - { + { var gl = filterManager.renderer.gl; var kernelSize = getMaxBlurKernelSize(gl); - + this.vertexSrc = generateBlurVertSource(kernelSize, false); this.fragmentSrc = generateBlurFragSource(kernelSize); @@ -89,7 +89,7 @@ }, set: function (value) { - this.padding = Math.abs(value) * 0.5; + this.padding = Math.abs(value) * 2; this.strength = value; } }