From ae1710896a8e35afd2aab3d90784ebd2c66c4803 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 28 Dec 2010 17:24:20 +1300 Subject: [PATCH] add a tiny font; add labels in PerfGraphWidget --- OpenRA.Game/Graphics/Renderer.cs | 3 ++- OpenRA.Game/Widgets/PerfGraphWidget.cs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Graphics/Renderer.cs b/OpenRA.Game/Graphics/Renderer.cs index 5004e59f87..7b417ccf9c 100644 --- a/OpenRA.Game/Graphics/Renderer.cs +++ b/OpenRA.Game/Graphics/Renderer.cs @@ -36,7 +36,7 @@ namespace OpenRA.Graphics public ITexture PaletteTexture; - public readonly SpriteFont RegularFont, BoldFont, TitleFont; + public readonly SpriteFont RegularFont, BoldFont, TitleFont, TinyFont; internal const int TempBufferSize = 8192; const int TempBufferCount = 8; @@ -59,6 +59,7 @@ namespace OpenRA.Graphics RegularFont = new SpriteFont("FreeSans.ttf", 14); BoldFont = new SpriteFont("FreeSansBold.ttf", 14); TitleFont = new SpriteFont("titles.ttf", 48); + TinyFont = new SpriteFont("FreeSans.ttf", 10); for( int i = 0 ; i < TempBufferCount ; i++ ) { diff --git a/OpenRA.Game/Widgets/PerfGraphWidget.cs b/OpenRA.Game/Widgets/PerfGraphWidget.cs index 5b4ecec32c..9ea2e1351e 100644 --- a/OpenRA.Game/Widgets/PerfGraphWidget.cs +++ b/OpenRA.Game/Widgets/PerfGraphWidget.cs @@ -28,6 +28,7 @@ namespace OpenRA.Widgets Game.Renderer.LineRenderer.DrawLine(origin, origin + new float2(100, 0) * basis, Color.White, Color.White); Game.Renderer.LineRenderer.DrawLine(origin + new float2(100, 0) * basis, origin + new float2(100, 100) * basis, Color.White, Color.White); + int k = 0; foreach (var item in PerfHistory.items.Values) { int n = 0; @@ -40,6 +41,22 @@ namespace OpenRA.Widgets ++n; return b; }); + + var u = Game.viewport.Location + new float2(rect.Left, rect.Top); + + Game.Renderer.LineRenderer.DrawLine( + u + new float2(10, 10 * k + 5), + u + new float2(12, 10 * k + 5), + item.c, item.c); + + Game.Renderer.LineRenderer.DrawLine( + u + new float2(10, 10 * k + 4), + u + new float2(12, 10 * k + 4), + item.c, item.c); + + Game.Renderer.TinyFont.DrawText(item.Name, new float2(rect.Left, rect.Top) + new float2(18, 10 * k - 3), Color.White); + Game.Renderer.Flush(); + ++k; } } }