diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 441c2bd..8e298c9 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,9 +1,9 @@ var Shader = require('pixi-gl-core').GLShader; -var fs = require('fs'); +var glslify = require('glslify'); function generateMultiTextureShader(gl, maxTextures) { - var vertexSrc = fs.readFileSync(__dirname + '/texture.vert', 'utf8'); + var vertexSrc = glslify('./texture.vert'); var fragmentSrc = fragTemplate fragmentSrc = fragmentSrc.replace(/\%count\%/gi, maxTextures); diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 441c2bd..8e298c9 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,9 +1,9 @@ var Shader = require('pixi-gl-core').GLShader; -var fs = require('fs'); +var glslify = require('glslify'); function generateMultiTextureShader(gl, maxTextures) { - var vertexSrc = fs.readFileSync(__dirname + '/texture.vert', 'utf8'); + var vertexSrc = glslify('./texture.vert'); var fragmentSrc = fragTemplate fragmentSrc = fragmentSrc.replace(/\%count\%/gi, maxTextures); diff --git a/src/core/sprites/webgl/texture.frag b/src/core/sprites/webgl/texture.frag deleted file mode 100644 index dcb6d29..0000000 --- a/src/core/sprites/webgl/texture.frag +++ /dev/null @@ -1,81 +0,0 @@ -precision lowp float; - -vec4 getSampleFromArray16(sampler2D textures[16], int ndx, vec2 uv) { - -vec4 color; - -if(ndx == 0) -{ - color = texture2D(textures[0], uv); -} -else if(ndx == 1) -{ - color = texture2D(textures[1], uv); -} -else if(ndx == 2) -{ - color = texture2D(textures[2], uv); -} -else if(ndx == 3) -{ - color = texture2D(textures[3], uv); -} -else if(ndx == 4) -{ - color = texture2D(textures[4], uv); -} -else if(ndx == 5) -{ - color = texture2D(textures[5], uv); -} -else if(ndx == 6) -{ - color = texture2D(textures[6], uv); -} -else if(ndx == 7) -{ - color = texture2D(textures[7], uv); -} -else if(ndx == 8) -{ - color = texture2D(textures[8], uv); -} -else if(ndx == 9) -{ - color = texture2D(textures[9], uv); -} -else if(ndx == 10) -{ - color = texture2D(textures[10], uv); -} -else if(ndx == 11) -{ - color = texture2D(textures[11], uv); -} -else if(ndx == 12) -{ - color = texture2D(textures[12], uv); -} -else if(ndx == 13) -{ - color = texture2D(textures[13], uv); -} -else if(ndx == 14) -{ - color = texture2D(textures[14], uv); -} -else -{ - color = texture2D(textures[15], uv); -} - -return color; -} - -varying vec2 vTextureCoord; -varying vec4 vColor; -varying float vTextureId; -uniform sampler2D uSamplers[16]; -void main(void){ -gl_FragColor = getSampleFromArray16(uSamplers, int(vTextureId), vTextureCoord) * vColor; -} \ No newline at end of file diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 441c2bd..8e298c9 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,9 +1,9 @@ var Shader = require('pixi-gl-core').GLShader; -var fs = require('fs'); +var glslify = require('glslify'); function generateMultiTextureShader(gl, maxTextures) { - var vertexSrc = fs.readFileSync(__dirname + '/texture.vert', 'utf8'); + var vertexSrc = glslify('./texture.vert'); var fragmentSrc = fragTemplate fragmentSrc = fragmentSrc.replace(/\%count\%/gi, maxTextures); diff --git a/src/core/sprites/webgl/texture.frag b/src/core/sprites/webgl/texture.frag deleted file mode 100644 index dcb6d29..0000000 --- a/src/core/sprites/webgl/texture.frag +++ /dev/null @@ -1,81 +0,0 @@ -precision lowp float; - -vec4 getSampleFromArray16(sampler2D textures[16], int ndx, vec2 uv) { - -vec4 color; - -if(ndx == 0) -{ - color = texture2D(textures[0], uv); -} -else if(ndx == 1) -{ - color = texture2D(textures[1], uv); -} -else if(ndx == 2) -{ - color = texture2D(textures[2], uv); -} -else if(ndx == 3) -{ - color = texture2D(textures[3], uv); -} -else if(ndx == 4) -{ - color = texture2D(textures[4], uv); -} -else if(ndx == 5) -{ - color = texture2D(textures[5], uv); -} -else if(ndx == 6) -{ - color = texture2D(textures[6], uv); -} -else if(ndx == 7) -{ - color = texture2D(textures[7], uv); -} -else if(ndx == 8) -{ - color = texture2D(textures[8], uv); -} -else if(ndx == 9) -{ - color = texture2D(textures[9], uv); -} -else if(ndx == 10) -{ - color = texture2D(textures[10], uv); -} -else if(ndx == 11) -{ - color = texture2D(textures[11], uv); -} -else if(ndx == 12) -{ - color = texture2D(textures[12], uv); -} -else if(ndx == 13) -{ - color = texture2D(textures[13], uv); -} -else if(ndx == 14) -{ - color = texture2D(textures[14], uv); -} -else -{ - color = texture2D(textures[15], uv); -} - -return color; -} - -varying vec2 vTextureCoord; -varying vec4 vColor; -varying float vTextureId; -uniform sampler2D uSamplers[16]; -void main(void){ -gl_FragColor = getSampleFromArray16(uSamplers, int(vTextureId), vTextureCoord) * vColor; -} \ No newline at end of file diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index 070383c..db7aad6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,6 +1,6 @@ var core = require('../../core'); // @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -21,9 +21,9 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/colorMatrix.vert', 'utf8'), + glslify('./colorMatrix.vert'), // fragment shader - fs.readFileSync(__dirname + '/colorMatrix.frag', 'utf8') + glslify('./colorMatrix.frag') ); this.uniforms.m = [ diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 441c2bd..8e298c9 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,9 +1,9 @@ var Shader = require('pixi-gl-core').GLShader; -var fs = require('fs'); +var glslify = require('glslify'); function generateMultiTextureShader(gl, maxTextures) { - var vertexSrc = fs.readFileSync(__dirname + '/texture.vert', 'utf8'); + var vertexSrc = glslify('./texture.vert'); var fragmentSrc = fragTemplate fragmentSrc = fragmentSrc.replace(/\%count\%/gi, maxTextures); diff --git a/src/core/sprites/webgl/texture.frag b/src/core/sprites/webgl/texture.frag deleted file mode 100644 index dcb6d29..0000000 --- a/src/core/sprites/webgl/texture.frag +++ /dev/null @@ -1,81 +0,0 @@ -precision lowp float; - -vec4 getSampleFromArray16(sampler2D textures[16], int ndx, vec2 uv) { - -vec4 color; - -if(ndx == 0) -{ - color = texture2D(textures[0], uv); -} -else if(ndx == 1) -{ - color = texture2D(textures[1], uv); -} -else if(ndx == 2) -{ - color = texture2D(textures[2], uv); -} -else if(ndx == 3) -{ - color = texture2D(textures[3], uv); -} -else if(ndx == 4) -{ - color = texture2D(textures[4], uv); -} -else if(ndx == 5) -{ - color = texture2D(textures[5], uv); -} -else if(ndx == 6) -{ - color = texture2D(textures[6], uv); -} -else if(ndx == 7) -{ - color = texture2D(textures[7], uv); -} -else if(ndx == 8) -{ - color = texture2D(textures[8], uv); -} -else if(ndx == 9) -{ - color = texture2D(textures[9], uv); -} -else if(ndx == 10) -{ - color = texture2D(textures[10], uv); -} -else if(ndx == 11) -{ - color = texture2D(textures[11], uv); -} -else if(ndx == 12) -{ - color = texture2D(textures[12], uv); -} -else if(ndx == 13) -{ - color = texture2D(textures[13], uv); -} -else if(ndx == 14) -{ - color = texture2D(textures[14], uv); -} -else -{ - color = texture2D(textures[15], uv); -} - -return color; -} - -varying vec2 vTextureCoord; -varying vec4 vColor; -varying float vTextureId; -uniform sampler2D uSamplers[16]; -void main(void){ -gl_FragColor = getSampleFromArray16(uSamplers, int(vTextureId), vTextureCoord) * vColor; -} \ No newline at end of file diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index 070383c..db7aad6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,6 +1,6 @@ var core = require('../../core'); // @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -21,9 +21,9 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/colorMatrix.vert', 'utf8'), + glslify('./colorMatrix.vert'), // fragment shader - fs.readFileSync(__dirname + '/colorMatrix.frag', 'utf8') + glslify('./colorMatrix.frag') ); this.uniforms.m = [ diff --git a/src/filters/gray/GrayFilter.js b/src/filters/gray/GrayFilter.js index a660a33..e78411f 100644 --- a/src/filters/gray/GrayFilter.js +++ b/src/filters/gray/GrayFilter.js @@ -1,6 +1,6 @@ var core = require('../../core'); // @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * This greyscales the palette of your Display Objects. @@ -13,9 +13,9 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/gray.vert', 'utf8'), + glslify('./gray.vert', 'utf8'), // fragment shader - fs.readFileSync(__dirname + '/gray.frag', 'utf8') + glslify('./gray.frag', 'utf8') ); this.uniforms.gray = 1; diff --git a/package.json b/package.json index f149fa7..4436b84 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "browserify": "^11.1.0", "chai": "^3.2.0", "del": "^2.0.2", + "glslify": "^5.0.2", "gulp": "^3.9.0", "gulp-cached": "^1.1.0", "gulp-concat": "^2.6.0", @@ -70,7 +71,8 @@ }, "browserify": { "transform": [ - "brfs" + "glslify" ] + } } diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 441c2bd..8e298c9 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,9 +1,9 @@ var Shader = require('pixi-gl-core').GLShader; -var fs = require('fs'); +var glslify = require('glslify'); function generateMultiTextureShader(gl, maxTextures) { - var vertexSrc = fs.readFileSync(__dirname + '/texture.vert', 'utf8'); + var vertexSrc = glslify('./texture.vert'); var fragmentSrc = fragTemplate fragmentSrc = fragmentSrc.replace(/\%count\%/gi, maxTextures); diff --git a/src/core/sprites/webgl/texture.frag b/src/core/sprites/webgl/texture.frag deleted file mode 100644 index dcb6d29..0000000 --- a/src/core/sprites/webgl/texture.frag +++ /dev/null @@ -1,81 +0,0 @@ -precision lowp float; - -vec4 getSampleFromArray16(sampler2D textures[16], int ndx, vec2 uv) { - -vec4 color; - -if(ndx == 0) -{ - color = texture2D(textures[0], uv); -} -else if(ndx == 1) -{ - color = texture2D(textures[1], uv); -} -else if(ndx == 2) -{ - color = texture2D(textures[2], uv); -} -else if(ndx == 3) -{ - color = texture2D(textures[3], uv); -} -else if(ndx == 4) -{ - color = texture2D(textures[4], uv); -} -else if(ndx == 5) -{ - color = texture2D(textures[5], uv); -} -else if(ndx == 6) -{ - color = texture2D(textures[6], uv); -} -else if(ndx == 7) -{ - color = texture2D(textures[7], uv); -} -else if(ndx == 8) -{ - color = texture2D(textures[8], uv); -} -else if(ndx == 9) -{ - color = texture2D(textures[9], uv); -} -else if(ndx == 10) -{ - color = texture2D(textures[10], uv); -} -else if(ndx == 11) -{ - color = texture2D(textures[11], uv); -} -else if(ndx == 12) -{ - color = texture2D(textures[12], uv); -} -else if(ndx == 13) -{ - color = texture2D(textures[13], uv); -} -else if(ndx == 14) -{ - color = texture2D(textures[14], uv); -} -else -{ - color = texture2D(textures[15], uv); -} - -return color; -} - -varying vec2 vTextureCoord; -varying vec4 vColor; -varying float vTextureId; -uniform sampler2D uSamplers[16]; -void main(void){ -gl_FragColor = getSampleFromArray16(uSamplers, int(vTextureId), vTextureCoord) * vColor; -} \ No newline at end of file diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index 070383c..db7aad6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,6 +1,6 @@ var core = require('../../core'); // @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -21,9 +21,9 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/colorMatrix.vert', 'utf8'), + glslify('./colorMatrix.vert'), // fragment shader - fs.readFileSync(__dirname + '/colorMatrix.frag', 'utf8') + glslify('./colorMatrix.frag') ); this.uniforms.m = [ diff --git a/src/filters/gray/GrayFilter.js b/src/filters/gray/GrayFilter.js index a660a33..e78411f 100644 --- a/src/filters/gray/GrayFilter.js +++ b/src/filters/gray/GrayFilter.js @@ -1,6 +1,6 @@ var core = require('../../core'); // @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * This greyscales the palette of your Display Objects. @@ -13,9 +13,9 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/gray.vert', 'utf8'), + glslify('./gray.vert', 'utf8'), // fragment shader - fs.readFileSync(__dirname + '/gray.frag', 'utf8') + glslify('./gray.frag', 'utf8') ); this.uniforms.gray = 1; diff --git a/src/filters/twist/TwistFilter.js b/src/filters/twist/TwistFilter.js index 1c028aa..6cddb4b 100644 --- a/src/filters/twist/TwistFilter.js +++ b/src/filters/twist/TwistFilter.js @@ -1,6 +1,5 @@ var core = require('../../core'); -// @see https://github.com/substack/brfs/issues/25 -var fs = require('fs'); +var glslify = require('glslify'); /** * This filter applies a twist effect making display objects appear twisted in the given direction. @@ -13,9 +12,10 @@ { core.Filter.call(this, // vertex shader - fs.readFileSync(__dirname + '/twist.vert', 'utf8'), + + glslify('./twist.vert', 'utf8'), // fragment shader - fs.readFileSync(__dirname + '/twist.frag', 'utf8') + glslify('./twist.frag', 'utf8') // custom uniforms );