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

Extract shared constants in Draw*Bar and DrawSelectionBox.

Browse Source
This commit is contained in:
Paul Chote
2013-10-14 23:35:05 +13:00
parent 483120ea20
commit 44dd801f16
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -155,20 +155,22 @@ namespace OpenRA.Graphics
var bounds = a.Bounds.Value; var bounds = a.Bounds.Value;
var tl = pos + new float2(bounds.Left, bounds.Top); var tl = pos + new float2(bounds.Left, bounds.Top);
var tr = pos + new float2(bounds.Right, bounds.Top);
var bl = pos + new float2(bounds.Left, bounds.Bottom);
var br = pos + new float2(bounds.Right, bounds.Bottom); var br = pos + new float2(bounds.Right, bounds.Bottom);
var tr = new float2(br.X, tl.Y);
var bl = new float2(tl.X, br.Y);
var u = new float2(4f, 0);
var v = new float2(0, 4f);
var wlr = Game.Renderer.WorldLineRenderer; var wlr = Game.Renderer.WorldLineRenderer;
wlr.DrawLine(tl, tl + new float2(4, 0), c, c); wlr.DrawLine(tl + u, tl, c, c);
wlr.DrawLine(tl, tl + new float2(0, 4), c, c); wlr.DrawLine(tl, tl + v, c, c);
wlr.DrawLine(tr, tr + new float2(-4, 0), c, c); wlr.DrawLine(tr, tr - u, c, c);
wlr.DrawLine(tr, tr + new float2(0, 4), c, c); wlr.DrawLine(tr, tr + v, c, c);
wlr.DrawLine(bl, bl + new float2(4, 0), c, c); wlr.DrawLine(bl, bl + u, c, c);
wlr.DrawLine(bl, bl + new float2(0, -4), c, c); wlr.DrawLine(bl, bl - v, c, c);
wlr.DrawLine(br, br + new float2(-4, 0), c, c); wlr.DrawLine(br, br - u, c, c);
wlr.DrawLine(br, br + new float2(0, -4), c, c); wlr.DrawLine(br, br - v, c, c);
} }
public void DrawRollover(Actor unit) public void DrawRollover(Actor unit)

39
OpenRA.Game/Traits/Selectable.cs
View File

@@ -85,25 +85,29 @@ namespace OpenRA.Traits
void DrawSelectionBar(WorldRenderer wr, Actor self, float2 xy, float2 Xy, float value, Color barColor) void DrawSelectionBar(WorldRenderer wr, Actor self, float2 xy, float2 Xy, float value, Color barColor)
{ {
if (!self.IsInWorld) return; if (!self.IsInWorld)
return;
var health = self.TraitOrDefault<Health>(); var health = self.TraitOrDefault<Health>();
if (health == null || health.IsDead) return; if (health == null || health.IsDead) return;
var c = Color.FromArgb(128, 30, 30, 30); var c = Color.FromArgb(128, 30, 30, 30);
var c2 = Color.FromArgb(128, 10, 10, 10); var c2 = Color.FromArgb(128, 10, 10, 10);
var p = new float2(0, -4);
var q = new float2(0, -3);
var r = new float2(0, -2);
var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2); var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2);
var z = float2.Lerp(xy, Xy, value); var z = float2.Lerp(xy, Xy, value);
var wlr = Game.Renderer.WorldLineRenderer; var wlr = Game.Renderer.WorldLineRenderer;
wlr.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c); wlr.DrawLine(xy + p, Xy + p, c, c);
wlr.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2); wlr.DrawLine(xy + q, Xy + q, c2, c2);
wlr.DrawLine(xy + new float2(0, -2), Xy + new float2(0, -2), c, c); wlr.DrawLine(xy + r, Xy + r, c, c);
wlr.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), barColor, barColor); wlr.DrawLine(xy + p, z + p, barColor2, barColor2);
wlr.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), barColor2, barColor2); wlr.DrawLine(xy + q, z + q, barColor, barColor);
wlr.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), barColor2, barColor2); wlr.DrawLine(xy + r, z + r, barColor2, barColor2);
} }
void DrawHealthBar(WorldRenderer wr, Actor self, float2 xy, float2 Xy) void DrawHealthBar(WorldRenderer wr, Actor self, float2 xy, float2 Xy)
@@ -115,6 +119,9 @@ namespace OpenRA.Traits
var c = Color.FromArgb(128, 30, 30, 30); var c = Color.FromArgb(128, 30, 30, 30);
var c2 = Color.FromArgb(128, 10, 10, 10); var c2 = Color.FromArgb(128, 10, 10, 10);
var p = new float2(0, -4);
var q = new float2(0, -3);
var r = new float2(0, -2);
var healthColor = (health.DamageState == DamageState.Critical) ? Color.Red : var healthColor = (health.DamageState == DamageState.Critical) ? Color.Red :
(health.DamageState == DamageState.Heavy) ? Color.Yellow : Color.LimeGreen; (health.DamageState == DamageState.Heavy) ? Color.Yellow : Color.LimeGreen;
@@ -128,13 +135,13 @@ namespace OpenRA.Traits
var z = float2.Lerp(xy, Xy, (float)health.HP / health.MaxHP); var z = float2.Lerp(xy, Xy, (float)health.HP / health.MaxHP);
var wlr = Game.Renderer.WorldLineRenderer; var wlr = Game.Renderer.WorldLineRenderer;
wlr.DrawLine(xy + new float2(0, -4), Xy + new float2(0, -4), c, c); wlr.DrawLine(xy + p, Xy + p, c, c);
wlr.DrawLine(xy + new float2(0, -3), Xy + new float2(0, -3), c2, c2); wlr.DrawLine(xy + q, Xy + q, c2, c2);
wlr.DrawLine(xy + new float2(0, -2), Xy + new float2(0, -2), c, c); wlr.DrawLine(xy + r, Xy + r, c, c);
wlr.DrawLine(xy + new float2(0, -3), z + new float2(0, -3), healthColor, healthColor); wlr.DrawLine(xy + p, z + p, healthColor2, healthColor2);
wlr.DrawLine(xy + new float2(0, -2), z + new float2(0, -2), healthColor2, healthColor2); wlr.DrawLine(xy + q, z + q, healthColor, healthColor);
wlr.DrawLine(xy + new float2(0, -4), z + new float2(0, -4), healthColor2, healthColor2); wlr.DrawLine(xy + r, z + r, healthColor2, healthColor2);
if (health.DisplayHp != health.HP) if (health.DisplayHp != health.HP)
{ {
@@ -146,9 +153,9 @@ namespace OpenRA.Traits
deltaColor.B / 2); deltaColor.B / 2);
var zz = float2.Lerp(xy, Xy, (float)health.DisplayHp / health.MaxHP); var zz = float2.Lerp(xy, Xy, (float)health.DisplayHp / health.MaxHP);
wlr.DrawLine(z + new float2(0, -3), zz + new float2(0, -3), deltaColor, deltaColor); wlr.DrawLine(z + p, zz + p, deltaColor2, deltaColor2);
wlr.DrawLine(z + new float2(0, -2), zz + new float2(0, -2), deltaColor2, deltaColor2); wlr.DrawLine(z + q, zz + q, deltaColor, deltaColor);
wlr.DrawLine(z + new float2(0, -4), zz + new float2(0, -4), deltaColor2, deltaColor2); wlr.DrawLine(z + r, zz + r, deltaColor2, deltaColor2);
} }
} }