diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 708bdda..6493159 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -30,7 +30,7 @@ */ this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurXFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -41,7 +41,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.width / input.size.width); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.width / input.size.width); if(this.passes === 1) { diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 708bdda..6493159 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -30,7 +30,7 @@ */ this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurXFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -41,7 +41,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.width / input.size.width); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.width / input.size.width); if(this.passes === 1) { diff --git a/src/filters/blur/BlurYFilter.js b/src/filters/blur/BlurYFilter.js index 232d227..1b76088 100644 --- a/src/filters/blur/BlurYFilter.js +++ b/src/filters/blur/BlurYFilter.js @@ -22,7 +22,7 @@ ); this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurYFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -33,7 +33,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.height / input.size.height); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.height / input.size.height); if(this.passes === 1) { diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 708bdda..6493159 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -30,7 +30,7 @@ */ this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurXFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -41,7 +41,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.width / input.size.width); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.width / input.size.width); if(this.passes === 1) { diff --git a/src/filters/blur/BlurYFilter.js b/src/filters/blur/BlurYFilter.js index 232d227..1b76088 100644 --- a/src/filters/blur/BlurYFilter.js +++ b/src/filters/blur/BlurYFilter.js @@ -22,7 +22,7 @@ ); this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurYFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -33,7 +33,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.height / input.size.height); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.height / input.size.height); if(this.passes === 1) { diff --git a/src/filters/blur/blur.frag b/src/filters/blur/blur.frag index 621bca4..ae39984 100644 --- a/src/filters/blur/blur.frag +++ b/src/filters/blur/blur.frag @@ -1,7 +1,7 @@ precision lowp float; varying vec2 vTextureCoord; -varying vec2 vBlurTexCoords[14]; +varying vec2 vBlurTexCoords[6]; varying vec4 vColor; uniform sampler2D uSampler; @@ -10,19 +10,11 @@ { gl_FragColor = vec4(0.0); - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.0044299121055113265; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 6])*0.147308056121; - gl_FragColor += texture2D(uSampler, vTextureCoord )*0.159576912161; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 7])*0.147308056121; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 8])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 9])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[10])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[11])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[12])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[13])*0.0044299121055113265; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.004431848411938341; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vTextureCoord )*0.3989422804014327; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.004431848411938341; } diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 708bdda..6493159 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -30,7 +30,7 @@ */ this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurXFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -41,7 +41,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.width / input.size.width); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.width / input.size.width); if(this.passes === 1) { diff --git a/src/filters/blur/BlurYFilter.js b/src/filters/blur/BlurYFilter.js index 232d227..1b76088 100644 --- a/src/filters/blur/BlurYFilter.js +++ b/src/filters/blur/BlurYFilter.js @@ -22,7 +22,7 @@ ); this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurYFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -33,7 +33,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.height / input.size.height); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.height / input.size.height); if(this.passes === 1) { diff --git a/src/filters/blur/blur.frag b/src/filters/blur/blur.frag index 621bca4..ae39984 100644 --- a/src/filters/blur/blur.frag +++ b/src/filters/blur/blur.frag @@ -1,7 +1,7 @@ precision lowp float; varying vec2 vTextureCoord; -varying vec2 vBlurTexCoords[14]; +varying vec2 vBlurTexCoords[6]; varying vec4 vColor; uniform sampler2D uSampler; @@ -10,19 +10,11 @@ { gl_FragColor = vec4(0.0); - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.0044299121055113265; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 6])*0.147308056121; - gl_FragColor += texture2D(uSampler, vTextureCoord )*0.159576912161; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 7])*0.147308056121; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 8])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 9])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[10])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[11])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[12])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[13])*0.0044299121055113265; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.004431848411938341; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vTextureCoord )*0.3989422804014327; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.004431848411938341; } diff --git a/src/filters/blur/blurX.vert b/src/filters/blur/blurX.vert index e5aba81..068f776 100644 --- a/src/filters/blur/blurX.vert +++ b/src/filters/blur/blurX.vert @@ -7,27 +7,19 @@ varying vec2 vTextureCoord; varying vec4 vColor; -varying vec2 vBlurTexCoords[14]; +varying vec2 vBlurTexCoords[6]; void main(void) { gl_Position = vec4((projectionMatrix * vec3((aVertexPosition), 1.0)).xy, 0.0, 1.0); vTextureCoord = aTextureCoord; - vBlurTexCoords[ 0] = aTextureCoord + vec2(-0.028 * strength, 0.0); - vBlurTexCoords[ 1] = aTextureCoord + vec2(-0.024 * strength, 0.0); - vBlurTexCoords[ 2] = aTextureCoord + vec2(-0.020 * strength, 0.0); - vBlurTexCoords[ 3] = aTextureCoord + vec2(-0.016 * strength, 0.0); - vBlurTexCoords[ 4] = aTextureCoord + vec2(-0.012 * strength, 0.0); - vBlurTexCoords[ 5] = aTextureCoord + vec2(-0.008 * strength, 0.0); - vBlurTexCoords[ 6] = aTextureCoord + vec2(-0.004 * strength, 0.0); - vBlurTexCoords[ 7] = aTextureCoord + vec2( 0.004 * strength, 0.0); - vBlurTexCoords[ 8] = aTextureCoord + vec2( 0.008 * strength, 0.0); - vBlurTexCoords[ 9] = aTextureCoord + vec2( 0.012 * strength, 0.0); - vBlurTexCoords[10] = aTextureCoord + vec2( 0.016 * strength, 0.0); - vBlurTexCoords[11] = aTextureCoord + vec2( 0.020 * strength, 0.0); - vBlurTexCoords[12] = aTextureCoord + vec2( 0.024 * strength, 0.0); - vBlurTexCoords[13] = aTextureCoord + vec2( 0.028 * strength, 0.0); + vBlurTexCoords[ 0] = aTextureCoord + vec2(-0.012 * strength, 0.0); + vBlurTexCoords[ 1] = aTextureCoord + vec2(-0.008 * strength, 0.0); + vBlurTexCoords[ 2] = aTextureCoord + vec2(-0.004 * strength, 0.0); + vBlurTexCoords[ 3] = aTextureCoord + vec2( 0.004 * strength, 0.0); + vBlurTexCoords[ 4] = aTextureCoord + vec2( 0.008 * strength, 0.0); + vBlurTexCoords[ 5] = aTextureCoord + vec2( 0.012 * strength, 0.0); - vColor = vec4(aColor.rgb * aColor.a, aColor.a); + vColor = vec4(aColor.rgb * aColor.a, aColor.a); } diff --git a/src/filters/blur/BlurXFilter.js b/src/filters/blur/BlurXFilter.js index 708bdda..6493159 100644 --- a/src/filters/blur/BlurXFilter.js +++ b/src/filters/blur/BlurXFilter.js @@ -30,7 +30,7 @@ */ this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurXFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -41,7 +41,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.width / input.size.width); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.width / input.size.width); if(this.passes === 1) { diff --git a/src/filters/blur/BlurYFilter.js b/src/filters/blur/BlurYFilter.js index 232d227..1b76088 100644 --- a/src/filters/blur/BlurYFilter.js +++ b/src/filters/blur/BlurYFilter.js @@ -22,7 +22,7 @@ ); this.passes = 1; - this.strength = 8; + this.strength = 4; } BlurYFilter.prototype = Object.create(core.AbstractFilter.prototype); @@ -33,7 +33,7 @@ { var shader = this.getShader(renderer); - this.uniforms.strength.value = this.strength / 8 / this.passes * (input.frame.height / input.size.height); + this.uniforms.strength.value = this.strength / 4 / this.passes * (input.frame.height / input.size.height); if(this.passes === 1) { diff --git a/src/filters/blur/blur.frag b/src/filters/blur/blur.frag index 621bca4..ae39984 100644 --- a/src/filters/blur/blur.frag +++ b/src/filters/blur/blur.frag @@ -1,7 +1,7 @@ precision lowp float; varying vec2 vTextureCoord; -varying vec2 vBlurTexCoords[14]; +varying vec2 vBlurTexCoords[6]; varying vec4 vColor; uniform sampler2D uSampler; @@ -10,19 +10,11 @@ { gl_FragColor = vec4(0.0); - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.0044299121055113265; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 6])*0.147308056121; - gl_FragColor += texture2D(uSampler, vTextureCoord )*0.159576912161; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 7])*0.147308056121; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 8])*0.115876621105; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 9])*0.0776744219933; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[10])*0.0443683338718; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[11])*0.0215963866053; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[12])*0.00895781211794; - gl_FragColor += texture2D(uSampler, vBlurTexCoords[13])*0.0044299121055113265; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 0])*0.004431848411938341; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 1])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 2])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vTextureCoord )*0.3989422804014327; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 3])*0.2419707245191454; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 4])*0.05399096651318985; + gl_FragColor += texture2D(uSampler, vBlurTexCoords[ 5])*0.004431848411938341; } diff --git a/src/filters/blur/blurX.vert b/src/filters/blur/blurX.vert index e5aba81..068f776 100644 --- a/src/filters/blur/blurX.vert +++ b/src/filters/blur/blurX.vert @@ -7,27 +7,19 @@ varying vec2 vTextureCoord; varying vec4 vColor; -varying vec2 vBlurTexCoords[14]; +varying vec2 vBlurTexCoords[6]; void main(void) { gl_Position = vec4((projectionMatrix * vec3((aVertexPosition), 1.0)).xy, 0.0, 1.0); vTextureCoord = aTextureCoord; - vBlurTexCoords[ 0] = aTextureCoord + vec2(-0.028 * strength, 0.0); - vBlurTexCoords[ 1] = aTextureCoord + vec2(-0.024 * strength, 0.0); - vBlurTexCoords[ 2] = aTextureCoord + vec2(-0.020 * strength, 0.0); - vBlurTexCoords[ 3] = aTextureCoord + vec2(-0.016 * strength, 0.0); - vBlurTexCoords[ 4] = aTextureCoord + vec2(-0.012 * strength, 0.0); - vBlurTexCoords[ 5] = aTextureCoord + vec2(-0.008 * strength, 0.0); - vBlurTexCoords[ 6] = aTextureCoord + vec2(-0.004 * strength, 0.0); - vBlurTexCoords[ 7] = aTextureCoord + vec2( 0.004 * strength, 0.0); - vBlurTexCoords[ 8] = aTextureCoord + vec2( 0.008 * strength, 0.0); - vBlurTexCoords[ 9] = aTextureCoord + vec2( 0.012 * strength, 0.0); - vBlurTexCoords[10] = aTextureCoord + vec2( 0.016 * strength, 0.0); - vBlurTexCoords[11] = aTextureCoord + vec2( 0.020 * strength, 0.0); - vBlurTexCoords[12] = aTextureCoord + vec2( 0.024 * strength, 0.0); - vBlurTexCoords[13] = aTextureCoord + vec2( 0.028 * strength, 0.0); + vBlurTexCoords[ 0] = aTextureCoord + vec2(-0.012 * strength, 0.0); + vBlurTexCoords[ 1] = aTextureCoord + vec2(-0.008 * strength, 0.0); + vBlurTexCoords[ 2] = aTextureCoord + vec2(-0.004 * strength, 0.0); + vBlurTexCoords[ 3] = aTextureCoord + vec2( 0.004 * strength, 0.0); + vBlurTexCoords[ 4] = aTextureCoord + vec2( 0.008 * strength, 0.0); + vBlurTexCoords[ 5] = aTextureCoord + vec2( 0.012 * strength, 0.0); - vColor = vec4(aColor.rgb * aColor.a, aColor.a); + vColor = vec4(aColor.rgb * aColor.a, aColor.a); } diff --git a/src/filters/blur/blurY.vert b/src/filters/blur/blurY.vert deleted file mode 100644 index f29f30b..0000000 --- a/src/filters/blur/blurY.vert +++ /dev/null @@ -1,33 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; -attribute vec4 aColor; - -uniform float strength; -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; -varying vec4 vColor; -varying vec2 vBlurTexCoords[14]; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3((aVertexPosition), 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; - - vBlurTexCoords[ 0] = aTextureCoord + vec2(0.0, -0.028 * strength); - vBlurTexCoords[ 1] = aTextureCoord + vec2(0.0, -0.024 * strength); - vBlurTexCoords[ 2] = aTextureCoord + vec2(0.0, -0.020 * strength); - vBlurTexCoords[ 3] = aTextureCoord + vec2(0.0, -0.016 * strength); - vBlurTexCoords[ 4] = aTextureCoord + vec2(0.0, -0.012 * strength); - vBlurTexCoords[ 5] = aTextureCoord + vec2(0.0, -0.008 * strength); - vBlurTexCoords[ 6] = aTextureCoord + vec2(0.0, -0.004 * strength); - vBlurTexCoords[ 7] = aTextureCoord + vec2(0.0, 0.004 * strength); - vBlurTexCoords[ 8] = aTextureCoord + vec2(0.0, 0.008 * strength); - vBlurTexCoords[ 9] = aTextureCoord + vec2(0.0, 0.012 * strength); - vBlurTexCoords[10] = aTextureCoord + vec2(0.0, 0.016 * strength); - vBlurTexCoords[11] = aTextureCoord + vec2(0.0, 0.020 * strength); - vBlurTexCoords[12] = aTextureCoord + vec2(0.0, 0.024 * strength); - vBlurTexCoords[13] = aTextureCoord + vec2(0.0, 0.028 * strength); - - vColor = vec4(aColor.rgb * aColor.a, aColor.a); -}