Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated to use current null approach

Browse source
This commit is contained in:
Richard Davey 2019-11-22 13:54:07 +00:00
parent 28982fb7fc
commit 4435791cc1
1 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gameobjects/bitmaptext/GetBitmapTextSize.js
View file

@ -242,34 +242,35 @@ var GetBitmapTextSize = function (src, round, out)
src._text = text;
textLength = text.length;
console.log(text);
// Recalculated in the next loop
words = [];
current = null;
}
current = { word: '', x: 0, y: 0, w: 0, h: lineHeight };
for (i = 0; i < textLength; i++)
{
charCode = text.charCodeAt(i);
if (charCode === 10)
{
if (current !== null)
{
words.push({
word: current.word,
i: current.i,
x: current.x * sx,
y: current.y * sy,
w: current.w * sx,
h: current.h * sy
});
current = null;
}
xAdvance = 0;
yAdvance += lineHeight;
lastGlyph = null;
current = { word: '', x: xAdvance, y: yAdvance, w: 0, h: lineHeight };
lineWidths[currentLine] = currentLineWidth;
if (currentLineWidth > longestLine)
@ -284,6 +285,7 @@ var GetBitmapTextSize = function (src, round, out)
currentLine++;
currentLineWidth = 0;
continue;
}
@ -300,6 +302,7 @@ var GetBitmapTextSize = function (src, round, out)
if (lastGlyph !== null)
{
var kerningOffset = glyph.kerning[lastCharCode];
x += (kerningOffset !== undefined) ? kerningOffset : 0;
}
@ -326,28 +329,38 @@ var GetBitmapTextSize = function (src, round, out)
bh = gh;
}
xAdvance += glyph.xAdvance + letterSpacing;
lastGlyph = glyph;
lastCharCode = charCode;
currentLineWidth = gw * scale;
if (charCode === wordWrapCharCode)
{
if (current !== null)
{
words.push({
word: current.word,
i: current.i,
x: current.x * sx,
y: current.y * sy,
w: current.w * sx,
h: current.h * sy
});
current = { word: '', x: xAdvance, y: yAdvance, w: 0, h: lineHeight };
current = null;
}
}
else
{
if (current === null)
{
// We're starting a new word, recording the starting index, etc
current = { word: '', i: i, x: xAdvance, y: yAdvance, w: 0, h: lineHeight };
}
current.word = current.word.concat(text[i]);
current.w += glyph.xOffset + glyph.xAdvance + ((kerningOffset !== undefined) ? kerningOffset : 0);
}
xAdvance += glyph.xAdvance + letterSpacing;
lastGlyph = glyph;
lastCharCode = charCode;
currentLineWidth = gw * scale;
}
// Last word
@ -355,6 +368,7 @@ var GetBitmapTextSize = function (src, round, out)
{
words.push({
word: current.word,
i: current.i,
x: current.x * sx,
y: current.y * sy,
w: current.w * sx,