diff --git a/src/core/index.js b/src/core/index.js index 0ac5cf8..1d0a398 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -42,10 +42,8 @@ CanvasBuffer: require('./renderers/canvas/utils/CanvasBuffer'), // renderers - webgl - WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - // WebGLGraphics: require('./renderers/webgl/utils/WebGLGraphics'), - - + WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + Shader: require('./renderers/webgl/shaders/Shader'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/core/index.js b/src/core/index.js index 0ac5cf8..1d0a398 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -42,10 +42,8 @@ CanvasBuffer: require('./renderers/canvas/utils/CanvasBuffer'), // renderers - webgl - WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - // WebGLGraphics: require('./renderers/webgl/utils/WebGLGraphics'), - - + WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + Shader: require('./renderers/webgl/shaders/Shader'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/core/renderers/webgl/shaders/StripShader.js b/src/core/renderers/webgl/shaders/StripShader.js deleted file mode 100644 index 1fbd9ef..0000000 --- a/src/core/renderers/webgl/shaders/StripShader.js +++ /dev/null @@ -1,57 +0,0 @@ -var Shader = require('./Shader'), - WebGLShaderManager = require('../managers/WebGLShaderManager'); - -/** - * @class - * @namespace PIXI - * @param shaderManager {WebGLShaderManager} The webgl shader manager this shader works for. - */ -function StripShader(shaderManager) -{ - Shader.call(this, - shaderManager, - // vertex shader - [ - 'attribute vec2 aVertexPosition;', - 'attribute vec2 aTextureCoord;', - // 'attribute vec4 aColor;', - - 'uniform mat3 translationMatrix;', - 'uniform vec2 projectionVector;', - 'uniform vec2 offsetVector;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);', - ' v -= offsetVector.xyx;', - ' gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);', - ' vTextureCoord = aTextureCoord;', - '}' - ].join('\n'), - // fragment shader - [ - 'precision mediump float;', - - 'uniform float alpha;', - 'uniform sampler2D uSampler;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * alpha;', - '}' - ].join('\n'), - // custom uniforms - { - alpha: { type: '1f', value: 0 }, - translationMatrix: { type: 'mat3', value: new Float32Array(9) } - } - ); -} - -StripShader.prototype = Object.create(Shader.prototype); -StripShader.prototype.constructor = StripShader; -module.exports = StripShader; - -WebGLShaderManager.registerPlugin('stripShader', StripShader); diff --git a/src/core/index.js b/src/core/index.js index 0ac5cf8..1d0a398 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -42,10 +42,8 @@ CanvasBuffer: require('./renderers/canvas/utils/CanvasBuffer'), // renderers - webgl - WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - // WebGLGraphics: require('./renderers/webgl/utils/WebGLGraphics'), - - + WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + Shader: require('./renderers/webgl/shaders/Shader'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/core/renderers/webgl/shaders/StripShader.js b/src/core/renderers/webgl/shaders/StripShader.js deleted file mode 100644 index 1fbd9ef..0000000 --- a/src/core/renderers/webgl/shaders/StripShader.js +++ /dev/null @@ -1,57 +0,0 @@ -var Shader = require('./Shader'), - WebGLShaderManager = require('../managers/WebGLShaderManager'); - -/** - * @class - * @namespace PIXI - * @param shaderManager {WebGLShaderManager} The webgl shader manager this shader works for. - */ -function StripShader(shaderManager) -{ - Shader.call(this, - shaderManager, - // vertex shader - [ - 'attribute vec2 aVertexPosition;', - 'attribute vec2 aTextureCoord;', - // 'attribute vec4 aColor;', - - 'uniform mat3 translationMatrix;', - 'uniform vec2 projectionVector;', - 'uniform vec2 offsetVector;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);', - ' v -= offsetVector.xyx;', - ' gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);', - ' vTextureCoord = aTextureCoord;', - '}' - ].join('\n'), - // fragment shader - [ - 'precision mediump float;', - - 'uniform float alpha;', - 'uniform sampler2D uSampler;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * alpha;', - '}' - ].join('\n'), - // custom uniforms - { - alpha: { type: '1f', value: 0 }, - translationMatrix: { type: 'mat3', value: new Float32Array(9) } - } - ); -} - -StripShader.prototype = Object.create(Shader.prototype); -StripShader.prototype.constructor = StripShader; -module.exports = StripShader; - -WebGLShaderManager.registerPlugin('stripShader', StripShader); diff --git a/src/extras/StripShader.js b/src/extras/StripShader.js new file mode 100644 index 0000000..3e7c47f --- /dev/null +++ b/src/extras/StripShader.js @@ -0,0 +1,56 @@ +var core = require('../core'); + +/** + * @class + * @namespace PIXI + * @param shaderManager {WebGLShaderManager} The webgl shader manager this shader works for. + */ +function StripShader(shaderManager) +{ + core.Shader.call(this, + shaderManager, + // vertex shader + [ + 'attribute vec2 aVertexPosition;', + 'attribute vec2 aTextureCoord;', + // 'attribute vec4 aColor;', + + 'uniform mat3 translationMatrix;', + 'uniform vec2 projectionVector;', + 'uniform vec2 offsetVector;', + + 'varying vec2 vTextureCoord;', + + 'void main(void){', + ' vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);', + ' v -= offsetVector.xyx;', + ' gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);', + ' vTextureCoord = aTextureCoord;', + '}' + ].join('\n'), + // fragment shader + [ + 'precision mediump float;', + + 'uniform float alpha;', + 'uniform sampler2D uSampler;', + + 'varying vec2 vTextureCoord;', + + 'void main(void){', + ' gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * alpha;', + '}' + ].join('\n'), + // custom uniforms + { + alpha: { type: '1f', value: 0 }, + translationMatrix: { type: 'mat3', value: new Float32Array(9) } + } + ); +} + +StripShader.prototype = Object.create(core.Shader.prototype); +StripShader.prototype.constructor = StripShader; +module.exports = StripShader; + +core.WebGLShaderManager.registerPlugin('stripShader', StripShader); diff --git a/src/core/index.js b/src/core/index.js index 0ac5cf8..1d0a398 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -42,10 +42,8 @@ CanvasBuffer: require('./renderers/canvas/utils/CanvasBuffer'), // renderers - webgl - WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - // WebGLGraphics: require('./renderers/webgl/utils/WebGLGraphics'), - - + WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + Shader: require('./renderers/webgl/shaders/Shader'), /** * This helper function will automatically detect which renderer you should be using. diff --git a/src/core/renderers/webgl/shaders/StripShader.js b/src/core/renderers/webgl/shaders/StripShader.js deleted file mode 100644 index 1fbd9ef..0000000 --- a/src/core/renderers/webgl/shaders/StripShader.js +++ /dev/null @@ -1,57 +0,0 @@ -var Shader = require('./Shader'), - WebGLShaderManager = require('../managers/WebGLShaderManager'); - -/** - * @class - * @namespace PIXI - * @param shaderManager {WebGLShaderManager} The webgl shader manager this shader works for. - */ -function StripShader(shaderManager) -{ - Shader.call(this, - shaderManager, - // vertex shader - [ - 'attribute vec2 aVertexPosition;', - 'attribute vec2 aTextureCoord;', - // 'attribute vec4 aColor;', - - 'uniform mat3 translationMatrix;', - 'uniform vec2 projectionVector;', - 'uniform vec2 offsetVector;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);', - ' v -= offsetVector.xyx;', - ' gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);', - ' vTextureCoord = aTextureCoord;', - '}' - ].join('\n'), - // fragment shader - [ - 'precision mediump float;', - - 'uniform float alpha;', - 'uniform sampler2D uSampler;', - - 'varying vec2 vTextureCoord;', - - 'void main(void){', - ' gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * alpha;', - '}' - ].join('\n'), - // custom uniforms - { - alpha: { type: '1f', value: 0 }, - translationMatrix: { type: 'mat3', value: new Float32Array(9) } - } - ); -} - -StripShader.prototype = Object.create(Shader.prototype); -StripShader.prototype.constructor = StripShader; -module.exports = StripShader; - -WebGLShaderManager.registerPlugin('stripShader', StripShader); diff --git a/src/extras/StripShader.js b/src/extras/StripShader.js new file mode 100644 index 0000000..3e7c47f --- /dev/null +++ b/src/extras/StripShader.js @@ -0,0 +1,56 @@ +var core = require('../core'); + +/** + * @class + * @namespace PIXI + * @param shaderManager {WebGLShaderManager} The webgl shader manager this shader works for. + */ +function StripShader(shaderManager) +{ + core.Shader.call(this, + shaderManager, + // vertex shader + [ + 'attribute vec2 aVertexPosition;', + 'attribute vec2 aTextureCoord;', + // 'attribute vec4 aColor;', + + 'uniform mat3 translationMatrix;', + 'uniform vec2 projectionVector;', + 'uniform vec2 offsetVector;', + + 'varying vec2 vTextureCoord;', + + 'void main(void){', + ' vec3 v = translationMatrix * vec3(aVertexPosition , 1.0);', + ' v -= offsetVector.xyx;', + ' gl_Position = vec4( v.x / projectionVector.x -1.0, v.y / -projectionVector.y + 1.0 , 0.0, 1.0);', + ' vTextureCoord = aTextureCoord;', + '}' + ].join('\n'), + // fragment shader + [ + 'precision mediump float;', + + 'uniform float alpha;', + 'uniform sampler2D uSampler;', + + 'varying vec2 vTextureCoord;', + + 'void main(void){', + ' gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.x, vTextureCoord.y)) * alpha;', + '}' + ].join('\n'), + // custom uniforms + { + alpha: { type: '1f', value: 0 }, + translationMatrix: { type: 'mat3', value: new Float32Array(9) } + } + ); +} + +StripShader.prototype = Object.create(core.Shader.prototype); +StripShader.prototype.constructor = StripShader; +module.exports = StripShader; + +core.WebGLShaderManager.registerPlugin('stripShader', StripShader); diff --git a/src/extras/index.js b/src/extras/index.js index 7eea136..f80b7ba 100644 --- a/src/extras/index.js +++ b/src/extras/index.js @@ -12,5 +12,6 @@ MovieClip: require('./MovieClip'), Rope: require('./Rope'), Strip: require('./Strip'), + StripShader: require('./StripShader'), TilingSprite: require('./TilingSprite') };