Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-16 22:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug that stopped it rendering. Also added in new color data component.

Browse source
This commit is contained in:
Richard Davey 2017-08-17 01:20:15 +01:00
parent 15a749d8ea
commit 1fe9a658e7
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextCanvasRenderer.js
View file

@ -122,7 +122,7 @@ var DynamicBitmapTextCanvasRenderer = function (renderer, src, interpolationPerc
if (displayCallback)
{
var output = displayCallback({ index: index, charCode: charCode, x: x, y: y, scale: scale, rotation: 0, data: glyph.data });
var output = displayCallback({ tint: { topLeft: 0, topRight: 0, bottomLeft: 0, bottomRight: 0 }, index: index, charCode: charCode, x: x, y: y, scale: scale, rotation: 0, data: glyph.data });
x = output.x;
y = output.y;

22
v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js
View file

@ -4,7 +4,7 @@ var tempMatrixChar = new TransformMatrix();
var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
{
var text = src.text;
var text = gameObject.text;
var textLength = text.length;
if (this.renderMask !== this.renderFlags || textLength === 0 || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))
@ -151,17 +151,27 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolati
if (displayCallback)
{
var output = displayCallback({ tint: { topLeft: tintTL, topRight: tintTR, bottomLeft: tintBL, bottomRight: tintBR }, index: index, charCode: charCode, x: x, y: y, scale: scale, rotation: 0, data: glyph.data });
var output = displayCallback({ color: 0, tint: { topLeft: tintTL, topRight: tintTR, bottomLeft: tintBL, bottomRight: tintBR }, index: index, charCode: charCode, x: x, y: y, scale: scale, rotation: 0, data: glyph.data });
x = output.x;
y = output.y;
scale = output.scale;
rotation = output.rotation;
tintTL = output.tint.topLeft;
tintTR = output.tint.topRight;
tintBL = output.tint.bottomLeft;
tintBR = output.tint.bottomRight;
if (output.color)
{
tintTL = output.color;
tintTR = output.color;
tintBL = output.color;
tintBR = output.color;
}
else
{
tintTL = output.tint.topLeft;
tintTR = output.tint.topRight;
tintBL = output.tint.bottomLeft;
tintBR = output.tint.bottomRight;
}
}
x -= gameObject.scrollX | 0;

2
v3/src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js
View file

@ -3,7 +3,7 @@ var tempMatrix = new TransformMatrix();
var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
{
var text = src.text;
var text = gameObject.text;
var textLength = text.length;
if (this.renderMask !== this.renderFlags || textLength === 0 || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))