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

Rename SelectionBoxRenderable to SelectionBoxAnnotationRenderable.

Browse Source
This commit is contained in:
Paul Chote
2019-09-15 12:37:23 +01:00
committed by abcdefg30
parent 43e84c89ef
commit 1599eac66c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -179,7 +179,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (unit.CanBeViewedByPlayer(manager.Self.Owner)) if (unit.CanBeViewedByPlayer(manager.Self.Owner))
{ {
var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr); var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr);
yield return new SelectionBoxRenderable(unit, bounds, Color.Red); yield return new SelectionBoxAnnotationRenderable(unit, bounds, Color.Red);
} }
} }
} }
@@ -302,7 +302,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (unit.CanBeViewedByPlayer(manager.Self.Owner)) if (unit.CanBeViewedByPlayer(manager.Self.Owner))
{ {
var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr); var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr);
yield return new SelectionBoxRenderable(unit, bounds, Color.Red); yield return new SelectionBoxAnnotationRenderable(unit, bounds, Color.Red);
} }
} }
} }

8
OpenRA.Mods.Common/Graphics/SelectionBoxRenderable.cs → OpenRA.Mods.Common/Graphics/SelectionBoxAnnotationRenderable.cs
View File

@@ -14,16 +14,16 @@ using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public struct SelectionBoxRenderable : IRenderable, IFinalizedRenderable public struct SelectionBoxAnnotationRenderable : IRenderable, IFinalizedRenderable
{ {
readonly WPos pos; readonly WPos pos;
readonly Rectangle decorationBounds; readonly Rectangle decorationBounds;
readonly Color color; readonly Color color;
public SelectionBoxRenderable(Actor actor, Rectangle decorationBounds, Color color) public SelectionBoxAnnotationRenderable(Actor actor, Rectangle decorationBounds, Color color)
: this(actor.CenterPosition, decorationBounds, color) { } : this(actor.CenterPosition, decorationBounds, color) { }
public SelectionBoxRenderable(WPos pos, Rectangle decorationBounds, Color color) public SelectionBoxAnnotationRenderable(WPos pos, Rectangle decorationBounds, Color color)
{ {
this.pos = pos; this.pos = pos;
this.decorationBounds = decorationBounds; this.decorationBounds = decorationBounds;
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Graphics
public IRenderable WithPalette(PaletteReference newPalette) { return this; } public IRenderable WithPalette(PaletteReference newPalette) { return this; }
public IRenderable WithZOffset(int newOffset) { return this; } public IRenderable WithZOffset(int newOffset) { return this; }
public IRenderable OffsetBy(WVec vec) { return new SelectionBoxRenderable(pos + vec, decorationBounds, color); } public IRenderable OffsetBy(WVec vec) { return new SelectionBoxAnnotationRenderable(pos + vec, decorationBounds, color); }
public IRenderable AsDecoration() { return this; } public IRenderable AsDecoration() { return this; }
public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; } public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }

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

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var displayExtra = selected || (regularWorld && statusBars != StatusBarsType.Standard); var displayExtra = selected || (regularWorld && statusBars != StatusBarsType.Standard);
if (Info.RenderSelectionBox && selected) if (Info.RenderSelectionBox && selected)
yield return new SelectionBoxRenderable(self, bounds, Info.SelectionBoxColor); yield return new SelectionBoxAnnotationRenderable(self, bounds, Info.SelectionBoxColor);
if (Info.RenderSelectionBars && (displayHealth || displayExtra)) if (Info.RenderSelectionBars && (displayHealth || displayExtra))
yield return new SelectionBarsAnnotationRenderable(self, bounds, displayHealth, displayExtra); yield return new SelectionBarsAnnotationRenderable(self, bounds, displayHealth, displayExtra);

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

@@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var unit in power.UnitsInRange(xy)) foreach (var unit in power.UnitsInRange(xy))
{ {
var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr); var bounds = unit.TraitsImplementing<IDecorationBounds>().FirstNonEmptyBounds(unit, wr);
yield return new SelectionBoxRenderable(unit, bounds, Color.Red); yield return new SelectionBoxAnnotationRenderable(unit, bounds, Color.Red);
} }
} }

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

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly WPos CenterPosition; public readonly WPos CenterPosition;
public readonly IReadOnlyDictionary<CPos, SubCell> Footprint; public readonly IReadOnlyDictionary<CPos, SubCell> Footprint;
public readonly Rectangle Bounds; public readonly Rectangle Bounds;
public readonly SelectionBoxRenderable SelectionBox; public readonly SelectionBoxAnnotationRenderable SelectionBox;
public readonly ActorReference Actor; public readonly ActorReference Actor;
public string Tooltip public string Tooltip
@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
Bounds = r.Union(); Bounds = r.Union();
SelectionBox = new SelectionBoxRenderable(new WPos(CenterPosition.X, CenterPosition.Y, 8192), SelectionBox = new SelectionBoxAnnotationRenderable(new WPos(CenterPosition.X, CenterPosition.Y, 8192),
new Rectangle(Bounds.X, Bounds.Y, Bounds.Width, Bounds.Height), Color.White); new Rectangle(Bounds.X, Bounds.Y, Bounds.Width, Bounds.Height), Color.White);
} }