diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index b9f192d..46df556 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -295,7 +295,6 @@ this._backgroundColorRgba = null; this._backgroundColorString = null; - this.backgroundColor = 0; this._tempDisplayObjectParent = null; this._lastObjectRendered = null; } diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index b9f192d..46df556 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -295,7 +295,6 @@ this._backgroundColorRgba = null; this._backgroundColorString = null; - this.backgroundColor = 0; this._tempDisplayObjectParent = null; this._lastObjectRendered = null; } diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 8a75780..6282341 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -206,7 +206,8 @@ } else { - tempCanvas.context.drawImage(baseTexture.source, -texture._frame.x, -texture._frame.y); + tempCanvas.context.drawImage(baseTexture.source, + -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index b9f192d..46df556 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -295,7 +295,6 @@ this._backgroundColorRgba = null; this._backgroundColorString = null; - this.backgroundColor = 0; this._tempDisplayObjectParent = null; this._lastObjectRendered = null; } diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 8a75780..6282341 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -206,7 +206,8 @@ } else { - tempCanvas.context.drawImage(baseTexture.source, -texture._frame.x, -texture._frame.y); + tempCanvas.context.drawImage(baseTexture.source, + -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index e29c1a4..49c3a29 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -141,12 +141,12 @@ shader.uniforms.uTransform = tempMat.toArray(true); shader.uniforms.uColor = core.utils.premultiplyTintToRgba(ts.tint, ts.worldAlpha, - shader.uniforms.uColor, baseTex.premultiplyAlpha); + shader.uniforms.uColor, baseTex.premultipliedAlpha); shader.uniforms.translationMatrix = ts.transform.worldTransform.toArray(true); shader.uniforms.uSampler = renderer.bindTexture(tex); - renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultiplyAlpha)); + renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultipliedAlpha)); quad.vao.draw(this.renderer.gl.TRIANGLES, 6, 0); } diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index b9f192d..46df556 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -295,7 +295,6 @@ this._backgroundColorRgba = null; this._backgroundColorString = null; - this.backgroundColor = 0; this._tempDisplayObjectParent = null; this._lastObjectRendered = null; } diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 8a75780..6282341 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -206,7 +206,8 @@ } else { - tempCanvas.context.drawImage(baseTexture.source, -texture._frame.x, -texture._frame.y); + tempCanvas.context.drawImage(baseTexture.source, + -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index e29c1a4..49c3a29 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -141,12 +141,12 @@ shader.uniforms.uTransform = tempMat.toArray(true); shader.uniforms.uColor = core.utils.premultiplyTintToRgba(ts.tint, ts.worldAlpha, - shader.uniforms.uColor, baseTex.premultiplyAlpha); + shader.uniforms.uColor, baseTex.premultipliedAlpha); shader.uniforms.translationMatrix = ts.transform.worldTransform.toArray(true); shader.uniforms.uSampler = renderer.bindTexture(tex); - renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultiplyAlpha)); + renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultipliedAlpha)); quad.vao.draw(this.renderer.gl.TRIANGLES, 6, 0); } diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index f6c769b..d1f599f 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -104,7 +104,7 @@ glData.shader.uniforms.uSampler = renderer.bindTexture(texture); - renderer.state.setBlendMode(core.utils.correctBlendMode(mesh.blendMode, texture.baseTexture.premultiplyAlpha)); + renderer.state.setBlendMode(core.utils.correctBlendMode(mesh.blendMode, texture.baseTexture.premultipliedAlpha)); if (glData.shader.uniforms.uTransform) { @@ -120,7 +120,7 @@ glData.shader.uniforms.translationMatrix = mesh.worldTransform.toArray(true); glData.shader.uniforms.uColor = core.utils.premultiplyRgba(mesh.tintRgb, - mesh.worldAlpha, texture.baseTexture.premultiplyAlpha); + mesh.worldAlpha, glData.shader.uniforms.uColor, texture.baseTexture.premultipliedAlpha); const drawMode = mesh.drawMode === Mesh.DRAW_MODES.TRIANGLE_MESH ? gl.TRIANGLE_STRIP : gl.TRIANGLES; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index b9f192d..46df556 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -295,7 +295,6 @@ this._backgroundColorRgba = null; this._backgroundColorString = null; - this.backgroundColor = 0; this._tempDisplayObjectParent = null; this._lastObjectRendered = null; } diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 8a75780..6282341 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -206,7 +206,8 @@ } else { - tempCanvas.context.drawImage(baseTexture.source, -texture._frame.x, -texture._frame.y); + tempCanvas.context.drawImage(baseTexture.source, + -texture._frame.x * baseTextureResolution, -texture._frame.y * baseTextureResolution); } this._canvasPattern = tempCanvas.context.createPattern(tempCanvas.canvas, 'repeat'); } diff --git a/src/extras/webgl/TilingSpriteRenderer.js b/src/extras/webgl/TilingSpriteRenderer.js index e29c1a4..49c3a29 100644 --- a/src/extras/webgl/TilingSpriteRenderer.js +++ b/src/extras/webgl/TilingSpriteRenderer.js @@ -141,12 +141,12 @@ shader.uniforms.uTransform = tempMat.toArray(true); shader.uniforms.uColor = core.utils.premultiplyTintToRgba(ts.tint, ts.worldAlpha, - shader.uniforms.uColor, baseTex.premultiplyAlpha); + shader.uniforms.uColor, baseTex.premultipliedAlpha); shader.uniforms.translationMatrix = ts.transform.worldTransform.toArray(true); shader.uniforms.uSampler = renderer.bindTexture(tex); - renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultiplyAlpha)); + renderer.setBlendMode(core.utils.correctBlendMode(ts.blendMode, baseTex.premultipliedAlpha)); quad.vao.draw(this.renderer.gl.TRIANGLES, 6, 0); } diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index f6c769b..d1f599f 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -104,7 +104,7 @@ glData.shader.uniforms.uSampler = renderer.bindTexture(texture); - renderer.state.setBlendMode(core.utils.correctBlendMode(mesh.blendMode, texture.baseTexture.premultiplyAlpha)); + renderer.state.setBlendMode(core.utils.correctBlendMode(mesh.blendMode, texture.baseTexture.premultipliedAlpha)); if (glData.shader.uniforms.uTransform) { @@ -120,7 +120,7 @@ glData.shader.uniforms.translationMatrix = mesh.worldTransform.toArray(true); glData.shader.uniforms.uColor = core.utils.premultiplyRgba(mesh.tintRgb, - mesh.worldAlpha, texture.baseTexture.premultiplyAlpha); + mesh.worldAlpha, glData.shader.uniforms.uColor, texture.baseTexture.premultipliedAlpha); const drawMode = mesh.drawMode === Mesh.DRAW_MODES.TRIANGLE_MESH ? gl.TRIANGLE_STRIP : gl.TRIANGLES; diff --git a/src/particles/webgl/ParticleRenderer.js b/src/particles/webgl/ParticleRenderer.js index ce560f0..aaf3638 100644 --- a/src/particles/webgl/ParticleRenderer.js +++ b/src/particles/webgl/ParticleRenderer.js @@ -145,7 +145,7 @@ const baseTexture = children[0]._texture.baseTexture; // if the uvs have not updated then no point rendering just yet! - this.renderer.setBlendMode(core.utils.correctBlendMode(container.blendMode, baseTexture.premultiplyAlpha)); + this.renderer.setBlendMode(core.utils.correctBlendMode(container.blendMode, baseTexture.premultipliedAlpha)); const gl = renderer.gl; @@ -156,7 +156,7 @@ this.shader.uniforms.projectionMatrix = m.toArray(true); this.shader.uniforms.uColor = core.utils.premultiplyRgba(container.tintRgb, - container.worldAlpha, baseTexture.premultiplyAlpha); + container.worldAlpha, this.shader.uniforms.uColor, baseTexture.premultipliedAlpha); // make sure the texture is bound.. this.shader.uniforms.uSampler = renderer.bindTexture(baseTexture);