diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index c3fabda..0bdd3e6 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -104,7 +104,7 @@ /** * The canvas 2d context that everything is drawn with * @property context - * @type CanvasRenderingContext2D 2d Context + * @type CanvasRenderingContext2D */ this.context = this.view.getContext( "2d", { alpha: this.transparent } ); @@ -221,6 +221,28 @@ }; /** + * Removes everything from the renderer and optionally removes the Canvas DOM element. + * + * @method destroy + * @param [removeView=true] {boolean} Removes the Canvas element from the DOM. + */ +PIXI.CanvasRenderer.prototype.destroy = function(removeView) +{ + if (typeof removeView === "undefined") { removeView = true; } + + if (removeView && this.view.parent) + { + this.view.parent.removeChild(this.view); + } + + this.view = null; + this.context = null; + this.maskManager = null; + this.renderSession = null; + +}; + +/** * Resizes the canvas view to the specified width and height * * @method resize diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index c3fabda..0bdd3e6 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -104,7 +104,7 @@ /** * The canvas 2d context that everything is drawn with * @property context - * @type CanvasRenderingContext2D 2d Context + * @type CanvasRenderingContext2D */ this.context = this.view.getContext( "2d", { alpha: this.transparent } ); @@ -221,6 +221,28 @@ }; /** + * Removes everything from the renderer and optionally removes the Canvas DOM element. + * + * @method destroy + * @param [removeView=true] {boolean} Removes the Canvas element from the DOM. + */ +PIXI.CanvasRenderer.prototype.destroy = function(removeView) +{ + if (typeof removeView === "undefined") { removeView = true; } + + if (removeView && this.view.parent) + { + this.view.parent.removeChild(this.view); + } + + this.view = null; + this.context = null; + this.maskManager = null; + this.renderSession = null; + +}; + +/** * Resizes the canvas view to the specified width and height * * @method resize diff --git a/src/pixi/renderers/canvas/utils/CanvasTinter.js b/src/pixi/renderers/canvas/utils/CanvasTinter.js index 76084ff..33da9e1 100644 --- a/src/pixi/renderers/canvas/utils/CanvasTinter.js +++ b/src/pixi/renderers/canvas/utils/CanvasTinter.js @@ -105,7 +105,7 @@ * Tint a texture using the "overlay" operation. * * @method tintWithOverlay - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ @@ -140,7 +140,7 @@ * Tint a texture pixel per pixel. * * @method tintPerPixel - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index c3fabda..0bdd3e6 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -104,7 +104,7 @@ /** * The canvas 2d context that everything is drawn with * @property context - * @type CanvasRenderingContext2D 2d Context + * @type CanvasRenderingContext2D */ this.context = this.view.getContext( "2d", { alpha: this.transparent } ); @@ -221,6 +221,28 @@ }; /** + * Removes everything from the renderer and optionally removes the Canvas DOM element. + * + * @method destroy + * @param [removeView=true] {boolean} Removes the Canvas element from the DOM. + */ +PIXI.CanvasRenderer.prototype.destroy = function(removeView) +{ + if (typeof removeView === "undefined") { removeView = true; } + + if (removeView && this.view.parent) + { + this.view.parent.removeChild(this.view); + } + + this.view = null; + this.context = null; + this.maskManager = null; + this.renderSession = null; + +}; + +/** * Resizes the canvas view to the specified width and height * * @method resize diff --git a/src/pixi/renderers/canvas/utils/CanvasTinter.js b/src/pixi/renderers/canvas/utils/CanvasTinter.js index 76084ff..33da9e1 100644 --- a/src/pixi/renderers/canvas/utils/CanvasTinter.js +++ b/src/pixi/renderers/canvas/utils/CanvasTinter.js @@ -105,7 +105,7 @@ * Tint a texture using the "overlay" operation. * * @method tintWithOverlay - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ @@ -140,7 +140,7 @@ * Tint a texture pixel per pixel. * * @method tintPerPixel - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ diff --git a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js index 359a834..fec860d 100644 --- a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js @@ -317,7 +317,7 @@ * * @method applyFilterPass * @param filter {AbstractFilter} the filter that needs to be applied -* @param filterArea {texture} TODO - might need an update +* @param filterArea {Texture} TODO - might need an update * @param width {Number} the horizontal range of the filter * @param height {Number} the vertical range of the filter */ diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index c3fabda..0bdd3e6 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -104,7 +104,7 @@ /** * The canvas 2d context that everything is drawn with * @property context - * @type CanvasRenderingContext2D 2d Context + * @type CanvasRenderingContext2D */ this.context = this.view.getContext( "2d", { alpha: this.transparent } ); @@ -221,6 +221,28 @@ }; /** + * Removes everything from the renderer and optionally removes the Canvas DOM element. + * + * @method destroy + * @param [removeView=true] {boolean} Removes the Canvas element from the DOM. + */ +PIXI.CanvasRenderer.prototype.destroy = function(removeView) +{ + if (typeof removeView === "undefined") { removeView = true; } + + if (removeView && this.view.parent) + { + this.view.parent.removeChild(this.view); + } + + this.view = null; + this.context = null; + this.maskManager = null; + this.renderSession = null; + +}; + +/** * Resizes the canvas view to the specified width and height * * @method resize diff --git a/src/pixi/renderers/canvas/utils/CanvasTinter.js b/src/pixi/renderers/canvas/utils/CanvasTinter.js index 76084ff..33da9e1 100644 --- a/src/pixi/renderers/canvas/utils/CanvasTinter.js +++ b/src/pixi/renderers/canvas/utils/CanvasTinter.js @@ -105,7 +105,7 @@ * Tint a texture using the "overlay" operation. * * @method tintWithOverlay - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ @@ -140,7 +140,7 @@ * Tint a texture pixel per pixel. * * @method tintPerPixel - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ diff --git a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js index 359a834..fec860d 100644 --- a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js @@ -317,7 +317,7 @@ * * @method applyFilterPass * @param filter {AbstractFilter} the filter that needs to be applied -* @param filterArea {texture} TODO - might need an update +* @param filterArea {Texture} TODO - might need an update * @param width {Number} the horizontal range of the filter * @param height {Number} the vertical range of the filter */ diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index 65ebdff..156fefc 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -209,6 +209,7 @@ this.context.strokeStyle = this.style.stroke; this.context.lineWidth = this.style.strokeThickness; this.context.textBaseline = 'alphabetic'; + this.context.lineJoin = 'round'; var linePositionX; var linePositionY; diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 78ec4ea..9ca2577 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -567,7 +567,11 @@ var bounds = this.getLocalBounds(); var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution); - renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) ); + + PIXI.DisplayObject._tempMatrix.tx = -bounds.x; + PIXI.DisplayObject._tempMatrix.ty = -bounds.y; + + renderTexture.render(this, PIXI.DisplayObject._tempMatrix); return renderTexture; }; diff --git a/src/pixi/filters/RGBSplitFilter.js b/src/pixi/filters/RGBSplitFilter.js index ac3bc93..7169637 100644 --- a/src/pixi/filters/RGBSplitFilter.js +++ b/src/pixi/filters/RGBSplitFilter.js @@ -46,17 +46,46 @@ PIXI.RGBSplitFilter.prototype.constructor = PIXI.RGBSplitFilter; /** - * The angle of the split. + * Red channel offset. * - * @property angle - * @type Number + * @property red + * @type Point */ -Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'angle', { +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'red', { get: function() { - return this.uniforms.blur.value / (1/7000); + return this.uniforms.red.value; }, set: function(value) { - //this.padding = value; - this.uniforms.blur.value = (1/7000) * value; + this.uniforms.red.value = value; + } +}); + +/** + * Green channel offset. + * + * @property green + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'green', { + get: function() { + return this.uniforms.green.value; + }, + set: function(value) { + this.uniforms.green.value = value; + } +}); + +/** + * Blue offset. + * + * @property blue + * @type Point + */ +Object.defineProperty(PIXI.RGBSplitFilter.prototype, 'blue', { + get: function() { + return this.uniforms.blue.value; + }, + set: function(value) { + this.uniforms.blue.value = value; } }); diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index c3fabda..0bdd3e6 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -104,7 +104,7 @@ /** * The canvas 2d context that everything is drawn with * @property context - * @type CanvasRenderingContext2D 2d Context + * @type CanvasRenderingContext2D */ this.context = this.view.getContext( "2d", { alpha: this.transparent } ); @@ -221,6 +221,28 @@ }; /** + * Removes everything from the renderer and optionally removes the Canvas DOM element. + * + * @method destroy + * @param [removeView=true] {boolean} Removes the Canvas element from the DOM. + */ +PIXI.CanvasRenderer.prototype.destroy = function(removeView) +{ + if (typeof removeView === "undefined") { removeView = true; } + + if (removeView && this.view.parent) + { + this.view.parent.removeChild(this.view); + } + + this.view = null; + this.context = null; + this.maskManager = null; + this.renderSession = null; + +}; + +/** * Resizes the canvas view to the specified width and height * * @method resize diff --git a/src/pixi/renderers/canvas/utils/CanvasTinter.js b/src/pixi/renderers/canvas/utils/CanvasTinter.js index 76084ff..33da9e1 100644 --- a/src/pixi/renderers/canvas/utils/CanvasTinter.js +++ b/src/pixi/renderers/canvas/utils/CanvasTinter.js @@ -105,7 +105,7 @@ * Tint a texture using the "overlay" operation. * * @method tintWithOverlay - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ @@ -140,7 +140,7 @@ * Tint a texture pixel per pixel. * * @method tintPerPixel - * @param texture {texture} the texture to tint + * @param texture {Texture} the texture to tint * @param color {Number} the color to use to tint the sprite with * @param canvas {HTMLCanvasElement} the current canvas */ diff --git a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js index 359a834..fec860d 100644 --- a/src/pixi/renderers/webgl/utils/WebGLFilterManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLFilterManager.js @@ -317,7 +317,7 @@ * * @method applyFilterPass * @param filter {AbstractFilter} the filter that needs to be applied -* @param filterArea {texture} TODO - might need an update +* @param filterArea {Texture} TODO - might need an update * @param width {Number} the horizontal range of the filter * @param height {Number} the vertical range of the filter */ diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index 65ebdff..156fefc 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -209,6 +209,7 @@ this.context.strokeStyle = this.style.stroke; this.context.lineWidth = this.style.strokeThickness; this.context.textBaseline = 'alphabetic'; + this.context.lineJoin = 'round'; var linePositionX; var linePositionY; diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 2f02ff3..dfb1592 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -276,7 +276,7 @@ * Will return a HTML Image of the texture * * @method getImage - * @return {HTMLImage} + * @return {Image} */ PIXI.RenderTexture.prototype.getImage = function() {