Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-10 15:14:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated quad alpha checks

Browse source
This commit is contained in:
Richard Davey 2019-10-02 10:11:07 +01:00
parent a7a15bcb4d
commit ea75c5ca9a
2 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -68,6 +68,7 @@ In combination these updates fix issues #4732 and #4672. My thanks to @BenjaminD
* The Static Tilemap Canvas Renderer will now respect the game config anti-alias / pixel art settings and render accordingly.
* The Dynamic Tilemap Canvas Renderer will now respect the game config anti-alias / pixel art settings and render accordingly.
* All Game Objects that use the Canvas Set Transform function (which is most of them) will aos now respect the game config anti-alias / pixel art settings and render accordingly. This means you can now have properly scaled Bitmap Text, Text, Sprites, Render Textures, etc when pixel art is enabled in your game. Fix #4701 (thanks @agar3s)
* Containers are now able to set the alpha quadrant values (topLeft, topRight, bottomLeft and bottomRight) and have these passed onto children which are capable of supporting them, such as Sprites. Fix #4714 (thanks @MrcSnm)
### Bug Fixes

61
src/gameobjects/container/ContainerWebGLRenderer.js
View file

@ -52,12 +52,12 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
renderer.setBlendMode(0);
}
var alpha = container._alpha;
// var alpha = container._alpha;
var alphaTopLeft = container.alphaTopLeft;
var alphaTopRight = container.alphaTopRight;
var alphaBottomLeft = container.alphaBottomLeft;
var alphaBottomRight = container.alphaBottomRight;
var usingQuadAlpha = (alphaBottomLeft !== alpha || alphaBottomRight !== alpha || alphaTopRight !== alpha);
var scrollFactorX = container.scrollFactorX;
var scrollFactorY = container.scrollFactorY;
@ -75,11 +75,27 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
continue;
}
var childAlpha = child.alpha;
var childAlphaTopRight = child.alphaTopRight;
var childAlphaBottomLeft = child.alphaBottomLeft;
var childAlphaBottomRight = child.alphaBottomRight;
var usingChildQuadAlpha = (childAlphaBottomLeft !== childAlpha || childAlphaBottomRight !== childAlpha || childAlphaTopRight !== childAlpha);
var childAlphaTopLeft;
var childAlphaTopRight;
var childAlphaBottomLeft;
var childAlphaBottomRight;
if (child.alphaTopLeft !== undefined)
{
childAlphaTopLeft = child.alphaTopLeft;
childAlphaTopRight = child.alphaTopRight;
childAlphaBottomLeft = child.alphaBottomLeft;
childAlphaBottomRight = child.alphaBottomRight;
}
else
{
var childAlpha = child.alpha;
childAlphaTopLeft = childAlpha;
childAlphaTopRight = childAlpha;
childAlphaBottomLeft = childAlpha;
childAlphaBottomRight = childAlpha;
}
var childScrollFactorX = child.scrollFactorX;
var childScrollFactorY = child.scrollFactorY;
@ -118,38 +134,15 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
// Set parent values
child.setScrollFactor(childScrollFactorX * scrollFactorX, childScrollFactorY * scrollFactorY);
if (usingQuadAlpha)
{
if (usingChildQuadAlpha)
{
child.setAlpha(childAlpha * alpha, childAlphaTopRight * alphaTopRight, childAlphaBottomLeft * alphaBottomLeft, childAlphaBottomRight * alphaBottomRight);
}
else
{
child.setAlpha(childAlpha * alpha, childAlpha * alphaTopRight, childAlpha * alphaBottomLeft, childAlpha * alphaBottomRight);
}
}
else if (usingChildQuadAlpha)
{
child.setAlpha(childAlpha * alpha, childAlphaTopRight * alpha, childAlphaBottomLeft * alpha, childAlphaBottomRight * alpha);
}
else
{
child.setAlpha(childAlpha * alpha);
}
child.setAlpha(childAlphaTopLeft * alphaTopLeft, childAlphaTopRight * alphaTopRight, childAlphaBottomLeft * alphaBottomLeft, childAlphaBottomRight * alphaBottomRight);
// Render
child.renderWebGL(renderer, child, interpolationPercentage, camera, transformMatrix);
// Restore original values
if (usingChildQuadAlpha)
{
child.setAlpha(childAlpha, childAlphaTopRight, childAlphaBottomLeft, childAlphaBottomRight);
}
else
{
child.setAlpha(childAlpha);
}
child.setAlpha(childAlphaTopLeft, childAlphaTopRight, childAlphaBottomLeft, childAlphaBottomRight);
child.setScrollFactor(childScrollFactorX, childScrollFactorY);
renderer.newType = false;