diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index ac02c97..978c886 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The DisplacementFilter class uses the pixel values from the specified texture @@ -26,9 +27,9 @@ super( // vertex shader - glslify('../fragments/default-filter-matrix.vert'), + readFileSync(join(__dirname, '../fragments/default-filter-matrix.vert'), 'utf8'), // fragment shader - glslify('./displacement.frag') + readFileSync(join(__dirname, './displacement.frag'), 'utf8') ); this.maskSprite = sprite; diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index ac02c97..978c886 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The DisplacementFilter class uses the pixel values from the specified texture @@ -26,9 +27,9 @@ super( // vertex shader - glslify('../fragments/default-filter-matrix.vert'), + readFileSync(join(__dirname, '../fragments/default-filter-matrix.vert'), 'utf8'), // fragment shader - glslify('./displacement.frag') + readFileSync(join(__dirname, './displacement.frag'), 'utf8') ); this.maskSprite = sprite; diff --git a/src/filters/fxaa/FXAAFilter.js b/src/filters/fxaa/FXAAFilter.js index f13a223..41a53d1 100644 --- a/src/filters/fxaa/FXAAFilter.js +++ b/src/filters/fxaa/FXAAFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @@ -24,9 +25,9 @@ // TODO - needs work super( // vertex shader - glslify('./fxaa.vert'), + readFileSync(join(__dirname, './fxaa.vert'), 'utf8'), // fragment shader - glslify('./fxaa.frag') + readFileSync(join(__dirname, './fxaa.frag'), 'utf8') ); } } diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index ac02c97..978c886 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The DisplacementFilter class uses the pixel values from the specified texture @@ -26,9 +27,9 @@ super( // vertex shader - glslify('../fragments/default-filter-matrix.vert'), + readFileSync(join(__dirname, '../fragments/default-filter-matrix.vert'), 'utf8'), // fragment shader - glslify('./displacement.frag') + readFileSync(join(__dirname, './displacement.frag'), 'utf8') ); this.maskSprite = sprite; diff --git a/src/filters/fxaa/FXAAFilter.js b/src/filters/fxaa/FXAAFilter.js index f13a223..41a53d1 100644 --- a/src/filters/fxaa/FXAAFilter.js +++ b/src/filters/fxaa/FXAAFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @@ -24,9 +25,9 @@ // TODO - needs work super( // vertex shader - glslify('./fxaa.vert'), + readFileSync(join(__dirname, './fxaa.vert'), 'utf8'), // fragment shader - glslify('./fxaa.frag') + readFileSync(join(__dirname, './fxaa.frag'), 'utf8') ); } } diff --git a/src/filters/noise/NoiseFilter.js b/src/filters/noise/NoiseFilter.js index 2f6d666..f5b7296 100644 --- a/src/filters/noise/NoiseFilter.js +++ b/src/filters/noise/NoiseFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @author Vico @vicocotea @@ -22,9 +23,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./noise.frag') + readFileSync(join(__dirname, './noise.frag'), 'utf8') ); this.noise = 0.5; diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index ac02c97..978c886 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The DisplacementFilter class uses the pixel values from the specified texture @@ -26,9 +27,9 @@ super( // vertex shader - glslify('../fragments/default-filter-matrix.vert'), + readFileSync(join(__dirname, '../fragments/default-filter-matrix.vert'), 'utf8'), // fragment shader - glslify('./displacement.frag') + readFileSync(join(__dirname, './displacement.frag'), 'utf8') ); this.maskSprite = sprite; diff --git a/src/filters/fxaa/FXAAFilter.js b/src/filters/fxaa/FXAAFilter.js index f13a223..41a53d1 100644 --- a/src/filters/fxaa/FXAAFilter.js +++ b/src/filters/fxaa/FXAAFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @@ -24,9 +25,9 @@ // TODO - needs work super( // vertex shader - glslify('./fxaa.vert'), + readFileSync(join(__dirname, './fxaa.vert'), 'utf8'), // fragment shader - glslify('./fxaa.frag') + readFileSync(join(__dirname, './fxaa.frag'), 'utf8') ); } } diff --git a/src/filters/noise/NoiseFilter.js b/src/filters/noise/NoiseFilter.js index 2f6d666..f5b7296 100644 --- a/src/filters/noise/NoiseFilter.js +++ b/src/filters/noise/NoiseFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @author Vico @vicocotea @@ -22,9 +23,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./noise.frag') + readFileSync(join(__dirname, './noise.frag'), 'utf8') ); this.noise = 0.5; diff --git a/src/filters/void/VoidFilter.js b/src/filters/void/VoidFilter.js index d99a9a5..b4361ac 100644 --- a/src/filters/void/VoidFilter.js +++ b/src/filters/void/VoidFilter.js @@ -1,7 +1,6 @@ import * as core from '../../core'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * Does nothing. Very handy. @@ -19,9 +18,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./void.frag') + readFileSync(join(__dirname, './void.frag'), 'utf8') ); this.glShaderKey = 'void'; diff --git a/.babelrc b/.babelrc index d8272b1..d1fcd91 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,8 @@ { presets: [ - ["es2015", { "loose": true }] + ["es2015", { "loose": true }], + ], + plugins: [ + "static-fs" ] } \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index ff9ba60..e0e521a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,8 @@ { "env": { "es6": true, - "browser": true + "browser": true, + "node": true }, "globals": { "global": false diff --git a/package.json b/package.json index 956a3ae..2c6f95d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^2.0.0", - "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.3", @@ -63,6 +62,7 @@ }, "devDependencies": { "babel-cli": "^6.18.0", + "babel-plugin-static-fs": "^1.1.0", "babel-preset-es2015": "^6.14.0", "babelify": "^7.3.0", "del": "^2.2.0", @@ -83,7 +83,6 @@ "browserify": { "transform": [ "babelify", - "glslify", "browserify-versionify" ] } diff --git a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js index 5b45807..1e86c68 100644 --- a/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js +++ b/src/core/renderers/webgl/filters/spriteMask/SpriteMaskFilter.js @@ -1,8 +1,7 @@ import Filter from '../Filter'; import { Matrix } from '../../../../math'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The SpriteMaskFilter class @@ -21,8 +20,8 @@ const maskMatrix = new Matrix(); super( - glslify('./spriteMaskFilter.vert'), - glslify('./spriteMaskFilter.frag') + readFileSync(join(__dirname, './spriteMaskFilter.vert'), 'utf8'), + readFileSync(join(__dirname, './spriteMaskFilter.frag'), 'utf8') ); sprite.renderable = false; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index b1b903e..b5e067a 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -1,5 +1,6 @@ import Shader from '../../Shader'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const fragTemplate = [ 'varying vec2 vTextureCoord;', @@ -17,7 +18,7 @@ export default function generateMultiTextureShader(gl, maxTextures) { - const vertexSrc = glslify('./texture.vert'); + const vertexSrc = readFileSync(join(__dirname, './texture.vert'), 'utf8'); let fragmentSrc = fragTemplate; fragmentSrc = fragmentSrc.replace(/%count%/gi, maxTextures); diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index cc97c2d..250bd94 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -1,7 +1,7 @@ import * as core from '../../core'; import { WRAP_MODES } from '../../core/const'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; const tempMat = new core.Matrix(); const tempArray = new Float32Array(4); @@ -35,11 +35,11 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite.frag'), 'utf8')); this.simpleShader = new core.Shader(gl, - glslify('./tilingSprite.vert'), - glslify('./tilingSprite_simple.frag')); + readFileSync(join(__dirname, './tilingSprite.vert'), 'utf8'), + readFileSync(join(__dirname, './tilingSprite_simple.frag'), 'utf8')); this.quad = new core.Quad(gl, this.renderer.state.attribState); this.quad.initVao(this.shader); diff --git a/src/filters/colormatrix/ColorMatrixFilter.js b/src/filters/colormatrix/ColorMatrixFilter.js index dbaa861..36f51f6 100644 --- a/src/filters/colormatrix/ColorMatrixFilter.js +++ b/src/filters/colormatrix/ColorMatrixFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA @@ -25,9 +26,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./colorMatrix.frag') + readFileSync(join(__dirname, './colorMatrix.frag'), 'utf8') ); this.uniforms.m = [ diff --git a/src/filters/displacement/DisplacementFilter.js b/src/filters/displacement/DisplacementFilter.js index ac02c97..978c886 100644 --- a/src/filters/displacement/DisplacementFilter.js +++ b/src/filters/displacement/DisplacementFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * The DisplacementFilter class uses the pixel values from the specified texture @@ -26,9 +27,9 @@ super( // vertex shader - glslify('../fragments/default-filter-matrix.vert'), + readFileSync(join(__dirname, '../fragments/default-filter-matrix.vert'), 'utf8'), // fragment shader - glslify('./displacement.frag') + readFileSync(join(__dirname, './displacement.frag'), 'utf8') ); this.maskSprite = sprite; diff --git a/src/filters/fxaa/FXAAFilter.js b/src/filters/fxaa/FXAAFilter.js index f13a223..41a53d1 100644 --- a/src/filters/fxaa/FXAAFilter.js +++ b/src/filters/fxaa/FXAAFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @@ -24,9 +25,9 @@ // TODO - needs work super( // vertex shader - glslify('./fxaa.vert'), + readFileSync(join(__dirname, './fxaa.vert'), 'utf8'), // fragment shader - glslify('./fxaa.frag') + readFileSync(join(__dirname, './fxaa.frag'), 'utf8') ); } } diff --git a/src/filters/noise/NoiseFilter.js b/src/filters/noise/NoiseFilter.js index 2f6d666..f5b7296 100644 --- a/src/filters/noise/NoiseFilter.js +++ b/src/filters/noise/NoiseFilter.js @@ -1,5 +1,6 @@ import * as core from '../../core'; -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * @author Vico @vicocotea @@ -22,9 +23,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./noise.frag') + readFileSync(join(__dirname, './noise.frag'), 'utf8') ); this.noise = 0.5; diff --git a/src/filters/void/VoidFilter.js b/src/filters/void/VoidFilter.js index d99a9a5..b4361ac 100644 --- a/src/filters/void/VoidFilter.js +++ b/src/filters/void/VoidFilter.js @@ -1,7 +1,6 @@ import * as core from '../../core'; - -// @see https://github.com/substack/brfs/issues/25 -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * Does nothing. Very handy. @@ -19,9 +18,9 @@ { super( // vertex shader - glslify('../fragments/default.vert'), + readFileSync(join(__dirname, '../fragments/default.vert'), 'utf8'), // fragment shader - glslify('./void.frag') + readFileSync(join(__dirname, './void.frag'), 'utf8') ); this.glShaderKey = 'void'; diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index 4c7d4d9..f6b9aa4 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -1,8 +1,8 @@ import * as core from '../../core'; import glCore from 'pixi-gl-core'; import { default as Mesh } from '../Mesh'; - -const glslify = require('glslify'); // eslint-disable-line no-undef +import { readFileSync } from 'fs'; +import { join } from 'path'; /** * WebGL renderer plugin for tiling sprites @@ -31,8 +31,8 @@ const gl = this.renderer.gl; this.shader = new core.Shader(gl, - glslify('./mesh.vert'), - glslify('./mesh.frag')); + readFileSync(join(__dirname, './mesh.vert'), 'utf8'), + readFileSync(join(__dirname, './mesh.frag'), 'utf8')); } /**