Merge pull request #7696 from Robmaister/bleed

Updated SharpFont to 3.0.0, adjusted font rendering code for new fixed-point types
This commit is contained in:
Matthias Mailänder
2015-05-01 11:41:20 +02:00
5 changed files with 15 additions and 33 deletions

View File

@@ -102,13 +102,13 @@ namespace OpenRA.Graphics
face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
face.Glyph.RenderGlyph(RenderMode.Normal);
var size = new Size((int)face.Glyph.Metrics.Width >> 6, (int)face.Glyph.Metrics.Height >> 6);
var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
var s = builder.Allocate(size);
var g = new GlyphInfo
{
Sprite = s,
Advance = (int)face.Glyph.Metrics.HorizontalAdvance / 64f,
Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
};