Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Making unicode work #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Making unicode work #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 8 additions & 43 deletions com/stencyl/graphics/fonts/BitmapFont.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import openfl.geom.Matrix;
import openfl.geom.Point;
import openfl.geom.Rectangle;

using lime._internal.unifill.Unifill;

#if (flash)
typedef PixelColor = UInt;
#else
Expand Down Expand Up @@ -455,28 +457,10 @@ class BitmapFont
var glyph:FontSymbol;
var glyphWidth:Int;
#end

var realCount = 0;

for (i in 0...(pText.length))
{
if(i < realCount)
{
continue;
}

var charCode:Int = pText.charCodeAt(i);

//Pseudo Unicode
if(charCode == 126)
{
if(pText.charAt(i + 1) == 'x')
{
var unicodeChar = pText.substring(i + 2, i + 6);
charCode = Std.parseInt("0x" + unicodeChar);
realCount += 5;
}
}
for (c in pText.uIterator())
{
var charCode:Int = c.toInt();

#if (!use_tilemap)
glyph = pFontData[charCode];
Expand Down Expand Up @@ -529,8 +513,6 @@ class BitmapFont
_point.x += glyphWidth * pScale + pLetterSpacing;
#end
}

realCount++;
}
}

Expand Down Expand Up @@ -577,27 +559,12 @@ class BitmapFont
public function getTextWidth(pText:String, ?pLetterSpacing:Int = 0, ?pFontScale:Float = 1.0):Int
{
var w:Int = 0;
var realCount = 0;
var textLength:Int = pText.length;
for (i in 0...(textLength))
var textLength:Int = pText.uLength();
for (c in pText.uIterator())
{
if(i < realCount)
{
continue;
}

var charCode:Int = pText.charCodeAt(i);
var charCode:Int = c.toInt();

//Pseudo Unicode
if(charCode == 126)
{
if(pText.charAt(i + 1) == 'x')
{
var unicodeChar = pText.substring(i + 2, i + 6);
charCode = Std.parseInt("0x" + unicodeChar);
realCount += 5;
}
}

#if (!use_tilemap)
var glyph:BitmapData = _glyphs[charCode];
Expand All @@ -612,8 +579,6 @@ class BitmapFont
w += _glyphs.get(charCode).xadvance;
}
#end

realCount++;
}

w = Math.round(w * pFontScale);
Expand Down