more chrome

This commit is contained in:
Chris Forbes
2009-11-16 19:23:24 +13:00
parent 95e26c7147
commit 5a5cc10bea
2 changed files with 10 additions and 10 deletions

View File

@@ -5,6 +5,7 @@ using System.Text;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Support; using OpenRa.Game.Support;
using System.Drawing; using System.Drawing;
using IjwFramework.Types;
namespace OpenRa.Game namespace OpenRa.Game
{ {
@@ -17,6 +18,8 @@ namespace OpenRa.Game
readonly Sprite moneyBinSprite; readonly Sprite moneyBinSprite;
readonly SpriteRenderer buildPaletteRenderer; readonly SpriteRenderer buildPaletteRenderer;
readonly List<Pair<Rectangle, string>> buildItems = new List<Pair<Rectangle, string>>();
public Chrome(Renderer r) public Chrome(Renderer r)
{ {
this.renderer = r; this.renderer = r;
@@ -37,6 +40,8 @@ namespace OpenRa.Game
public void Draw() public void Draw()
{ {
buildItems.Clear();
renderer.Device.DisableScissor(); renderer.Device.DisableScissor();
renderer.DrawText(string.Format("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\n$ {4}\nPower {5}", renderer.DrawText(string.Format("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\n$ {4}\nPower {5}",
Game.RenderFrame, Game.RenderFrame,
@@ -67,15 +72,10 @@ namespace OpenRa.Game
foreach (var item in Rules.TechTree.BuildableItems(Game.LocalPlayer, queueName)) foreach (var item in Rules.TechTree.BuildableItems(Game.LocalPlayer, queueName))
{ {
buildPaletteRenderer.DrawSprite(sprites[item], var rect = new Rectangle(Game.viewport.Width - (3 - x) * 64 - 20, 32 + 48 * y, 64, 48);
new float2( buildPaletteRenderer.DrawSprite(sprites[item], Game.viewport.Location + new float2(rect.Location), 0);
Game.viewport.Width - (3 - x) * 64 - 20, buildItems.Add(Pair.New(rect, item));
32 + 48 * y), 0); if (++x == 3) { x = 0; y++; }
if (++x == 3)
{
x = 0; y++;
}
} }
buildPaletteRenderer.Flush(); buildPaletteRenderer.Flush();

View File

@@ -81,7 +81,7 @@ namespace OpenRa.Game
sounds = new Cache<string, ISoundSource>(LoadSound); sounds = new Cache<string, ISoundSource>(LoadSound);
orderManager = (Replay == "") orderManager = (Replay == "")
? new OrderManager(new OrderSource[] { new LocalOrderSource(), new NetworkOrderSource( new TcpClient( "127.0.0.1", 1235 ) ) }, "replay.rep") ? new OrderManager(new OrderSource[] { new LocalOrderSource(), /*new NetworkOrderSource( new TcpClient( "127.0.0.1", 1235 ) )*/ }, "replay.rep")
: new OrderManager(new OrderSource[] { new ReplayOrderSource( Replay ) }); : new OrderManager(new OrderSource[] { new ReplayOrderSource( Replay ) });
PlaySound("intro.aud", false); PlaySound("intro.aud", false);