epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6877 from Mailaender/spritefont-perf

Browse Source 
Measure SpriteFont in perf.log
This commit is contained in:
obrakmann
2014-11-02 18:18:53 +01:00
parent c21402530e 44b485606f
commit 19c1f4ca99
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Graphics/Renderer.cs
View File

@@ -60,7 +60,8 @@ namespace OpenRA.Graphics
public void InitializeFonts(Manifest m) public void InitializeFonts(Manifest m)
{ {
Fonts = m.Fonts.ToDictionary(x => x.Key, x => new SpriteFont(Platform.ResolvePath(x.Value.First), x.Value.Second)); using (new Support.PerfTimer("SpriteFonts"))
Fonts = m.Fonts.ToDictionary(x => x.Key, x => new SpriteFont(Platform.ResolvePath(x.Value.First), x.Value.Second));
} }
internal IGraphicsDevice Device { get { return device; } } internal IGraphicsDevice Device { get { return device; } }

30
OpenRA.Game/Graphics/SpriteFont.cs
View File

@@ -12,23 +12,28 @@ using System;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support;
using SharpFont; using SharpFont;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
public class SpriteFont public class SpriteFont
{ {
static Library library = new Library();
static SheetBuilder builder;
int size; int size;
string name;
public SpriteFont(string name, int size) public SpriteFont(string name, int size)
{ {
this.size = size; this.size = size;
this.name = name;
face = library.NewFace(name, 0); face = new Face(library, name);
face.SetPixelSizes((uint)size, (uint)size); face.SetPixelSizes((uint)size, (uint)size);
glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
Pair<char,Color>.EqualityComparer);
// setup a SheetBuilder for our private use // setup a SheetBuilder for our private use
// TODO: SheetBuilder state is leaked between mod switches // TODO: SheetBuilder state is leaked between mod switches
@@ -41,10 +46,10 @@ namespace OpenRA.Graphics
void PrecacheColor(Color c) void PrecacheColor(Color c)
{ {
// precache glyphs for U+0020 - U+007f using (new PerfTimer("PrecacheColor {0} {1}px {2}".F(name, size, c.Name)))
for (var n = (char)0x20; n < (char)0x7f; n++) for (var n = (char)0x20; n < (char)0x7f; n++)
if (glyphs[Pair.New(n, c)] == null) if (glyphs[Pair.New(n, c)] == null)
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
public void DrawText(string text, float2 location, Color c) public void DrawText(string text, float2 location, Color c)
@@ -89,13 +94,12 @@ namespace OpenRA.Graphics
return new int2((int)Math.Ceiling(lines.Max(s => s.Sum(a => glyphs[Pair.New(a, Color.White)].Advance))), lines.Length * size); return new int2((int)Math.Ceiling(lines.Max(s => s.Sum(a => glyphs[Pair.New(a, Color.White)].Advance))), lines.Length * size);
} }
Cache<Pair<char,Color>, GlyphInfo> glyphs; Cache<Pair<char, Color>, GlyphInfo> glyphs;
Face face; Face face;
GlyphInfo CreateGlyph(Pair<char, Color> c) GlyphInfo CreateGlyph(Pair<char, Color> c)
{ {
var index = face.GetCharIndex(c.First); face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
face.LoadGlyph(index, LoadFlags.Default, LoadTarget.Normal);
face.Glyph.RenderGlyph(RenderMode.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 >> 6, (int)face.Glyph.Metrics.Height >> 6);
@@ -110,6 +114,7 @@ namespace OpenRA.Graphics
// A new bitmap is generated each time this property is accessed, so we do need to dispose it. // A new bitmap is generated each time this property is accessed, so we do need to dispose it.
using (var bitmap = face.Glyph.Bitmap) using (var bitmap = face.Glyph.Bitmap)
{
unsafe unsafe
{ {
var p = (byte*)bitmap.Buffer; var p = (byte*)bitmap.Buffer;
@@ -131,13 +136,12 @@ namespace OpenRA.Graphics
p += bitmap.Pitch; p += bitmap.Pitch;
} }
} }
}
s.sheet.CommitData(); s.sheet.CommitData();
return g; return g;
} }
static Library library = new Library();
static SheetBuilder builder;
} }
class GlyphInfo class GlyphInfo