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

Merge pull request #11862 from pchote/effects-above-shroud

Browse Source 
Draw tactical overlays (beacons, rallypoints, text overlays, order generators) above the shroud.
This commit is contained in:
reaperrr
2016-08-25 20:47:08 +02:00
committed by GitHub
parent af8bd461c7 cd0ba2049f
commit e811612c06
42 changed files with 241 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Effects/Beacon.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Scripting;
namespace OpenRA.Mods.Common.Effects
{
public class Beacon : IEffect, IScriptBindable
public class Beacon : IEffect, IScriptBindable, IEffectAboveShroud
{
static readonly int MaxArrowHeight = 512;
@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Effects
}
}
public void Tick(World world)
void IEffect.Tick(World world)
{
arrowHeight += arrowSpeed;
var clamped = arrowHeight.Clamp(0, MaxArrowHeight);
@@ -98,7 +98,9 @@ namespace OpenRA.Mods.Common.Effects
clock.Tick();
}
public IEnumerable<IRenderable> Render(WorldRenderer r)
IEnumerable<IRenderable> IEffect.Render(WorldRenderer r) { return SpriteRenderable.None; }
IEnumerable<IRenderable> IEffectAboveShroud.RenderAboveShroud(WorldRenderer r)
{
if (!owner.IsAlliedWith(owner.World.RenderPlayer))
yield break;

6
OpenRA.Mods.Common/Effects/FloatingText.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Mods.Common.Graphics;
namespace OpenRA.Mods.Common.Effects
{
public class FloatingText : IEffect
public class FloatingText : IEffect, IEffectAboveShroud
{
static readonly WVec Velocity = new WVec(0, 0, 86);
@@ -45,7 +45,9 @@ namespace OpenRA.Mods.Common.Effects
pos += Velocity;
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> Render(WorldRenderer wr) { return SpriteRenderable.None; }
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr)
{
if (wr.World.FogObscures(pos))
yield break;

8
OpenRA.Mods.Common/Effects/PowerdownIndicator.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Effects
{
class PowerdownIndicator : IEffect
class PowerdownIndicator : IEffect, IEffectAboveShroud
{
readonly Actor a;
readonly Animation anim;
@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Effects
anim.PlayRepeating(canPowerDown.Info.IndicatorSequence);
}
public void Tick(World world)
void IEffect.Tick(World world)
{
if (!a.IsInWorld || a.IsDead || !canPowerDown.Disabled)
world.AddFrameEndTask(w => w.Remove(this));
@@ -39,7 +39,9 @@ namespace OpenRA.Mods.Common.Effects
anim.Tick();
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
IEnumerable<IRenderable> IEffect.Render(WorldRenderer wr) { return SpriteRenderable.None; }
IEnumerable<IRenderable> IEffectAboveShroud.RenderAboveShroud(WorldRenderer wr)
{
if (a.Disposed || wr.World.FogObscures(a))
return SpriteRenderable.None;

9
OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
View File

@@ -10,14 +10,13 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Effects
{
class RallyPointIndicator : IEffect
class RallyPointIndicator : IEffect, IEffectAboveShroud
{
readonly Actor building;
readonly RallyPoint rp;
@@ -41,7 +40,7 @@ namespace OpenRA.Mods.Common.Effects
circles.Play(rp.Info.CirclesSequence);
}
public void Tick(World world)
void IEffect.Tick(World world)
{
flag.Tick();
circles.Tick();
@@ -76,7 +75,9 @@ namespace OpenRA.Mods.Common.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
IEnumerable<IRenderable> IEffect.Render(WorldRenderer wr) { return SpriteRenderable.None; }
IEnumerable<IRenderable> IEffectAboveShroud.RenderAboveShroud(WorldRenderer wr)
{
if (!building.IsInWorld || !building.Owner.IsAlliedWith(building.World.LocalPlayer))
return SpriteRenderable.None;

8
OpenRA.Mods.Common/Effects/RepairIndicator.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Effects
{
class RepairIndicator : IEffect
class RepairIndicator : IEffect, IEffectAboveShroud
{
readonly Actor building;
readonly Animation anim;
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Effects
CycleRepairer();
}
public void Tick(World world)
void IEffect.Tick(World world)
{
if (!building.IsInWorld || building.IsDead || !rb.Repairers.Any())
world.AddFrameEndTask(w => w.Remove(this));
@@ -43,7 +43,9 @@ namespace OpenRA.Mods.Common.Effects
anim.Tick();
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
IEnumerable<IRenderable> IEffect.Render(WorldRenderer wr) { return SpriteRenderable.None; }
IEnumerable<IRenderable> IEffectAboveShroud.RenderAboveShroud(WorldRenderer wr)
{
if (building.Disposed || rb.Repairers.Count == 0 || wr.World.FogObscures(building))
return SpriteRenderable.None;

13
OpenRA.Mods.Common/Orders/BeaconOrderGenerator.cs
View File

@@ -18,21 +18,16 @@ namespace OpenRA.Mods.Common.Orders
{
public IEnumerable<Order> Order(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
if (mi.Button != MouseButton.Left)
world.CancelInputMode();
else if (!world.ShroudObscures(cell))
{
world.CancelInputMode();
yield return new Order("PlaceBeacon", world.LocalPlayer.PlayerActor, false) { TargetLocation = cell, SuppressVisualFeedback = true };
}
world.CancelInputMode();
yield return new Order("PlaceBeacon", world.LocalPlayer.PlayerActor, false) { TargetLocation = cell, SuppressVisualFeedback = true };
}
public virtual void Tick(World world) { }
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
public string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
return !world.ShroudObscures(cell) ? "ability" : "generic-blocked";
return "ability";
}
}
}

2
OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Orders
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
public string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{

2
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -148,7 +148,7 @@ namespace OpenRA.Mods.Common.Orders
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var topLeft = xy - FootprintUtils.AdjustForBuildingSize(buildingInfo);

2
OpenRA.Mods.Common/Orders/RepairOrderGenerator.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Orders
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
public string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{

11
OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new BaseProvider(init.Self, this); }
}
public class BaseProvider : ITick, IPostRenderSelection, ISelectionBar
public class BaseProvider : ITick, IRenderAboveShroudWhenSelected, ISelectionBar
{
public readonly BaseProviderInfo Info;
readonly DeveloperMode devMode;
@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits
allyBuildEnabled = self.World.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (progress > 0)
progress--;
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
return self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer));
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RangeCircleRenderables(WorldRenderer wr)
{
// Visible to player and allies
if (!ValidRenderPlayer())
@@ -81,6 +81,11 @@ namespace OpenRA.Mods.Common.Traits
Color.FromArgb(96, Color.Black));
}
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return RangeCircleRenderables(wr);
}
float ISelectionBar.GetValue()
{
// Visible to player and allies

6
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -129,11 +129,9 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
if (!RequiresBaseProvider)
yield break;
return SpriteRenderable.None;
foreach (var a in w.ActorsWithTrait<BaseProvider>())
foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r;
return w.ActorsWithTrait<BaseProvider>().SelectMany(a => a.Trait.RangeCircleRenderables(wr));
}
}

8
OpenRA.Mods.Common/Traits/CombatDebugOverlay.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new CombatDebugOverlay(init.Self); }
}
public class CombatDebugOverlay : IPostRender, INotifyDamage, INotifyCreated
public class CombatDebugOverlay : IRenderAboveWorld, INotifyDamage, INotifyCreated
{
readonly DeveloperMode devMode;
readonly HealthInfo healthInfo;
@@ -42,12 +42,12 @@ namespace OpenRA.Mods.Common.Traits
devMode = localPlayer != null ? localPlayer.PlayerActor.Trait<DeveloperMode>() : null;
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
allBlockers = self.TraitsImplementing<IBlocksProjectiles>().ToArray();
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (devMode == null || !devMode.ShowCombatGeometry)
return;
@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void Damaged(Actor self, AttackInfo e)
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
if (devMode == null || !devMode.ShowCombatGeometry || e.Damage.Value == 0)
return;

4
OpenRA.Mods.Common/Traits/ExitsDebugOverlay.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
object ITraitInfo.Create(ActorInitializer init) { return new ExitsDebugOverlay(init.Self, this); }
}
public class ExitsDebugOverlay : IPostRender
public class ExitsDebugOverlay : IRenderAboveWorld
{
readonly ExitsDebugOverlayManager manager;
readonly ExitsDebugOverlayInfo info;
@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
exits = self.Info.TraitInfos<ExitInfo>().ToArray();
}
void IPostRender.RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (manager == null || !manager.Enabled)
return;

16
OpenRA.Mods.Common/Traits/Render/DrawLineToTarget.cs
View File

@@ -23,15 +23,17 @@ namespace OpenRA.Mods.Common.Traits
public virtual object Create(ActorInitializer init) { return new DrawLineToTarget(init.Self, this); }
}
public class DrawLineToTarget : IPostRenderSelection, INotifySelected, INotifyBecomingIdle
public class DrawLineToTarget : IRenderAboveShroudWhenSelected, INotifySelected, INotifyBecomingIdle
{
Actor self;
DrawLineToTargetInfo info;
readonly DrawLineToTargetInfo info;
List<Target> targets;
Color c;
int lifetime;
public DrawLineToTarget(Actor self, DrawLineToTargetInfo info) { this.self = self; this.info = info; }
public DrawLineToTarget(Actor self, DrawLineToTargetInfo info)
{
this.info = info;
}
public void SetTarget(Actor self, Target target, Color c, bool display)
{
@@ -51,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
lifetime = info.Delay;
}
public void Selected(Actor a)
void INotifySelected.Selected(Actor a)
{
if (a.IsIdle)
return;
@@ -60,7 +62,7 @@ namespace OpenRA.Mods.Common.Traits
lifetime = info.Delay;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
if ((lifetime <= 0 || --lifetime <= 0) && !force)
@@ -81,7 +83,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void OnBecomingIdle(Actor a)
void INotifyBecomingIdle.OnBecomingIdle(Actor a)
{
if (a.IsIdle)
targets = null;

8
OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public object Create(ActorInitializer init) { return new RenderDebugState(init.Self, this); }
}
class RenderDebugState : INotifyAddedToWorld, INotifyOwnerChanged, IPostRenderSelection
class RenderDebugState : INotifyAddedToWorld, INotifyOwnerChanged, IRenderAboveShroudWhenSelected
{
readonly DeveloperMode devMode;
readonly SpriteFont font;
@@ -53,12 +53,12 @@ namespace OpenRA.Mods.Common.Traits.Render
ai = self.Owner.PlayerActor.TraitsImplementing<HackyAI>().FirstOrDefault(x => x.IsEnabled);
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
tagString = self.ToString();
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
color = GetColor();
}
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits.Render
return self.EffectiveOwner != null ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
if (devMode == null || !devMode.ShowActorTags)
yield break;

8
OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
View File

@@ -35,19 +35,17 @@ namespace OpenRA.Mods.Common.Traits.Render
public object Create(ActorInitializer init) { return new RenderDetectionCircle(init.Self, this); }
}
class RenderDetectionCircle : ITick, IPostRenderSelection
class RenderDetectionCircle : ITick, IRenderAboveShroudWhenSelected
{
readonly RenderDetectionCircleInfo info;
readonly Actor self;
WAngle lineAngle;
public RenderDetectionCircle(Actor self, RenderDetectionCircleInfo info)
{
this.info = info;
this.self = self;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
@@ -71,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits.Render
info.ContrastColor);
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
lineAngle += info.UpdateLineTick;
}

31
OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
View File

@@ -32,23 +32,24 @@ namespace OpenRA.Mods.Common.Traits.Render
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
if (range == WDist.Zero)
yield break;
return SpriteRenderable.None;
yield return new RangeCircleRenderable(
var localRange = new RangeCircleRenderable(
centerPosition,
range,
0,
Color.FromArgb(128, Color.Yellow),
Color.FromArgb(96, Color.Black));
foreach (var a in w.ActorsWithTrait<RenderRangeCircle>())
if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
if (a.Actor.Info.TraitInfo<RenderRangeCircleInfo>().RangeCircleType == RangeCircleType)
foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r;
var otherRanges = w.ActorsWithTrait<RenderRangeCircle>()
.Where(a => a.Trait.Info.RangeCircleType == RangeCircleType)
.SelectMany(a => a.Trait.RangeCircleRenderables(wr));
return otherRanges.Append(localRange);
}
public object Create(ActorInitializer init) { return new RenderRangeCircle(init.Self); }
public object Create(ActorInitializer init) { return new RenderRangeCircle(init.Self, this); }
public void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
var armaments = ai.TraitInfos<ArmamentInfo>().Where(a => a.UpgradeMinEnabledLevel == 0);
@@ -60,18 +61,21 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
class RenderRangeCircle : IPostRenderSelection
class RenderRangeCircle : IRenderAboveShroudWhenSelected
{
public readonly RenderRangeCircleInfo Info;
readonly Actor self;
readonly AttackBase attack;
public RenderRangeCircle(Actor self)
public RenderRangeCircle(Actor self, RenderRangeCircleInfo info)
{
Info = info;
this.self = self;
attack = self.Trait<AttackBase>();
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RangeCircleRenderables(WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
@@ -87,5 +91,10 @@ namespace OpenRA.Mods.Common.Traits.Render
Color.FromArgb(128, Color.Yellow),
Color.FromArgb(96, Color.Black));
}
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return RangeCircleRenderables(wr);
}
}
}

40
OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs
View File

@@ -41,25 +41,23 @@ namespace OpenRA.Mods.Common.Traits.Render
public int[] SelectionBoxBounds { get { return VisualBounds; } }
}
public class SelectionDecorations : IPostRenderSelection, ITick
public class SelectionDecorations : IRenderAboveShroud, ITick
{
// depends on the order of pips in TraitsInterfaces.cs!
static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" };
public readonly SelectionDecorationsInfo Info;
readonly Actor self;
readonly Animation pipImages;
public SelectionDecorations(Actor self, SelectionDecorationsInfo info)
{
this.self = self;
Info = info;
pipImages = new Animation(self.World, Info.Image);
}
IEnumerable<WPos> ActivityTargetPath()
IEnumerable<WPos> ActivityTargetPath(Actor self)
{
if (!self.IsInWorld || self.IsDead)
yield break;
@@ -75,33 +73,51 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroud.RenderAboveShroud(Actor self, WorldRenderer wr)
{
if (self.World.FogObscures(self))
yield break;
if (Info.RenderSelectionBox)
var selected = self.World.Selection.Contains(self);
var regularWorld = self.World.Type == WorldType.Regular;
var statusBars = Game.Settings.Game.StatusBars;
// Health bars are shown when:
// * actor is selected
// * status bar preference is set to "always show"
// * status bar preference is set to "when damaged" and actor is damaged
var displayHealth = selected || (regularWorld && statusBars == StatusBarsType.AlwaysShow)
|| (regularWorld && statusBars == StatusBarsType.DamageShow && self.GetDamageState() != DamageState.Undamaged);
// Extra bars are shown when:
// * actor is selected
// * status bar preference is set to "always show"
// * status bar preference is set to "when damaged"
var displayExtra = selected || (regularWorld && statusBars != StatusBarsType.Standard);
if (Info.RenderSelectionBox && selected)
yield return new SelectionBoxRenderable(self, Info.SelectionBoxColor);
if (Info.RenderSelectionBars)
yield return new SelectionBarsRenderable(self, true, true);
if (Info.RenderSelectionBars && (displayHealth || displayExtra))
yield return new SelectionBarsRenderable(self, displayHealth, displayExtra);
if (!self.Owner.IsAlliedWith(wr.World.RenderPlayer))
// Target lines and pips are always only displayed for selected allied actors
if (!selected || !self.Owner.IsAlliedWith(wr.World.RenderPlayer))
yield break;
if (self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug)
yield return new TargetLineRenderable(ActivityTargetPath(), Color.Green);
yield return new TargetLineRenderable(ActivityTargetPath(self), Color.Green);
var b = self.VisualBounds;
var pos = wr.ScreenPxPosition(self.CenterPosition);
var bl = wr.Viewport.WorldToViewPx(pos + new int2(b.Left, b.Bottom));
var pal = wr.Palette(Info.Palette);
foreach (var r in DrawPips(wr, self, bl, pal))
foreach (var r in DrawPips(self, wr, bl, pal))
yield return r;
}
IEnumerable<IRenderable> DrawPips(WorldRenderer wr, Actor self, int2 basePosition, PaletteReference palette)
IEnumerable<IRenderable> DrawPips(Actor self, WorldRenderer wr, int2 basePosition, PaletteReference palette)
{
var pipSources = self.TraitsImplementing<IPips>();
if (!pipSources.Any())

14
OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
View File

@@ -55,17 +55,15 @@ namespace OpenRA.Mods.Common.Traits.Render
public override object Create(ActorInitializer init) { return new WithDecoration(init.Self, this); }
}
public class WithDecoration : UpgradableTrait<WithDecorationInfo>, ITick, IRender, IPostRenderSelection
public class WithDecoration : UpgradableTrait<WithDecorationInfo>, ITick, IRender, IRenderAboveShroudWhenSelected
{
protected readonly Animation Anim;
readonly string image;
readonly Actor self;
public WithDecoration(Actor self, WithDecorationInfo info)
: base(info)
{
this.self = self;
image = info.Image ?? self.Info.Name;
Anim = new Animation(self.World, image, () => self.World.Paused);
Anim.PlayRepeating(info.Sequence);
@@ -73,14 +71,14 @@ namespace OpenRA.Mods.Common.Traits.Render
public virtual bool ShouldRender(Actor self) { return true; }
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
IEnumerable<IRenderable> IRender.Render(Actor self, WorldRenderer wr)
{
return !Info.RequiresSelection ? RenderInner(self, wr) : Enumerable.Empty<IRenderable>();
return !Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return Info.RequiresSelection ? RenderInner(self, wr) : Enumerable.Empty<IRenderable>();
return Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None;
}
IEnumerable<IRenderable> RenderInner(Actor self, WorldRenderer wr)
@@ -129,6 +127,6 @@ namespace OpenRA.Mods.Common.Traits.Render
return new IRenderable[] { new UISpriteRenderable(Anim.Image, self.CenterPosition, pxPos, Info.ZOffset, wr.Palette(Info.Palette), 1f) };
}
public void Tick(Actor self) { Anim.Tick(); }
void ITick.Tick(Actor self) { Anim.Tick(); }
}
}

12
OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
View File

@@ -52,14 +52,14 @@ namespace OpenRA.Mods.Common.Traits.Render
foreach (var a in w.ActorsWithTrait<WithRangeCircle>())
if (a.Trait.Info.Type == Type)
foreach (var r in a.Trait.RenderRangeCircle(wr))
foreach (var r in a.Trait.RenderRangeCircle(a.Actor, wr))
yield return r;
}
public object Create(ActorInitializer init) { return new WithRangeCircle(init.Self, this); }
}
class WithRangeCircle : IPostRenderSelection, IPostRender
class WithRangeCircle : IRenderAboveShroudWhenSelected, IRenderAboveWorld
{
public readonly WithRangeCircleInfo Info;
readonly Actor self;
@@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public IEnumerable<IRenderable> RenderRangeCircle(WorldRenderer wr)
public IEnumerable<IRenderable> RenderRangeCircle(Actor self, WorldRenderer wr)
{
if (Info.Visible == RangeCircleVisibility.WhenSelected && Visible)
yield return new RangeCircleRenderable(
@@ -92,12 +92,12 @@ namespace OpenRA.Mods.Common.Traits.Render
yield break;
}
IEnumerable<IRenderable> IPostRenderSelection.RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return RenderRangeCircle(wr);
return RenderRangeCircle(self, wr);
}
void IPostRender.RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (Info.Visible == RangeCircleVisibility.Always && Visible)
RangeCircleRenderable.DrawRangeCircle(

11
OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs
View File

@@ -35,22 +35,19 @@ namespace OpenRA.Mods.Common.Traits.Render
public object Create(ActorInitializer init) { return new WithSpriteControlGroupDecoration(init.Self, this); }
}
public class WithSpriteControlGroupDecoration : IPostRenderSelection
public class WithSpriteControlGroupDecoration : IRenderAboveShroudWhenSelected
{
public readonly WithSpriteControlGroupDecorationInfo Info;
readonly Actor self;
readonly Animation pipImages;
public WithSpriteControlGroupDecoration(Actor self, WithSpriteControlGroupDecorationInfo info)
{
this.self = self;
Info = info;
pipImages = new Animation(self.World, Info.Image);
}
IEnumerable<IRenderable> IPostRenderSelection.RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
if (self.World.FogObscures(self))
yield break;
@@ -59,11 +56,11 @@ namespace OpenRA.Mods.Common.Traits.Render
yield break;
var pal = wr.Palette(Info.Palette);
foreach (var r in DrawControlGroup(wr, self, pal))
foreach (var r in DrawControlGroup(self, wr, pal))
yield return r;
}
IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self, PaletteReference palette)
IEnumerable<IRenderable> DrawControlGroup(Actor self, WorldRenderer wr, PaletteReference palette)
{
var group = self.World.Selection.GetControlGroupForActor(self);
if (group == null)

10
OpenRA.Mods.Common/Traits/Render/WithTextControlGroupDecoration.cs
View File

@@ -47,17 +47,15 @@ namespace OpenRA.Mods.Common.Traits.Render
public object Create(ActorInitializer init) { return new WithTextControlGroupDecoration(init.Self, this); }
}
public class WithTextControlGroupDecoration : IPostRenderSelection, INotifyCapture
public class WithTextControlGroupDecoration : IRenderAboveShroudWhenSelected, INotifyCapture
{
readonly WithTextControlGroupDecorationInfo info;
readonly SpriteFont font;
readonly Actor self;
Color color;
public WithTextControlGroupDecoration(Actor self, WithTextControlGroupDecorationInfo info)
{
this.self = self;
this.info = info;
if (!Game.Renderer.Fonts.TryGetValue(info.Font, out font))
@@ -66,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits.Render
color = info.UsePlayerColor ? self.Owner.Color.RGB : info.Color;
}
IEnumerable<IRenderable> IPostRenderSelection.RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
if (self.World.FogObscures(self))
yield break;
@@ -74,11 +72,11 @@ namespace OpenRA.Mods.Common.Traits.Render
if (self.Owner != wr.World.LocalPlayer)
yield break;
foreach (var r in DrawControlGroup(wr, self))
foreach (var r in DrawControlGroup(self, wr))
yield return r;
}
IEnumerable<IRenderable> DrawControlGroup(WorldRenderer wr, Actor self)
IEnumerable<IRenderable> DrawControlGroup(Actor self, WorldRenderer wr)
{
var group = self.World.Selection.GetControlGroupForActor(self);
if (group == null)

18
OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
View File

@@ -54,34 +54,28 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public class WithTextDecoration : UpgradableTrait<WithTextDecorationInfo>, IRender, IPostRenderSelection, INotifyCapture
public class WithTextDecoration : UpgradableTrait<WithTextDecorationInfo>, IRender, IRenderAboveShroudWhenSelected, INotifyCapture
{
readonly Actor self;
readonly SpriteFont font;
Color color;
public WithTextDecoration(Actor self, WithTextDecorationInfo info)
: base(info)
{
this.self = self;
if (!Game.Renderer.Fonts.TryGetValue(info.Font, out font))
throw new YamlException("Font '{0}' is not listed in the mod.yaml's Fonts section".F(info.Font));
font = Game.Renderer.Fonts[info.Font];
color = Info.UsePlayerColor ? self.Owner.Color.RGB : Info.Color;
}
public virtual bool ShouldRender(Actor self) { return true; }
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
IEnumerable<IRenderable> IRender.Render(Actor self, WorldRenderer wr)
{
return !Info.RequiresSelection ? RenderInner(self, wr) : Enumerable.Empty<IRenderable>();
return !Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return Info.RequiresSelection ? RenderInner(self, wr) : Enumerable.Empty<IRenderable>();
return Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None;
}
IEnumerable<IRenderable> RenderInner(Actor self, WorldRenderer wr)

2
OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
View File

@@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.Traits
world.CancelInputMode();
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
foreach (var unit in power.UnitsInRange(xy))

2
OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
View File

@@ -291,7 +291,7 @@ namespace OpenRA.Mods.Common.Traits
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
public string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
return world.Map.Contains(cell) ? cursor : "generic-blocked";

6
OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual object Create(ActorInitializer init) { return new EditorSelectionLayer(init.Self, this); }
}
public class EditorSelectionLayer : IWorldLoaded, IPostRender
public class EditorSelectionLayer : IWorldLoaded, IRenderAboveWorld
{
readonly EditorSelectionLayerInfo info;
readonly Map map;
@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits
pasteSprite = map.Rules.Sequences.GetSequence(info.Image, info.PasteSequence).GetSprite(0);
}
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
if (w.Type != WorldType.Editor)
return;
@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
CopyRegion = PasteRegion = null;
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (wr.World.Type != WorldType.Editor)
return;

4
OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Mods.Common.Traits
notVisibleEdges = info.UseExtendedIndex ? Edges.AllSides : Edges.AllCorners;
}
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
// Initialize tile cache
// This includes the region outside the visible area to cover any sprites peeking outside the map
@@ -230,7 +230,7 @@ namespace OpenRA.Mods.Common.Traits
cellsDirty.UnionWith(cells);
}
public void RenderShroud(WorldRenderer wr, Shroud shroud)
void IRenderShroud.RenderShroud(Shroud shroud, WorldRenderer wr)
{
if (currentShroud != shroud)
{

8
OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
View File

@@ -20,14 +20,14 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Renders a debug overlay showing the terrain cells. Attach this to the world actor.")]
public class TerrainGeometryOverlayInfo : TraitInfo<TerrainGeometryOverlay> { }
public class TerrainGeometryOverlay : IPostRender, IWorldLoaded, IChatCommand
public class TerrainGeometryOverlay : IRenderAboveWorld, IWorldLoaded, IChatCommand
{
const string CommandName = "terrainoverlay";
const string CommandDesc = "Toggles the terrain geometry overlay";
public bool Enabled;
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
var console = w.WorldActor.TraitOrDefault<ChatCommands>();
var help = w.WorldActor.TraitOrDefault<HelpCommand>();
@@ -39,13 +39,13 @@ namespace OpenRA.Mods.Common.Traits
help.RegisterHelp(CommandName, CommandDesc);
}
public void InvokeCommand(string name, string arg)
void IChatCommand.InvokeCommand(string name, string arg)
{
if (name == CommandName)
Enabled ^= true;
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (!Enabled)
return;

4
OpenRA.Mods.Common/Traits/World/WarheadDebugOverlay.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new WarheadDebugOverlay(this); }
}
public class WarheadDebugOverlay : IPostRender
public class WarheadDebugOverlay : IRenderAboveWorld
{
class WHImpact
{
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
impacts.Add(new WHImpact(pos, range, info.DisplayDuration, color));
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
foreach (var i in impacts)
{

6
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new WeatherOverlay(init.World, this); }
}
public class WeatherOverlay : ITick, IPostRender
public class WeatherOverlay : ITick, IRenderAboveWorld
{
readonly WeatherOverlayInfo info;
readonly World world;
@@ -201,7 +201,7 @@ namespace OpenRA.Mods.Common.Traits
tempParticle.SwingOffset += tempParticle.SwingDirection * tempParticle.SwingSpeed;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
windTickCountdown--;
}
@@ -298,7 +298,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (!world.Paused)
UpdateWeatherOverlay(wr);