From 25dbd72e43d85d9a21930e8c81c20411b64e58cd Mon Sep 17 00:00:00 2001 From: Matthew Bowra-Dean Date: Mon, 15 Feb 2010 14:51:54 +1300 Subject: [PATCH 1/3] Forced OpenRa.Game back to x86 platform. Native x64 support causing too many issues. --- OpenRa.Game/OpenRa.Game.csproj | 8 ++++---- OpenRa.sln | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index 28ec54a56a..438fc375bb 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -34,23 +34,23 @@ OpenRA.ico - + true bin\Debug\ TRACE;DEBUG;SANITY_CHECKS true full - AnyCPU + x86 false prompt - + bin\Release\ TRACE true true pdbonly - AnyCPU + x86 false prompt diff --git a/OpenRa.sln b/OpenRa.sln index eab68ff896..1883023f3d 100644 --- a/OpenRa.sln +++ b/OpenRa.sln @@ -25,10 +25,9 @@ Global {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.Build.0 = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|x86 + {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|x86 {230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.ActiveCfg = Release|Any CPU From c6684a74366809beeba26ebef973cabbacddb5ed Mon Sep 17 00:00:00 2001 From: Matthew Bowra-Dean Date: Tue, 16 Feb 2010 14:03:26 +1300 Subject: [PATCH 2/3] Text rendering to bitmap using System.Drawing. Currently broken. --- OpenRa.Game/Graphics/Renderer.cs | 49 ++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs index 1547b95a25..eedbdc1920 100644 --- a/OpenRa.Game/Graphics/Renderer.cs +++ b/OpenRa.Game/Graphics/Renderer.cs @@ -3,6 +3,7 @@ using System.Windows.Forms; using Ijw.DirectX; using OpenRa.FileFormats; using OpenRa.Support; +using System.Drawing.Drawing2D; namespace OpenRa.Graphics { @@ -20,7 +21,11 @@ namespace OpenRa.Graphics public Texture PaletteTexture; readonly SpriteHelper sh; - readonly FontHelper fhDebug, fhTitle; + readonly Font fDebug, fTitle; + + Sheet textSheet; + SpriteRenderer rgbaRenderer; + Sprite textSprite; public Renderer(Control host, Size resolution, bool windowed) { @@ -37,9 +42,29 @@ namespace OpenRa.Graphics WorldSpriteShader = new Shader(device, FileSystem.Open("chrome-shp.fx")); WorldSpriteShader.Quality = ShaderQuality.High; - sh = new SpriteHelper(device); - fhDebug = new FontHelper(device, "Tahoma", 10, false); - fhTitle = new FontHelper(device, "Tahoma", 10, true); + //sh = new SpriteHelper(device); + fDebug = new Font("Tahoma", 10, FontStyle.Regular); + fTitle = new Font("Tahoma", 10, FontStyle.Bold); + 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); + } + + Bitmap RenderTextToBitmap(string s, Font f, Color c) + { + Bitmap b = new Bitmap(256, 256); + System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(b); + g.DrawString(s, f, new SolidBrush(c), 0, 0); + g.Flush(); + g.Dispose(); + return b; + } + + int2 GetTextSize(string s, Font f) + { + Bitmap b = new Bitmap(1,1); + System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(b); + return new int2(g.MeasureString(s, f).ToSize()); } public GraphicsDevice Device { get { return device; } } @@ -96,26 +121,26 @@ namespace OpenRa.Graphics public void DrawText(string text, int2 pos, Color c) { - sh.Begin(); - fhDebug.Draw(sh, text, pos.X, pos.Y, c.ToArgb()); - sh.End(); + Bitmap b = RenderTextToBitmap(text, fDebug, c); + textSheet.Texture.SetData(b); + rgbaRenderer.DrawSprite(textSprite, pos.ToFloat2(), "chrome"); } public void DrawText2(string text, int2 pos, Color c) { - sh.Begin(); - fhTitle.Draw(sh, text, pos.X, pos.Y, c.ToArgb()); - sh.End(); + Bitmap b = RenderTextToBitmap(text, fTitle, c); + textSheet.Texture.SetData(b); + rgbaRenderer.DrawSprite(textSprite, pos.ToFloat2(), "chrome"); } public int2 MeasureText(string text) { - return new int2(fhDebug.MeasureText(sh, text)); + return GetTextSize(text, fDebug); } public int2 MeasureText2(string text) { - return new int2(fhTitle.MeasureText(sh, text)); + return GetTextSize(text, fTitle); } } } From 99d2310f30f1aa49238891cfc29e6eefc94e95be Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 16 Feb 2010 18:09:53 +1300 Subject: [PATCH 3/3] fixed text renderer. it's slow, but it works --- OpenRa.Game/Graphics/Renderer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs index eedbdc1920..737eff30e6 100644 --- a/OpenRa.Game/Graphics/Renderer.cs +++ b/OpenRa.Game/Graphics/Renderer.cs @@ -124,6 +124,7 @@ namespace OpenRa.Graphics Bitmap b = RenderTextToBitmap(text, fDebug, c); textSheet.Texture.SetData(b); rgbaRenderer.DrawSprite(textSprite, pos.ToFloat2(), "chrome"); + rgbaRenderer.Flush(); } public void DrawText2(string text, int2 pos, Color c) @@ -131,6 +132,7 @@ namespace OpenRa.Graphics Bitmap b = RenderTextToBitmap(text, fTitle, c); textSheet.Texture.SetData(b); rgbaRenderer.DrawSprite(textSprite, pos.ToFloat2(), "chrome"); + rgbaRenderer.Flush(); } public int2 MeasureText(string text)