new chrome stuff

This commit is contained in:
Chris Forbes
2009-11-15 20:28:49 +13:00
parent 7f25733176
commit 35f00cbc54
13 changed files with 204 additions and 53 deletions

View File

@@ -4,7 +4,8 @@ using System.Windows.Forms;
using IjwFramework.Types;
using System.Collections.Generic;
using OpenRa.Game.Traits;
using OpenRa.Game.Support;
using OpenRa.Game.Support;
using Ijw.DirectX;
namespace OpenRa.Game.Graphics
{
@@ -15,7 +16,8 @@ namespace OpenRa.Game.Graphics
public readonly LineRenderer lineRenderer;
public readonly Region region;
public readonly UiOverlay uiOverlay;
readonly Renderer renderer;
readonly Renderer renderer;
readonly Texture specialbin;
public static bool ShowUnitPaths = false;
@@ -25,7 +27,7 @@ namespace OpenRa.Game.Graphics
// TODO: this is layout policy. it belongs at a higher level than this.
region = Region.Create(Game.viewport, DockStyle.Left,
Game.viewport.Width - 128, Draw,
Game.viewport.Width - /*128*/ 0, Draw,
Game.controller.HandleMouseInput);
Game.viewport.AddRegion(region);
@@ -33,7 +35,9 @@ namespace OpenRa.Game.Graphics
this.renderer = renderer;
spriteRenderer = new SpriteRenderer(renderer, true);
lineRenderer = new LineRenderer(renderer);
uiOverlay = new UiOverlay(spriteRenderer);
uiOverlay = new UiOverlay(spriteRenderer);
specialbin = renderer.LoadTexture("specialbin.png");
}
void DrawSpriteList(RectangleF rect,
@@ -67,7 +71,7 @@ namespace OpenRa.Game.Graphics
foreach (var a in Game.world.Actors
.Where(u => u.traits.Contains<Traits.RenderWarFactory>())
.Select(u => u.traits.Get<Traits.RenderWarFactory>()))
DrawSpriteList(rect, a.RenderRoof(a.self)); /* RUDE HACK */
DrawSpriteList(rect, a.RenderRoof(a.self));
foreach (IEffect e in Game.world.Effects)
DrawSpriteList(rect, e.Render());
@@ -98,17 +102,6 @@ namespace OpenRa.Game.Graphics
DrawSelectionBox(a, Color.White, true);
lineRenderer.Flush();
renderer.DrawText(string.Format("RenderFrame {0} ({2:F1} ms)\nTick {1} ({3:F1} ms)\n$ {4}\nPower {5}",
Game.RenderFrame,
Game.orderManager.FrameNumber,
PerfHistory.items["render"].LastValue,
PerfHistory.items["tick_time"].LastValue,
Game.LocalPlayer.Cash,
Game.LocalPlayer.GetTotalPower()
), new int2(5, 5), Color.White);
PerfHistory.Render(renderer, lineRenderer);
}
void DrawSelectionBox(Actor selectedUnit, Color c, bool drawHealthBar)