diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 297cb75..225beb0 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -159,7 +159,7 @@ } context.drawImage( - source, + sprite._tintedCanvas, 0, 0, width * resolution, diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 297cb75..225beb0 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -159,7 +159,7 @@ } context.drawImage( - source, + sprite._tintedCanvas, 0, 0, width * resolution, diff --git a/packages/canvas/canvas-sprite/src/Sprite.js b/packages/canvas/canvas-sprite/src/Sprite.js index 4bef51d..d94950f 100644 --- a/packages/canvas/canvas-sprite/src/Sprite.js +++ b/packages/canvas/canvas-sprite/src/Sprite.js @@ -9,14 +9,6 @@ Sprite.prototype._tintedCanvas = null; /** - * Cached tint value so we can tell when the tint is changed. - * @memberof PIXI.Sprite# - * @member {number} _cachedTint - * @protected - */ -Sprite.prototype._cachedTint = 0xFFFFFF; - -/** * Renders the object using the Canvas renderer * * @private diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 297cb75..225beb0 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -159,7 +159,7 @@ } context.drawImage( - source, + sprite._tintedCanvas, 0, 0, width * resolution, diff --git a/packages/canvas/canvas-sprite/src/Sprite.js b/packages/canvas/canvas-sprite/src/Sprite.js index 4bef51d..d94950f 100644 --- a/packages/canvas/canvas-sprite/src/Sprite.js +++ b/packages/canvas/canvas-sprite/src/Sprite.js @@ -9,14 +9,6 @@ Sprite.prototype._tintedCanvas = null; /** - * Cached tint value so we can tell when the tint is changed. - * @memberof PIXI.Sprite# - * @member {number} _cachedTint - * @protected - */ -Sprite.prototype._cachedTint = 0xFFFFFF; - -/** * Renders the object using the Canvas renderer * * @private diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index 5adaba2..5b63574 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -296,7 +296,7 @@ this._texture = this._textures[this.currentFrame]; this._textureID = -1; this._textureTrimmedID = -1; - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this.uvs = this._texture._uvs.uvsFloat32; if (this.updateAnchor) diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 297cb75..225beb0 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -159,7 +159,7 @@ } context.drawImage( - source, + sprite._tintedCanvas, 0, 0, width * resolution, diff --git a/packages/canvas/canvas-sprite/src/Sprite.js b/packages/canvas/canvas-sprite/src/Sprite.js index 4bef51d..d94950f 100644 --- a/packages/canvas/canvas-sprite/src/Sprite.js +++ b/packages/canvas/canvas-sprite/src/Sprite.js @@ -9,14 +9,6 @@ Sprite.prototype._tintedCanvas = null; /** - * Cached tint value so we can tell when the tint is changed. - * @memberof PIXI.Sprite# - * @member {number} _cachedTint - * @protected - */ -Sprite.prototype._cachedTint = 0xFFFFFF; - -/** * Renders the object using the Canvas renderer * * @private diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index 5adaba2..5b63574 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -296,7 +296,7 @@ this._texture = this._textures[this.currentFrame]; this._textureID = -1; this._textureTrimmedID = -1; - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this.uvs = this._texture._uvs.uvsFloat32; if (this.updateAnchor) diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 8bde45e..9f381ab 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -137,7 +137,7 @@ { this.uvMatrix.texture = this._texture; } - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; } /** diff --git a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js index 8f4e0e4..4eac1d7 100644 --- a/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js +++ b/packages/canvas/canvas-sprite-tiling/src/TilingSprite.js @@ -29,7 +29,7 @@ const modY = ((this.tilePosition.y / this.tileScale.y) % texture._frame.height) * baseTextureResolution; // create a nice shiny pattern! - if (this._textureID !== this._texture._updateID || this.cachedTint !== this.tint) + if (this._textureID !== this._texture._updateID || this._cachedTint !== this.tint) { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. @@ -48,7 +48,7 @@ tempCanvas.context.drawImage(source, -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } - this.cachedTint = this.tint; + this._cachedTint = this.tint; this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 297cb75..225beb0 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -159,7 +159,7 @@ } context.drawImage( - source, + sprite._tintedCanvas, 0, 0, width * resolution, diff --git a/packages/canvas/canvas-sprite/src/Sprite.js b/packages/canvas/canvas-sprite/src/Sprite.js index 4bef51d..d94950f 100644 --- a/packages/canvas/canvas-sprite/src/Sprite.js +++ b/packages/canvas/canvas-sprite/src/Sprite.js @@ -9,14 +9,6 @@ Sprite.prototype._tintedCanvas = null; /** - * Cached tint value so we can tell when the tint is changed. - * @memberof PIXI.Sprite# - * @member {number} _cachedTint - * @protected - */ -Sprite.prototype._cachedTint = 0xFFFFFF; - -/** * Renders the object using the Canvas renderer * * @private diff --git a/packages/sprite-animated/src/AnimatedSprite.js b/packages/sprite-animated/src/AnimatedSprite.js index 5adaba2..5b63574 100644 --- a/packages/sprite-animated/src/AnimatedSprite.js +++ b/packages/sprite-animated/src/AnimatedSprite.js @@ -296,7 +296,7 @@ this._texture = this._textures[this.currentFrame]; this._textureID = -1; this._textureTrimmedID = -1; - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this.uvs = this._texture._uvs.uvsFloat32; if (this.updateAnchor) diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index 8bde45e..9f381ab 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -137,7 +137,7 @@ { this.uvMatrix.texture = this._texture; } - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; } /** diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index e1604a9..b2047de 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -114,13 +114,14 @@ this.shader = null; /** - * An internal cached value of the tint. + * Cached tint value so we can tell when the tint is changed. + * Value is used for 2d CanvasRenderer. * - * @private + * @protected * @member {number} * @default 0xFFFFFF */ - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this.uvs = null; @@ -188,7 +189,7 @@ { this._textureID = -1; this._textureTrimmedID = -1; - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this.uvs = this._texture._uvs.uvsFloat32; // so if _width is 0 then width was not set.. @@ -622,7 +623,7 @@ } this._texture = value || Texture.EMPTY; - this.cachedTint = 0xFFFFFF; + this._cachedTint = 0xFFFFFF; this._textureID = -1; this._textureTrimmedID = -1;