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

Tidy up font code

Browse Source
This commit is contained in:
pchote
2010-02-20 19:08:29 +13:00
parent 6e91c8015c
commit 37084f4014
1 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OpenRa.Game/Graphics/Renderer.cs
View File

@@ -45,14 +45,8 @@ namespace OpenRa.Graphics
public ITexture PaletteTexture; public ITexture PaletteTexture;
readonly Font fDebug, fTitle; readonly FTFontGL regularFont, boldFont;
readonly FTFontGL testFont, boldFont; const int RenderedFontSize = 48;
Sheet textSheet;
SpriteRenderer rgbaRenderer;
Sprite textSprite;
const int RenderedSize = 48;
public Size Resolution { get { return device.WindowSize; } } public Size Resolution { get { return device.WindowSize; } }
@@ -65,29 +59,21 @@ namespace OpenRa.Graphics
RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx")); RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx"));
WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx")); WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx"));
fDebug = new Font("Tahoma", 10.0f, FontStyle.Regular);
fTitle = new Font("Tahoma", 10, FontStyle.Bold);
int Errors; int Errors;
testFont = new FTFontGL("FreeSans.ttf", out Errors); regularFont = new FTFontGL("FreeSans.ttf", out Errors);
if (Errors > 0) if (Errors > 0)
throw new InvalidOperationException("Error(s) loading font"); throw new InvalidOperationException("Error(s) loading font");
testFont.ftRenderToTexture(RenderedSize, 192); regularFont.ftRenderToTexture(RenderedFontSize, 192);
testFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT; regularFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT;
boldFont = new FTFontGL("FreeSansBold.ttf", out Errors); boldFont = new FTFontGL("FreeSansBold.ttf", out Errors);
if (Errors > 0) if (Errors > 0)
throw new InvalidOperationException("Error(s) loading font"); throw new InvalidOperationException("Error(s) loading font");
boldFont.ftRenderToTexture(RenderedSize, 192); boldFont.ftRenderToTexture(RenderedFontSize, 192);
boldFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT; boldFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT;
textSheet = new Sheet(this, new Size(256, 256));
rgbaRenderer = new SpriteRenderer(this, true, RgbaSpriteShader);
textSprite = new Sprite(textSheet, new Rectangle(0, 0, 256, 256), TextureChannel.Alpha);
} }
IGraphicsDevice CreateDevice( Assembly rendererDll, int width, int height, bool fullscreen, bool vsync ) IGraphicsDevice CreateDevice( Assembly rendererDll, int width, int height, bool fullscreen, bool vsync )
@@ -100,30 +86,6 @@ namespace OpenRa.Graphics
throw new NotImplementedException(); throw new NotImplementedException();
} }
/* Bitmap RenderTextToBitmap(string s, Font f, Color c)
{
Bitmap b = new Bitmap(256, 256);
testFont.ftBeginFont(0.9f,0.0f,0.0f,0.5f);
testFont.ftWrite("Test",b);
testFont.ftEndFont();
/*using (var g = System.Drawing.Graphics.FromImage(b))
{
g.TextRenderingHint = TextRenderingHint.SingleBitPerPixelGridFit;
g.DrawString(s, f, new SolidBrush(c), 0, 0);
g.Flush();
}*/
// return b;
// }
int2 GetTextSize(string s, Font f)
{
return new int2(50,100);
/*Bitmap b = new Bitmap(1,1);
System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(b);
return new int2(g.MeasureString(s, f).ToSize());*/
}
public IGraphicsDevice Device { get { return device; } } public IGraphicsDevice Device { get { return device; } }
public void BeginFrame(float2 r1, float2 r2, float2 scroll) public void BeginFrame(float2 r1, float2 r2, float2 scroll)
@@ -195,7 +157,7 @@ namespace OpenRa.Graphics
{ {
using (new PerfSample("text")) using (new PerfSample("text"))
{ {
pos.Y += (int)(emHeight * 2 / 3); pos.Y += (int)(emHeight);
Gl.glMatrixMode(Gl.GL_MODELVIEW); Gl.glMatrixMode(Gl.GL_MODELVIEW);
Gl.glPushMatrix(); Gl.glPushMatrix();
@@ -209,7 +171,7 @@ namespace OpenRa.Graphics
Gl.glMatrixMode(Gl.GL_MODELVIEW); Gl.glMatrixMode(Gl.GL_MODELVIEW);
Gl.glTranslatef(pos.X, Resolution.Height - pos.Y, 0); Gl.glTranslatef(pos.X, Resolution.Height - pos.Y, 0);
Gl.glScalef(emHeight / RenderedSize, emHeight / RenderedSize, 1); Gl.glScalef(emHeight / RenderedFontSize, emHeight / RenderedFontSize, 1);
f.ftBeginFont(false); f.ftBeginFont(false);
Gl.glColor4f(c.R / 255f, c.G / 255f, c.B / 255f, c.A / 255f); Gl.glColor4f(c.R / 255f, c.G / 255f, c.B / 255f, c.A / 255f);
@@ -226,12 +188,12 @@ namespace OpenRa.Graphics
} }
} }
public void DrawText(string text, int2 pos, Color c) { DrawTextInner(testFont, text, pos, c); } public void DrawText(string text, int2 pos, Color c) { DrawTextInner(regularFont, text, pos, c); }
public void DrawText2(string text, int2 pos, Color c) { DrawTextInner(boldFont, text, pos, c); } public void DrawText2(string text, int2 pos, Color c) { DrawTextInner(boldFont, text, pos, c); }
public int2 MeasureText(string text) public int2 MeasureText(string text)
{ {
return new int2((int)(testFont.ftExtent(ref text) / 3), (int)emHeight); return new int2((int)(regularFont.ftExtent(ref text) / 3), (int)emHeight);
} }
public int2 MeasureText2(string text) public int2 MeasureText2(string text)