diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index c3edcc6..70cd969 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -181,6 +181,7 @@ this.renderSession.spriteBatch = this.spriteBatch; this.renderSession.stencilManager = this.stencilManager; this.renderSession.renderer = this; + this.renderSession.resolution = this.resolution; gl.disable(gl.DEPTH_TEST); gl.disable(gl.CULL_FACE); diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index c3edcc6..70cd969 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -181,6 +181,7 @@ this.renderSession.spriteBatch = this.spriteBatch; this.renderSession.stencilManager = this.stencilManager; this.renderSession.renderer = this; + this.renderSession.resolution = this.resolution; gl.disable(gl.DEPTH_TEST); gl.disable(gl.CULL_FACE); diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index 8d6c864..8d111a4 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -48,8 +48,6 @@ PIXI.Sprite.call(this, PIXI.Texture.fromCanvas(this.canvas)); - this.texture.baseTexture.resolution = this.resolution; - this.setText(text); this.setStyle(style); @@ -168,8 +166,9 @@ */ PIXI.Text.prototype.updateText = function() { - this.context.font = this.style.font; + this.texture.baseTexture.resolution = this.resolution; + this.context.font = this.style.font; var outputText = this.text; @@ -296,7 +295,6 @@ this._width = this.canvas.width; this._height = this.canvas.height; - this.requiresUpdate = true; }; /** @@ -308,31 +306,39 @@ */ PIXI.Text.prototype._renderWebGL = function(renderSession) { - if(this.requiresUpdate) + if(this.dirty) { - this.requiresUpdate = false; + this.resolution = renderSession.resolution; + + this.updateText(); + this.dirty = false; + PIXI.updateWebGLTexture(this.texture.baseTexture, renderSession.gl); } PIXI.Sprite.prototype._renderWebGL.call(this, renderSession); }; + /** - * Updates the transform of this object - * - * @method updateTransform - * @private - */ -PIXI.Text.prototype.updateTransform = function() +* Renders the object using the WebGL renderer +* +* @method _renderWebGL +* @param renderSession {RenderSession} +* @private +*/ +PIXI.Text.prototype._renderCanvas = function(renderSession) { if(this.dirty) { + this.resolution = renderSession.resolution; + this.updateText(); this.dirty = false; } - - PIXI.Sprite.prototype.updateTransform.call(this); -}; + + PIXI.Sprite.prototype._renderCanvas.call(this, renderSession); +} /* * http://stackoverflow.com/users/34441/ellisbben