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

Move debug target path rendering to SelectionDecorations

Browse Source
This commit is contained in:
reaperrr
2015-06-08 01:08:41 +02:00
parent c23ee1be2e
commit 875d8bac06
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,9 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.Traits namespace OpenRA.Traits
{ {
@@ -19,6 +17,7 @@ namespace OpenRA.Traits
public class SelectableInfo : ITraitInfo public class SelectableInfo : ITraitInfo
{ {
public readonly int Priority = 10; public readonly int Priority = 10;
[Desc("Bounds for the selectable area.")] [Desc("Bounds for the selectable area.")]
public readonly int[] Bounds = null; public readonly int[] Bounds = null;
@@ -29,40 +28,16 @@ namespace OpenRA.Traits
public object Create(ActorInitializer init) { return new Selectable(init.Self, this); } public object Create(ActorInitializer init) { return new Selectable(init.Self, this); }
} }
public class Selectable : IPostRenderSelection public class Selectable
{ {
public readonly string Class = null; public readonly string Class = null;
public SelectableInfo Info; public readonly SelectableInfo Info;
readonly Actor self;
public Selectable(Actor self, SelectableInfo info) public Selectable(Actor self, SelectableInfo info)
{ {
this.self = self;
Info = info; Info = info;
Class = string.IsNullOrEmpty(info.Class) ? self.Info.Name : info.Class; Class = string.IsNullOrEmpty(info.Class) ? self.Info.Name : info.Class;
} }
IEnumerable<WPos> ActivityTargetPath()
{
if (!self.IsInWorld || self.IsDead)
yield break;
var activity = self.GetCurrentActivity();
if (activity != null)
{
var targets = activity.GetTargets(self);
yield return self.CenterPosition;
foreach (var t in targets.Where(t => t.Type != TargetType.Invalid))
yield return t.CenterPosition;
}
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug)
yield return new TargetLineRenderable(ActivityTargetPath(), Color.Green);
}
} }
} }

21
OpenRA.Mods.Common/Traits/SelectionDecorations.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" }; static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" };
static readonly string[] TagStrings = { "", "tag-fake", "tag-primary" }; static readonly string[] TagStrings = { "", "tag-fake", "tag-primary" };
public SelectionDecorationsInfo Info; public readonly SelectionDecorationsInfo Info;
readonly Actor self; readonly Actor self;
public ISelectionDecorationsInfo SelectionDecorationsInfo { get { return Info; } } public ISelectionDecorationsInfo SelectionDecorationsInfo { get { return Info; } }
@@ -49,6 +49,22 @@ namespace OpenRA.Mods.Common.Traits
Info = info; Info = info;
} }
IEnumerable<WPos> ActivityTargetPath()
{
if (!self.IsInWorld || self.IsDead)
yield break;
var activity = self.GetCurrentActivity();
if (activity != null)
{
var targets = activity.GetTargets(self);
yield return self.CenterPosition;
foreach (var t in targets.Where(t => t.Type != TargetType.Invalid))
yield return t.CenterPosition;
}
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{ {
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer) || self.World.FogObscures(self)) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer) || self.World.FogObscures(self))
@@ -60,6 +76,9 @@ namespace OpenRA.Mods.Common.Traits
if (Info.RenderSelectionBars) if (Info.RenderSelectionBars)
yield return new SelectionBarsRenderable(self); yield return new SelectionBarsRenderable(self);
if (self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug)
yield return new TargetLineRenderable(ActivityTargetPath(), Color.Green);
var b = self.VisualBounds; var b = self.VisualBounds;
var pos = wr.ScreenPxPosition(self.CenterPosition); var pos = wr.ScreenPxPosition(self.CenterPosition);
var tl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Top)); var tl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Top));