diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index 30043ab..8481c92 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -76,6 +76,7 @@ */ ParticleRenderer.prototype.onContextChange = function () { + return; var gl = this.renderer.gl; // setup default shader diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index 30043ab..8481c92 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -76,6 +76,7 @@ */ ParticleRenderer.prototype.onContextChange = function () { + return; var gl = this.renderer.gl; // setup default shader diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d76a090..968c774 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -1,5 +1,4 @@ var SystemRenderer = require('../SystemRenderer'), - ShaderManager = require('./managers/ShaderManager'), MaskManager = require('./managers/MaskManager'), StencilManager = require('./managers/StencilManager'), FilterManager = require('./managers/FilterManager'), @@ -75,13 +74,6 @@ this._backgroundColorRgba[3] = this.transparent ? 0 : 1; /** - * Deals with managing the shader programs and their attribs. - * - * @member {PIXI.ShaderManager} - */ - this.shaderManager = new ShaderManager(this); - - /** * Manages the masks using the stencil buffer. * * @member {PIXI.MaskManager} @@ -398,13 +390,11 @@ this.uid = 0; // destroy the managers - this.shaderManager.destroy(); this.maskManager.destroy(); this.stencilManager.destroy(); this.filterManager.destroy(); this.blendModeManager.destroy(); - this.shaderManager = null; this.maskManager = null; this.filterManager = null; this.blendModeManager = null; diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index 30043ab..8481c92 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -76,6 +76,7 @@ */ ParticleRenderer.prototype.onContextChange = function () { + return; var gl = this.renderer.gl; // setup default shader diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d76a090..968c774 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -1,5 +1,4 @@ var SystemRenderer = require('../SystemRenderer'), - ShaderManager = require('./managers/ShaderManager'), MaskManager = require('./managers/MaskManager'), StencilManager = require('./managers/StencilManager'), FilterManager = require('./managers/FilterManager'), @@ -75,13 +74,6 @@ this._backgroundColorRgba[3] = this.transparent ? 0 : 1; /** - * Deals with managing the shader programs and their attribs. - * - * @member {PIXI.ShaderManager} - */ - this.shaderManager = new ShaderManager(this); - - /** * Manages the masks using the stencil buffer. * * @member {PIXI.MaskManager} @@ -398,13 +390,11 @@ this.uid = 0; // destroy the managers - this.shaderManager.destroy(); this.maskManager.destroy(); this.stencilManager.destroy(); this.filterManager.destroy(); this.blendModeManager.destroy(); - this.shaderManager = null; this.maskManager = null; this.filterManager = null; this.blendModeManager = null; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 1a95736..8bd7572 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,6 +1,6 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), TextureShader = require('../../renderers/webgl/shaders/_TextureShader'), + WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), createIndicesForQuads = require('../../utils/createIndicesForQuads'), generateMultiTextureShader = require('./generateMultiTextureShader'), CONST = require('../../const'), @@ -136,10 +136,7 @@ this.MAX_TEXTUES = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); - this._shader = generateMultiTextureShader(gl, this.MAX_TEXTUES)//new TextureShader(gl); - - // setup default shader - this.shader = this.renderer.shaderManager.defaultShader; + this.shader = generateMultiTextureShader(gl, this.MAX_TEXTUES); // create a couple of buffers this.vertexBuffer = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); @@ -148,10 +145,10 @@ // build the vao object that will render.. this.vao = new glCore.VertexArrayObject(gl) .addIndex(this.indexBuffer) - .addAttribute(this.vertexBuffer, this._shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); + .addAttribute(this.vertexBuffer, this.shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); this.currentBlendMode = 99999; }; @@ -291,7 +288,7 @@ } // bind shader.. - this.renderer.bindShader(this._shader); + this.renderer.bindShader(this.shader); this.renderer.blendModeManager.setBlendMode( 0 ); /// render the groups.. diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index 30043ab..8481c92 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -76,6 +76,7 @@ */ ParticleRenderer.prototype.onContextChange = function () { + return; var gl = this.renderer.gl; // setup default shader diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d76a090..968c774 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -1,5 +1,4 @@ var SystemRenderer = require('../SystemRenderer'), - ShaderManager = require('./managers/ShaderManager'), MaskManager = require('./managers/MaskManager'), StencilManager = require('./managers/StencilManager'), FilterManager = require('./managers/FilterManager'), @@ -75,13 +74,6 @@ this._backgroundColorRgba[3] = this.transparent ? 0 : 1; /** - * Deals with managing the shader programs and their attribs. - * - * @member {PIXI.ShaderManager} - */ - this.shaderManager = new ShaderManager(this); - - /** * Manages the masks using the stencil buffer. * * @member {PIXI.MaskManager} @@ -398,13 +390,11 @@ this.uid = 0; // destroy the managers - this.shaderManager.destroy(); this.maskManager.destroy(); this.stencilManager.destroy(); this.filterManager.destroy(); this.blendModeManager.destroy(); - this.shaderManager = null; this.maskManager = null; this.filterManager = null; this.blendModeManager = null; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 1a95736..8bd7572 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,6 +1,6 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), TextureShader = require('../../renderers/webgl/shaders/_TextureShader'), + WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), createIndicesForQuads = require('../../utils/createIndicesForQuads'), generateMultiTextureShader = require('./generateMultiTextureShader'), CONST = require('../../const'), @@ -136,10 +136,7 @@ this.MAX_TEXTUES = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); - this._shader = generateMultiTextureShader(gl, this.MAX_TEXTUES)//new TextureShader(gl); - - // setup default shader - this.shader = this.renderer.shaderManager.defaultShader; + this.shader = generateMultiTextureShader(gl, this.MAX_TEXTUES); // create a couple of buffers this.vertexBuffer = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); @@ -148,10 +145,10 @@ // build the vao object that will render.. this.vao = new glCore.VertexArrayObject(gl) .addIndex(this.indexBuffer) - .addAttribute(this.vertexBuffer, this._shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); + .addAttribute(this.vertexBuffer, this.shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); this.currentBlendMode = 99999; }; @@ -291,7 +288,7 @@ } // bind shader.. - this.renderer.bindShader(this._shader); + this.renderer.bindShader(this.shader); this.renderer.blendModeManager.setBlendMode( 0 ); /// render the groups.. diff --git a/src/index.js b/src/index.js index aa515c8..a864110 100644 --- a/src/index.js +++ b/src/index.js @@ -4,11 +4,11 @@ var core = module.exports = require('./core'); // add core plugins. -core.extras = require('./extras'); -core.filters = require('./filters'); +//core.extras = require('./extras'); +//core.filters = require('./filters'); core.interaction = require('./interaction'); core.loaders = require('./loaders'); -core.mesh = require('./mesh'); +//core.mesh = require('./mesh'); core.accessibility = require('./accessibility'); // export a premade loader instance diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index 30043ab..8481c92 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -76,6 +76,7 @@ */ ParticleRenderer.prototype.onContextChange = function () { + return; var gl = this.renderer.gl; // setup default shader diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d76a090..968c774 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -1,5 +1,4 @@ var SystemRenderer = require('../SystemRenderer'), - ShaderManager = require('./managers/ShaderManager'), MaskManager = require('./managers/MaskManager'), StencilManager = require('./managers/StencilManager'), FilterManager = require('./managers/FilterManager'), @@ -75,13 +74,6 @@ this._backgroundColorRgba[3] = this.transparent ? 0 : 1; /** - * Deals with managing the shader programs and their attribs. - * - * @member {PIXI.ShaderManager} - */ - this.shaderManager = new ShaderManager(this); - - /** * Manages the masks using the stencil buffer. * * @member {PIXI.MaskManager} @@ -398,13 +390,11 @@ this.uid = 0; // destroy the managers - this.shaderManager.destroy(); this.maskManager.destroy(); this.stencilManager.destroy(); this.filterManager.destroy(); this.blendModeManager.destroy(); - this.shaderManager = null; this.maskManager = null; this.filterManager = null; this.blendModeManager = null; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 1a95736..8bd7572 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,6 +1,6 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), TextureShader = require('../../renderers/webgl/shaders/_TextureShader'), + WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), createIndicesForQuads = require('../../utils/createIndicesForQuads'), generateMultiTextureShader = require('./generateMultiTextureShader'), CONST = require('../../const'), @@ -136,10 +136,7 @@ this.MAX_TEXTUES = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); - this._shader = generateMultiTextureShader(gl, this.MAX_TEXTUES)//new TextureShader(gl); - - // setup default shader - this.shader = this.renderer.shaderManager.defaultShader; + this.shader = generateMultiTextureShader(gl, this.MAX_TEXTUES); // create a couple of buffers this.vertexBuffer = glCore.GLBuffer.createVertexBuffer(gl, null, gl.DYNAMIC_DRAW); @@ -148,10 +145,10 @@ // build the vao object that will render.. this.vao = new glCore.VertexArrayObject(gl) .addIndex(this.indexBuffer) - .addAttribute(this.vertexBuffer, this._shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) - .addAttribute(this.vertexBuffer, this._shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); + .addAttribute(this.vertexBuffer, this.shader.attributes.aVertexPosition, gl.FLOAT, false, this.vertByteSize, 0) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureCoord, gl.UNSIGNED_SHORT, true, this.vertByteSize, 2 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aColor, gl.UNSIGNED_BYTE, true, this.vertByteSize, 3 * 4) + .addAttribute(this.vertexBuffer, this.shader.attributes.aTextureId, gl.FLOAT, false, this.vertByteSize, 4 * 4); this.currentBlendMode = 99999; }; @@ -291,7 +288,7 @@ } // bind shader.. - this.renderer.bindShader(this._shader); + this.renderer.bindShader(this.shader); this.renderer.blendModeManager.setBlendMode( 0 ); /// render the groups.. diff --git a/src/index.js b/src/index.js index aa515c8..a864110 100644 --- a/src/index.js +++ b/src/index.js @@ -4,11 +4,11 @@ var core = module.exports = require('./core'); // add core plugins. -core.extras = require('./extras'); -core.filters = require('./filters'); +//core.extras = require('./extras'); +//core.filters = require('./filters'); core.interaction = require('./interaction'); core.loaders = require('./loaders'); -core.mesh = require('./mesh'); +//core.mesh = require('./mesh'); core.accessibility = require('./accessibility'); // export a premade loader instance diff --git a/src/mesh/webgl/MeshShader.js b/src/mesh/webgl/MeshShader.js index faa6eec..beababb 100644 --- a/src/mesh/webgl/MeshShader.js +++ b/src/mesh/webgl/MeshShader.js @@ -56,4 +56,3 @@ MeshShader.prototype.constructor = MeshShader; module.exports = MeshShader; -core.ShaderManager.registerPlugin('meshShader', MeshShader);