diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/SepiaFilter.js b/src/filters/SepiaFilter.js index 4533577..d86f45c 100644 --- a/src/filters/SepiaFilter.js +++ b/src/filters/SepiaFilter.js @@ -27,8 +27,8 @@ 'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);', '}' diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/SepiaFilter.js b/src/filters/SepiaFilter.js index 4533577..d86f45c 100644 --- a/src/filters/SepiaFilter.js +++ b/src/filters/SepiaFilter.js @@ -27,8 +27,8 @@ 'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);', '}' diff --git a/src/filters/SmartBlurFilter.js b/src/filters/SmartBlurFilter.js index 141c894..7fe5216 100644 --- a/src/filters/SmartBlurFilter.js +++ b/src/filters/SmartBlurFilter.js @@ -19,21 +19,21 @@ 'uniform sampler2D uSampler;', 'const vec2 delta = vec2(1.0/10.0, 0.0);', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', ' float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/SepiaFilter.js b/src/filters/SepiaFilter.js index 4533577..d86f45c 100644 --- a/src/filters/SepiaFilter.js +++ b/src/filters/SepiaFilter.js @@ -27,8 +27,8 @@ 'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);', '}' diff --git a/src/filters/SmartBlurFilter.js b/src/filters/SmartBlurFilter.js index 141c894..7fe5216 100644 --- a/src/filters/SmartBlurFilter.js +++ b/src/filters/SmartBlurFilter.js @@ -19,21 +19,21 @@ 'uniform sampler2D uSampler;', 'const vec2 delta = vec2(1.0/10.0, 0.0);', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', ' float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);', diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js index 283c1c4..d6b81eb 100644 --- a/src/filters/TiltShiftXFilter.js +++ b/src/filters/TiltShiftXFilter.js @@ -41,13 +41,13 @@ 'uniform vec2 delta;', 'uniform vec2 texSize;', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', @@ -55,8 +55,8 @@ ' vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));', ' float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/SepiaFilter.js b/src/filters/SepiaFilter.js index 4533577..d86f45c 100644 --- a/src/filters/SepiaFilter.js +++ b/src/filters/SepiaFilter.js @@ -27,8 +27,8 @@ 'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);', '}' diff --git a/src/filters/SmartBlurFilter.js b/src/filters/SmartBlurFilter.js index 141c894..7fe5216 100644 --- a/src/filters/SmartBlurFilter.js +++ b/src/filters/SmartBlurFilter.js @@ -19,21 +19,21 @@ 'uniform sampler2D uSampler;', 'const vec2 delta = vec2(1.0/10.0, 0.0);', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', ' float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);', diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js index 283c1c4..d6b81eb 100644 --- a/src/filters/TiltShiftXFilter.js +++ b/src/filters/TiltShiftXFilter.js @@ -41,13 +41,13 @@ 'uniform vec2 delta;', 'uniform vec2 texSize;', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', @@ -55,8 +55,8 @@ ' vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));', ' float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);', diff --git a/src/filters/TiltShiftYFilter.js b/src/filters/TiltShiftYFilter.js index 8b76557..d8f75a3 100644 --- a/src/filters/TiltShiftYFilter.js +++ b/src/filters/TiltShiftYFilter.js @@ -41,13 +41,13 @@ 'uniform vec2 delta;', 'uniform vec2 texSize;', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', @@ -55,8 +55,8 @@ ' vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));', ' float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);', diff --git a/src/filters/AlphaMaskFilter.js b/src/filters/AlphaMaskFilter.js index 666e0ef..97f60c3 100644 --- a/src/filters/AlphaMaskFilter.js +++ b/src/filters/AlphaMaskFilter.js @@ -48,8 +48,8 @@ 'uniform vec4 dimensions;', 'uniform vec2 offset;', - 'void main() - {', + 'void main()', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/BlurXFilter.js b/src/filters/BlurXFilter.js index aabada1..a8f5dca 100644 --- a/src/filters/BlurXFilter.js +++ b/src/filters/BlurXFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x - 4.0*blur, vTextureCoord.y)) * 0.05;', diff --git a/src/filters/BlurYFilter.js b/src/filters/BlurYFilter.js index 78d158e..b9d0638 100644 --- a/src/filters/BlurYFilter.js +++ b/src/filters/BlurYFilter.js @@ -26,8 +26,8 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 sum = vec4(0.0);', ' sum += texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y - 4.0*blur)) * 0.05;', diff --git a/src/filters/ColorMatrixFilter.js b/src/filters/ColorMatrixFilter.js index ee28f9d..73b025a 100644 --- a/src/filters/ColorMatrixFilter.js +++ b/src/filters/ColorMatrixFilter.js @@ -31,8 +31,8 @@ 'uniform mat4 matrix;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord) * matrix;', '}' ]; diff --git a/src/filters/ColorStepFilter.js b/src/filters/ColorStepFilter.js index 5c0fcda..4675215 100644 --- a/src/filters/ColorStepFilter.js +++ b/src/filters/ColorStepFilter.js @@ -23,8 +23,8 @@ 'uniform sampler2D uSampler;', 'uniform float step;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' color = floor(color * step) / step;', ' gl_FragColor = color;', diff --git a/src/filters/ConvolutionFilter.js b/src/filters/ConvolutionFilter.js index 6e1009e..3ce051e 100644 --- a/src/filters/ConvolutionFilter.js +++ b/src/filters/ConvolutionFilter.js @@ -37,8 +37,8 @@ 'vec2 px = vec2(texelSizeX, texelSizeY);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 c11 = texture2D(texture, vTextureCoord - px);', // top left ' vec4 c12 = texture2D(texture, vec2(vTextureCoord.x, vTextureCoord.y - px.y));', // top center ' vec4 c13 = texture2D(texture, vec2(vTextureCoord.x + px.x, vTextureCoord.y - px.y));', // top right diff --git a/src/filters/CrossHatchFilter.js b/src/filters/CrossHatchFilter.js index 2349f99..9aba58f 100644 --- a/src/filters/CrossHatchFilter.js +++ b/src/filters/CrossHatchFilter.js @@ -25,40 +25,40 @@ 'uniform float blur;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' float lum = length(texture2D(uSampler, vTextureCoord.xy).rgb);', ' gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);', - ' if (lum < 1.00) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 1.00)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.75) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0) - {', + ' if (lum < 0.75)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.50) - {', - ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.50)', + ' {', + ' if (mod(gl_FragCoord.x + gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', - ' if (lum < 0.3) - {', - ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0) - {', + ' if (lum < 0.3)', + ' {', + ' if (mod(gl_FragCoord.x - gl_FragCoord.y - 5.0, 10.0) == 0.0)', + ' {', ' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);', ' }', ' }', diff --git a/src/filters/DisplacementFilter.js b/src/filters/DisplacementFilter.js index ef9241e..cb6b788 100644 --- a/src/filters/DisplacementFilter.js +++ b/src/filters/DisplacementFilter.js @@ -50,8 +50,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', // 'const vec2 textureDimensions = vec2(750.0, 750.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' mapCords += (dimensions.zw + offset)/ dimensions.xy ;', ' mapCords.y *= -1.0;', diff --git a/src/filters/DotScreenFilter.js b/src/filters/DotScreenFilter.js index c33971e..10d922b 100644 --- a/src/filters/DotScreenFilter.js +++ b/src/filters/DotScreenFilter.js @@ -36,8 +36,8 @@ 'uniform float angle;', 'uniform float scale;', - 'float pattern() - {', + 'float pattern()', + '{', ' float s = sin(angle), c = cos(angle);', ' vec2 tex = vTextureCoord * dimensions.xy;', ' vec2 point = vec2(', @@ -47,8 +47,8 @@ ' return (sin(point.x) * sin(point.y)) * 4.0;', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float average = (color.r + color.g + color.b) / 3.0;', ' gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);', diff --git a/src/filters/GrayFilter.js b/src/filters/GrayFilter.js index cb73342..2b94906 100644 --- a/src/filters/GrayFilter.js +++ b/src/filters/GrayFilter.js @@ -25,8 +25,8 @@ 'uniform sampler2D uSampler;', 'uniform float gray;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix(gl_FragColor.rgb, vec3(0.2126*gl_FragColor.r + 0.7152*gl_FragColor.g + 0.0722*gl_FragColor.b), gray);', // ' gl_FragColor = gl_FragColor;', diff --git a/src/filters/InvertFilter.js b/src/filters/InvertFilter.js index b39bc8c..16cebea 100644 --- a/src/filters/InvertFilter.js +++ b/src/filters/InvertFilter.js @@ -25,8 +25,8 @@ 'uniform float invert;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( (vec3(1)-gl_FragColor.rgb) * gl_FragColor.a, gl_FragColor.rgb, 1.0 - invert);', //' gl_FragColor.rgb = gl_FragColor.rgb * gl_FragColor.a;', diff --git a/src/filters/NoiseFilter.js b/src/filters/NoiseFilter.js index 311c6ae..fdf1647 100644 --- a/src/filters/NoiseFilter.js +++ b/src/filters/NoiseFilter.js @@ -30,13 +30,13 @@ 'uniform float noise;', 'uniform sampler2D uSampler;', - 'float rand(vec2 co) - {', + 'float rand(vec2 co)', + '{', ' return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);', '}', - 'void main() - {', + 'void main()', + '{', ' vec4 color = texture2D(uSampler, vTextureCoord);', ' float diff = (rand(vTextureCoord) - 0.5) * noise;', diff --git a/src/filters/NormalMapFilter.js b/src/filters/NormalMapFilter.js index fb20c81..e88cfad 100644 --- a/src/filters/NormalMapFilter.js +++ b/src/filters/NormalMapFilter.js @@ -61,8 +61,8 @@ 'uniform vec2 mapDimensions;',// = vec2(256.0, 256.0);', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 mapCords = vTextureCoord.xy;', ' vec4 color = texture2D(uSampler, vTextureCoord.st);', diff --git a/src/filters/PixelateFilter.js b/src/filters/PixelateFilter.js index 106eb9c..e105fbe 100644 --- a/src/filters/PixelateFilter.js +++ b/src/filters/PixelateFilter.js @@ -29,8 +29,8 @@ 'uniform vec2 pixelSize;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord;', ' vec2 size = dimensions.xy/pixelSize;', diff --git a/src/filters/RGBSplitFilter.js b/src/filters/RGBSplitFilter.js index 28c5df6..679c460 100644 --- a/src/filters/RGBSplitFilter.js +++ b/src/filters/RGBSplitFilter.js @@ -33,8 +33,8 @@ 'uniform vec4 dimensions;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/dimensions.xy).r;', ' gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/dimensions.xy).g;', ' gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/dimensions.xy).b;', diff --git a/src/filters/SepiaFilter.js b/src/filters/SepiaFilter.js index 4533577..d86f45c 100644 --- a/src/filters/SepiaFilter.js +++ b/src/filters/SepiaFilter.js @@ -27,8 +27,8 @@ 'const mat3 sepiaMatrix = mat3(0.3588, 0.7044, 0.1368, 0.2990, 0.5870, 0.1140, 0.2392, 0.4696, 0.0912);', - 'void main(void) - {', + 'void main(void)', + '{', ' gl_FragColor = texture2D(uSampler, vTextureCoord);', ' gl_FragColor.rgb = mix( gl_FragColor.rgb, gl_FragColor.rgb * sepiaMatrix, sepia);', '}' diff --git a/src/filters/SmartBlurFilter.js b/src/filters/SmartBlurFilter.js index 141c894..7fe5216 100644 --- a/src/filters/SmartBlurFilter.js +++ b/src/filters/SmartBlurFilter.js @@ -19,21 +19,21 @@ 'uniform sampler2D uSampler;', 'const vec2 delta = vec2(1.0/10.0, 0.0);', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', ' float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta * percent);', diff --git a/src/filters/TiltShiftXFilter.js b/src/filters/TiltShiftXFilter.js index 283c1c4..d6b81eb 100644 --- a/src/filters/TiltShiftXFilter.js +++ b/src/filters/TiltShiftXFilter.js @@ -41,13 +41,13 @@ 'uniform vec2 delta;', 'uniform vec2 texSize;', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', @@ -55,8 +55,8 @@ ' vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));', ' float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);', diff --git a/src/filters/TiltShiftYFilter.js b/src/filters/TiltShiftYFilter.js index 8b76557..d8f75a3 100644 --- a/src/filters/TiltShiftYFilter.js +++ b/src/filters/TiltShiftYFilter.js @@ -41,13 +41,13 @@ 'uniform vec2 delta;', 'uniform vec2 texSize;', - 'float random(vec3 scale, float seed) - {', + 'float random(vec3 scale, float seed)', + '{', ' return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);', '}', - 'void main(void) - {', + 'void main(void)', + '{', ' vec4 color = vec4(0.0);', ' float total = 0.0;', @@ -55,8 +55,8 @@ ' vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));', ' float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;', - ' for (float t = -30.0; t <= 30.0; t++) - {', + ' for (float t = -30.0; t <= 30.0; t++)', + ' {', ' float percent = (t + offset - 0.5) / 30.0;', ' float weight = 1.0 - abs(percent);', ' vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);', diff --git a/src/filters/TwistFilter.js b/src/filters/TwistFilter.js index 79a81cf..2fe1f1b 100644 --- a/src/filters/TwistFilter.js +++ b/src/filters/TwistFilter.js @@ -29,13 +29,13 @@ 'uniform vec2 offset;', 'uniform sampler2D uSampler;', - 'void main(void) - {', + 'void main(void)', + '{', ' vec2 coord = vTextureCoord - offset;', ' float distance = length(coord);', - ' if (distance < radius) - {', + ' if (distance < radius)', + ' {', ' float ratio = (radius - distance) / radius;', ' float angleMod = ratio * ratio * angle;', ' float s = sin(angleMod);',