diff --git a/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs b/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
new file mode 100644
index 0000000000..0e07b73d0a
--- /dev/null
+++ b/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
@@ -0,0 +1,50 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ *
+ * OpenRA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * OpenRA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenRA. If not, see .
+ */
+#endregion
+using System;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+
+namespace OpenRA.Widgets.Delegates
+{
+ public class PerfDebugDelegate : IWidgetDelegate
+ {
+ public PerfDebugDelegate()
+ {
+ var r = Chrome.rootWidget;
+ var perfRoot = r.GetWidget("PERF_BG");
+
+ // Perf text
+ var perfText = perfRoot.GetWidget("TEXT");
+ perfText.GetText = () => {
+ return "RenderFrame {0} ({2:F1} ms)\nTick {4}/ Net{1} ({3:F1} ms)".F(
+ Game.RenderFrame,
+ Game.orderManager.FrameNumber,
+ PerfHistory.items["render"].LastValue,
+ PerfHistory.items["tick_time"].LastValue,
+ Game.LocalTick);
+ };
+ perfText.IsVisible = () => {return (perfText.Visible && Game.Settings.PerfText);};
+
+ // Perf graph
+ var perfGraph = perfRoot.GetWidget("GRAPH");
+ perfGraph.IsVisible = () => {return (perfGraph.Visible && Game.Settings.PerfGraph);};
+ }
+ }
+}
diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs
index da2c745970..078d4c9dde 100644
--- a/OpenRA.Game/Widgets/WidgetUtils.cs
+++ b/OpenRA.Game/Widgets/WidgetUtils.cs
@@ -45,50 +45,51 @@ namespace OpenRA.Widgets
public static void DrawPanel(string collection, Rectangle Bounds, Action a)
{
- var r = Game.chrome.renderer;
- var sr = Game.chrome.rgbaRenderer;
-
-
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();
- // Don't draw the background below the bottom/right borders
- r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width - (int)ss[3].size.X, Bounds.Height - (int)ss[1].size.Y);
- 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");
+ // Background
+ FillRectWithSprite(new Rectangle(Bounds.Left + (int)ss[2].size.X,
+ Bounds.Top + (int)ss[0].size.Y,
+ Bounds.Right - (int)ss[3].size.X - Bounds.Left - (int)ss[2].size.X,
+ Bounds.Bottom - (int)ss[1].size.Y - Bounds.Top - (int)ss[0].size.Y),
+ ss[8]);
+
+ // Left border
+ FillRectWithSprite(new Rectangle(Bounds.Left,
+ Bounds.Top + (int)ss[0].size.Y,
+ (int)ss[2].size.X,
+ Bounds.Bottom - (int)ss[1].size.Y - Bounds.Top - (int)ss[0].size.Y),
+ ss[2]);
- sr.Flush(); // because the scissor is changing
- r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height - (int)ss[1].size.Y);
-
- //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");
- }
-
- sr.Flush(); // because the scissor is changing
- r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width - (int)ss[3].size.X, Bounds.Height);
-
- 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.Flush(); // because the scissor is changing
- r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height);
-
- 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");
+ // Right border
+ FillRectWithSprite(new Rectangle(Bounds.Right - (int)ss[3].size.X,
+ Bounds.Top + (int)ss[0].size.Y,
+ (int)ss[2].size.X,
+ Bounds.Bottom - (int)ss[1].size.Y - Bounds.Top - (int)ss[0].size.Y),
+ ss[3]);
+
+ // Top border
+ FillRectWithSprite(new Rectangle(Bounds.Left + (int)ss[2].size.X,
+ Bounds.Top,
+ Bounds.Right - (int)ss[3].size.X - Bounds.Left - (int)ss[2].size.X,
+ (int)ss[0].size.Y),
+ ss[0]);
+
+ // Bottom border
+ FillRectWithSprite(new Rectangle(Bounds.Left + (int)ss[2].size.X,
+ Bounds.Bottom - (int)ss[1].size.Y,
+ Bounds.Right - (int)ss[3].size.X - Bounds.Left - (int)ss[2].size.X,
+ (int)ss[0].size.Y),
+ ss[1]);
+
+ DrawRGBA(ss[4], new float2(Bounds.Left, Bounds.Top));
+ DrawRGBA(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top));
+ DrawRGBA(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y));
+ DrawRGBA(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y));
if (a != null) a();
-
- sr.Flush(); // because the scissor is changing
- r.Device.DisableScissor();
+ Game.chrome.rgbaRenderer.Flush();
}
public static void FillRectWithSprite(Rectangle r, Sprite s)
@@ -189,8 +190,8 @@ namespace OpenRA.Widgets
// BR corner
DrawRGBA(ss[7], new float2(br.X - (int)ss[7].size.X, br.Y - (int)ss[7].size.Y));
- Game.chrome.rgbaRenderer.Flush();
if (a != null) a();
+ Game.chrome.rgbaRenderer.Flush();
}
}
}