From 43e84c89eff46738e83c5893aed2ff6265c19864 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 15 Sep 2019 12:36:23 +0100 Subject: [PATCH] Rename SelectionBarsRenderable to SelectionBarsAnnotationRenderable. --- ...Renderable.cs => SelectionBarsAnnotationRenderable.cs} | 8 ++++---- OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename OpenRA.Mods.Common/Graphics/{SelectionBarsRenderable.cs => SelectionBarsAnnotationRenderable.cs} (93%) diff --git a/OpenRA.Mods.Common/Graphics/SelectionBarsRenderable.cs b/OpenRA.Mods.Common/Graphics/SelectionBarsAnnotationRenderable.cs similarity index 93% rename from OpenRA.Mods.Common/Graphics/SelectionBarsRenderable.cs rename to OpenRA.Mods.Common/Graphics/SelectionBarsAnnotationRenderable.cs index 4fe7fe80ba..d7a96885bd 100644 --- a/OpenRA.Mods.Common/Graphics/SelectionBarsRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/SelectionBarsAnnotationRenderable.cs @@ -15,7 +15,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Graphics { - public struct SelectionBarsRenderable : IRenderable, IFinalizedRenderable + public struct SelectionBarsAnnotationRenderable : IRenderable, IFinalizedRenderable { readonly WPos pos; readonly Actor actor; @@ -23,14 +23,14 @@ namespace OpenRA.Mods.Common.Graphics readonly bool displayExtra; readonly Rectangle decorationBounds; - public SelectionBarsRenderable(Actor actor, Rectangle decorationBounds, bool displayHealth, bool displayExtra) + public SelectionBarsAnnotationRenderable(Actor actor, Rectangle decorationBounds, bool displayHealth, bool displayExtra) : this(actor.CenterPosition, actor, decorationBounds) { this.displayHealth = displayHealth; this.displayExtra = displayExtra; } - public SelectionBarsRenderable(WPos pos, Actor actor, Rectangle decorationBounds) + public SelectionBarsAnnotationRenderable(WPos pos, Actor actor, Rectangle decorationBounds) : this() { this.pos = pos; @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Graphics public IRenderable WithPalette(PaletteReference newPalette) { return this; } public IRenderable WithZOffset(int newOffset) { return this; } - public IRenderable OffsetBy(WVec vec) { return new SelectionBarsRenderable(pos + vec, actor, decorationBounds); } + public IRenderable OffsetBy(WVec vec) { return new SelectionBarsAnnotationRenderable(pos + vec, actor, decorationBounds); } public IRenderable AsDecoration() { return this; } void DrawExtraBars(WorldRenderer wr, float2 start, float2 end) diff --git a/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs b/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs index 0b4291f6cf..ed96c4c396 100644 --- a/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs +++ b/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs @@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits.Render yield return new SelectionBoxRenderable(self, bounds, Info.SelectionBoxColor); if (Info.RenderSelectionBars && (displayHealth || displayExtra)) - yield return new SelectionBarsRenderable(self, bounds, displayHealth, displayExtra); + yield return new SelectionBarsAnnotationRenderable(self, bounds, displayHealth, displayExtra); // Target lines and pips are always only displayed for selected allied actors if (!selected || !self.Owner.IsAlliedWith(wr.World.RenderPlayer)) @@ -125,7 +125,7 @@ namespace OpenRA.Mods.Common.Traits.Render public void DrawRollover(Actor self, WorldRenderer worldRenderer) { var bounds = decorationBounds.FirstNonEmptyBounds(self, worldRenderer); - new SelectionBarsRenderable(self, bounds, true, true).Render(worldRenderer); + new SelectionBarsAnnotationRenderable(self, bounds, true, true).Render(worldRenderer); } IEnumerable DrawPips(Actor self, Rectangle bounds, WorldRenderer wr)