diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index ae25627..4e82baa 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -335,7 +335,7 @@ gl.clear(gl.COLOR_BUFFER_BIT); } - this.renderDisplayObject(object, this.renderTarget)//this.projection); + this.renderDisplayObject(object, this.renderTarget);//this.projection); }; /** diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index ae25627..4e82baa 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -335,7 +335,7 @@ gl.clear(gl.COLOR_BUFFER_BIT); } - this.renderDisplayObject(object, this.renderTarget)//this.projection); + this.renderDisplayObject(object, this.renderTarget);//this.projection); }; /** diff --git a/src/core/renderers/webgl/managers/WebGLShaderManager.js b/src/core/renderers/webgl/managers/WebGLShaderManager.js index d4059f7..dd73b77 100644 --- a/src/core/renderers/webgl/managers/WebGLShaderManager.js +++ b/src/core/renderers/webgl/managers/WebGLShaderManager.js @@ -1,4 +1,5 @@ -var WebGLManager = require('./WebGLManager'); +var WebGLManager = require('./WebGLManager'), + utils = require('../../../utils'); /** * @class @@ -50,7 +51,7 @@ // listen for context and update necessary shaders var self = this; - this.renderer.on('context', function (event) + this.renderer.on('context', function () { for (var o in this.plugins) { diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index ae25627..4e82baa 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -335,7 +335,7 @@ gl.clear(gl.COLOR_BUFFER_BIT); } - this.renderDisplayObject(object, this.renderTarget)//this.projection); + this.renderDisplayObject(object, this.renderTarget);//this.projection); }; /** diff --git a/src/core/renderers/webgl/managers/WebGLShaderManager.js b/src/core/renderers/webgl/managers/WebGLShaderManager.js index d4059f7..dd73b77 100644 --- a/src/core/renderers/webgl/managers/WebGLShaderManager.js +++ b/src/core/renderers/webgl/managers/WebGLShaderManager.js @@ -1,4 +1,5 @@ -var WebGLManager = require('./WebGLManager'); +var WebGLManager = require('./WebGLManager'), + utils = require('../../../utils'); /** * @class @@ -50,7 +51,7 @@ // listen for context and update necessary shaders var self = this; - this.renderer.on('context', function (event) + this.renderer.on('context', function () { for (var o in this.plugins) { diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index a537fe4..43e2d00 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -33,7 +33,7 @@ * @property texture * @type Any */ - this.texture = null + this.texture = null; this.width = 0; this.height = 0; @@ -56,11 +56,11 @@ this.frameBuffer = gl.createFramebuffer(); - /* + /* A frame buffer needs a target to render to.. create a texture and bind it attach it to the framebuffer.. */ - + this.texture = gl.createTexture(); gl.bindTexture(gl.TEXTURE_2D, this.texture); @@ -70,13 +70,13 @@ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, scaleMode === CONST.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); - + gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this.texture, 0); - - /* + + /* The stencil buffer is used for masking in pixi lets create one and then add attach it to the framebuffer.. */ @@ -86,7 +86,7 @@ } this.resize(width, height); - + }; RenderTarget.prototype.constructor = RenderTarget; @@ -94,21 +94,21 @@ /** * Clears the filter texture. -* +* * @method clear */ RenderTarget.prototype.clear = function() { var gl = this.gl; - + gl.clearColor(0,0,0, 0); gl.clear(gl.COLOR_BUFFER_BIT); }; RenderTarget.prototype.activate = function() { - this.gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); -} + this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.frameBuffer); +}; /** * Resizes the texture to the specified width and height @@ -119,15 +119,17 @@ */ RenderTarget.prototype.resize = function(width, height) { - if(this.width === width && this.height === height) return; + if (this.width === width && this.height === height) { + return; + } this.width = width; this.height = height; this.projectionMatrix = new math.Matrix(); - - if(!this.root) + + if (!this.root) { var gl = this.gl; @@ -155,7 +157,7 @@ /** * Destroys the filter texture. -* +* * @method destroy */ RenderTarget.prototype.destroy = function() diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index ae25627..4e82baa 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -335,7 +335,7 @@ gl.clear(gl.COLOR_BUFFER_BIT); } - this.renderDisplayObject(object, this.renderTarget)//this.projection); + this.renderDisplayObject(object, this.renderTarget);//this.projection); }; /** diff --git a/src/core/renderers/webgl/managers/WebGLShaderManager.js b/src/core/renderers/webgl/managers/WebGLShaderManager.js index d4059f7..dd73b77 100644 --- a/src/core/renderers/webgl/managers/WebGLShaderManager.js +++ b/src/core/renderers/webgl/managers/WebGLShaderManager.js @@ -1,4 +1,5 @@ -var WebGLManager = require('./WebGLManager'); +var WebGLManager = require('./WebGLManager'), + utils = require('../../../utils'); /** * @class @@ -50,7 +51,7 @@ // listen for context and update necessary shaders var self = this; - this.renderer.on('context', function (event) + this.renderer.on('context', function () { for (var o in this.plugins) { diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index a537fe4..43e2d00 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -33,7 +33,7 @@ * @property texture * @type Any */ - this.texture = null + this.texture = null; this.width = 0; this.height = 0; @@ -56,11 +56,11 @@ this.frameBuffer = gl.createFramebuffer(); - /* + /* A frame buffer needs a target to render to.. create a texture and bind it attach it to the framebuffer.. */ - + this.texture = gl.createTexture(); gl.bindTexture(gl.TEXTURE_2D, this.texture); @@ -70,13 +70,13 @@ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, scaleMode === CONST.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); - + gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this.texture, 0); - - /* + + /* The stencil buffer is used for masking in pixi lets create one and then add attach it to the framebuffer.. */ @@ -86,7 +86,7 @@ } this.resize(width, height); - + }; RenderTarget.prototype.constructor = RenderTarget; @@ -94,21 +94,21 @@ /** * Clears the filter texture. -* +* * @method clear */ RenderTarget.prototype.clear = function() { var gl = this.gl; - + gl.clearColor(0,0,0, 0); gl.clear(gl.COLOR_BUFFER_BIT); }; RenderTarget.prototype.activate = function() { - this.gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); -} + this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.frameBuffer); +}; /** * Resizes the texture to the specified width and height @@ -119,15 +119,17 @@ */ RenderTarget.prototype.resize = function(width, height) { - if(this.width === width && this.height === height) return; + if (this.width === width && this.height === height) { + return; + } this.width = width; this.height = height; this.projectionMatrix = new math.Matrix(); - - if(!this.root) + + if (!this.root) { var gl = this.gl; @@ -155,7 +157,7 @@ /** * Destroys the filter texture. -* +* * @method destroy */ RenderTarget.prototype.destroy = function() diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index f808078..6e2dad2 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -2,7 +2,6 @@ Shader = require('../../renderers/webgl/shaders/Shader'), SpriteShader = require('../../renderers/webgl/shaders/SpriteShader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'); - math = require('../../math'); /** * @author Mat Groves @@ -167,9 +166,6 @@ */ this.shader = null; - // listen for context and update necessary buffers - var self = this; - this.setupContext(); } @@ -387,7 +383,7 @@ var batchSize = 0; var start = 0; - var currentBaseTexture = sprite; + var currentBaseTexture = null; var currentBlendMode = this.renderer.blendModeManager.currentBlendMode; var currentShader = null; diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 8db9b45..baab0f8 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -1,5 +1,5 @@ var DisplayObjectContainer = require('../display/DisplayObjectContainer'), - //Sprite = require('../display/Sprite'), + Sprite = require('../display/Sprite'), Texture = require('../textures/Texture'), CanvasBuffer = require('../renderers/canvas/utils/CanvasBuffer'), CanvasGraphics = require('../renderers/canvas/utils/CanvasGraphics'), diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index a12cbdc..d812d8e 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,9 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var projection = renderer.projection, - offset = renderer.offset, - shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.primitiveShader, webGLData; if (graphics.dirty) diff --git a/src/core/math/Matrix.js b/src/core/math/Matrix.js index a086950..81de05c 100644 --- a/src/core/math/Matrix.js +++ b/src/core/math/Matrix.js @@ -268,6 +268,6 @@ matrix.ty = this.ty; return matrix; -} +}; Matrix.IDENTITY = new Matrix(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index ae25627..4e82baa 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -335,7 +335,7 @@ gl.clear(gl.COLOR_BUFFER_BIT); } - this.renderDisplayObject(object, this.renderTarget)//this.projection); + this.renderDisplayObject(object, this.renderTarget);//this.projection); }; /** diff --git a/src/core/renderers/webgl/managers/WebGLShaderManager.js b/src/core/renderers/webgl/managers/WebGLShaderManager.js index d4059f7..dd73b77 100644 --- a/src/core/renderers/webgl/managers/WebGLShaderManager.js +++ b/src/core/renderers/webgl/managers/WebGLShaderManager.js @@ -1,4 +1,5 @@ -var WebGLManager = require('./WebGLManager'); +var WebGLManager = require('./WebGLManager'), + utils = require('../../../utils'); /** * @class @@ -50,7 +51,7 @@ // listen for context and update necessary shaders var self = this; - this.renderer.on('context', function (event) + this.renderer.on('context', function () { for (var o in this.plugins) { diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index a537fe4..43e2d00 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -33,7 +33,7 @@ * @property texture * @type Any */ - this.texture = null + this.texture = null; this.width = 0; this.height = 0; @@ -56,11 +56,11 @@ this.frameBuffer = gl.createFramebuffer(); - /* + /* A frame buffer needs a target to render to.. create a texture and bind it attach it to the framebuffer.. */ - + this.texture = gl.createTexture(); gl.bindTexture(gl.TEXTURE_2D, this.texture); @@ -70,13 +70,13 @@ gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, scaleMode === CONST.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); - + gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this.texture, 0); - - /* + + /* The stencil buffer is used for masking in pixi lets create one and then add attach it to the framebuffer.. */ @@ -86,7 +86,7 @@ } this.resize(width, height); - + }; RenderTarget.prototype.constructor = RenderTarget; @@ -94,21 +94,21 @@ /** * Clears the filter texture. -* +* * @method clear */ RenderTarget.prototype.clear = function() { var gl = this.gl; - + gl.clearColor(0,0,0, 0); gl.clear(gl.COLOR_BUFFER_BIT); }; RenderTarget.prototype.activate = function() { - this.gl.bindFramebuffer(gl.FRAMEBUFFER, this.frameBuffer ); -} + this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.frameBuffer); +}; /** * Resizes the texture to the specified width and height @@ -119,15 +119,17 @@ */ RenderTarget.prototype.resize = function(width, height) { - if(this.width === width && this.height === height) return; + if (this.width === width && this.height === height) { + return; + } this.width = width; this.height = height; this.projectionMatrix = new math.Matrix(); - - if(!this.root) + + if (!this.root) { var gl = this.gl; @@ -155,7 +157,7 @@ /** * Destroys the filter texture. -* +* * @method destroy */ RenderTarget.prototype.destroy = function() diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index f808078..6e2dad2 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -2,7 +2,6 @@ Shader = require('../../renderers/webgl/shaders/Shader'), SpriteShader = require('../../renderers/webgl/shaders/SpriteShader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'); - math = require('../../math'); /** * @author Mat Groves @@ -167,9 +166,6 @@ */ this.shader = null; - // listen for context and update necessary buffers - var self = this; - this.setupContext(); } @@ -387,7 +383,7 @@ var batchSize = 0; var start = 0; - var currentBaseTexture = sprite; + var currentBaseTexture = null; var currentBlendMode = this.renderer.blendModeManager.currentBlendMode; var currentShader = null; diff --git a/src/core/utils/pluginTarget.js b/src/core/utils/pluginTarget.js index c394389..885fe0e 100644 --- a/src/core/utils/pluginTarget.js +++ b/src/core/utils/pluginTarget.js @@ -31,7 +31,7 @@ } this.plugins = null; - } + }; } module.exports = pluginTarget;