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

removed a pile of duplication; checkboxes work properly in both games now.

Browse Source
This commit is contained in:
Chris Forbes
2010-03-20 12:13:16 +13:00
parent b68e14655f
commit 10decf2544
4 changed files with 82 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Chrome.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA
{ {
public readonly Renderer renderer; public readonly Renderer renderer;
public readonly SpriteRenderer rgbaRenderer; public readonly SpriteRenderer rgbaRenderer;
readonly LineRenderer lineRenderer; public readonly LineRenderer lineRenderer;
readonly SpriteRenderer shpRenderer; readonly SpriteRenderer shpRenderer;
string chromeCollection; string chromeCollection;

81
OpenRA.Game/Chrome/BackgroundWidget.cs
View File

@@ -18,7 +18,10 @@
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using System.Drawing;
using System;
namespace OpenRA.Widgets namespace OpenRA.Widgets
{ {
@@ -30,41 +33,51 @@ namespace OpenRA.Widgets
{ {
base.Draw(); base.Draw();
return; return;
} }
string collection = "dialog"; WidgetUtils.DrawPanel("dialog", Bounds, null);
Game.chrome.renderer.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height);
string[] images = { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" };
var ss = Graphics.Util.MakeArray(9, n => ChromeProvider.GetImage(Game.chrome.renderer, collection,images[n]));
for( var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X )
for( var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y )
Game.chrome.rgbaRenderer.DrawSprite(ss[8], new float2(x, y), "chrome");
//draw borders
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
}
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
}
Game.chrome.rgbaRenderer.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
Game.chrome.rgbaRenderer.Flush();
Game.chrome.renderer.Device.DisableScissor();
base.Draw(); base.Draw();
} }
}
static class WidgetUtils
{
public static void DrawPanel(string collection, Rectangle Bounds, Action a)
{
var r = Game.chrome.renderer;
var sr = Game.chrome.rgbaRenderer;
r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height);
var images = new[] { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" };
var ss = images.Select(i => ChromeProvider.GetImage(Game.chrome.renderer, collection, i)).ToArray();
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X)
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y)
sr.DrawSprite(ss[8], new float2(x, y), "chrome");
//draw borders
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
{
sr.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
sr.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
}
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
{
sr.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
sr.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
}
sr.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
sr.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
sr.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
sr.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
sr.Flush();
if (a != null) a();
r.Device.DisableScissor();
}
} }
} }

63
OpenRA.Game/Chrome/ButtonWidget.cs
View File

@@ -60,51 +60,24 @@ namespace OpenRA.Widgets
} }
return false; return false;
} }
public override void Draw() public override void Draw()
{ {
if (!Visible) if (!Visible)
{ {
base.Draw(); base.Draw();
return; return;
} }
string collection = (Depressed) ? "dialog3" : "dialog2"; var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0);
int2 stateOffset = (Depressed) ? new int2(VisualHeight,VisualHeight) : new int2(0,0); WidgetUtils.DrawPanel(Depressed ? "dialog3" : "dialog2", Bounds,
Game.chrome.renderer.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height); () => Game.chrome.renderer.BoldFont.DrawText(Game.chrome.rgbaRenderer, Text,
new int2(Bounds.X + Bounds.Width / 2, Bounds.Y + Bounds.Height / 2)
string[] images = { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" }; - new int2(Game.chrome.renderer.BoldFont.Measure(Text).X / 2,
var ss = Graphics.Util.MakeArray(9, n => ChromeProvider.GetImage(Game.chrome.renderer, collection,images[n])); Game.chrome.renderer.BoldFont.Measure(Text).Y / 2) + stateOffset, Color.White));
for( var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X ) base.Draw();
for( var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y )
Game.chrome.rgbaRenderer.DrawSprite(ss[8], new float2(x, y), "chrome");
//draw borders
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
}
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
}
Game.chrome.rgbaRenderer.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
Game.chrome.rgbaRenderer.Flush();
Game.chrome.renderer.BoldFont.DrawText(Game.chrome.rgbaRenderer, Text, new int2(Bounds.X+Bounds.Width/2, Bounds.Y+Bounds.Height/2) - new int2(Game.chrome.renderer.BoldFont.Measure(Text).X / 2, Game.chrome.renderer.BoldFont.Measure(Text).Y/2) + stateOffset, Color.White);
Game.chrome.renderer.Device.DisableScissor();
base.Draw();
} }
} }
} }

48
OpenRA.Game/Chrome/CheckboxWidget.cs
View File

@@ -19,6 +19,7 @@
#endregion #endregion
using OpenRA.Graphics; using OpenRA.Graphics;
using System.Drawing;
namespace OpenRA.Widgets namespace OpenRA.Widgets
{ {
@@ -31,39 +32,22 @@ namespace OpenRA.Widgets
base.Draw(); base.Draw();
return; return;
} }
bool selected = false;
if (InputHandler.Value != null) var selected = InputHandler.Value != null ? InputHandler.Value.GetState(this) : false;
selected = InputHandler.Value.GetState(this);
WidgetUtils.DrawPanel("dialog3", Bounds, () => { });
string collection = (selected) ? "dialog3" : "dialog2";
if (selected)
Game.chrome.renderer.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height); {
string[] images = { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" }; Game.chrome.lineRenderer.FillRect(
var ss = Graphics.Util.MakeArray(9, n => ChromeProvider.GetImage(Game.chrome.renderer, collection,images[n])); new RectangleF(
Game.viewport.Location.X + Bounds.Left + 4,
for( var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X ) Game.viewport.Location.Y + Bounds.Top + 5,
for( var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y ) Bounds.Width - 9,
Game.chrome.rgbaRenderer.DrawSprite(ss[8], new float2(x, y), "chrome"); Bounds.Height - 9),
Color.White);
//draw borders Game.chrome.lineRenderer.Flush();
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
} }
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
{
Game.chrome.rgbaRenderer.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
}
Game.chrome.rgbaRenderer.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
Game.chrome.rgbaRenderer.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
Game.chrome.rgbaRenderer.Flush();
Game.chrome.renderer.Device.DisableScissor();
base.Draw(); base.Draw();
} }