diff --git a/OpenRA.Mods.Common/Effects/FloatingText.cs b/OpenRA.Mods.Common/Effects/FloatingText.cs index f9e6161119..b4d57840ed 100644 --- a/OpenRA.Mods.Common/Effects/FloatingText.cs +++ b/OpenRA.Mods.Common/Effects/FloatingText.cs @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Effects if (wr.World.FogObscures(pos) || wr.World.ShroudObscures(pos)) yield break; - yield return new TextRenderable(font, pos, 0, color, text); + yield return new TextAnnotationRenderable(font, pos, 0, color, text); } public static string FormatCashTick(int cashAmount) diff --git a/OpenRA.Mods.Common/Graphics/TextRenderable.cs b/OpenRA.Mods.Common/Graphics/TextAnnotationRenderable.cs similarity index 79% rename from OpenRA.Mods.Common/Graphics/TextRenderable.cs rename to OpenRA.Mods.Common/Graphics/TextAnnotationRenderable.cs index 19a36dac4f..8ba1ac4320 100644 --- a/OpenRA.Mods.Common/Graphics/TextRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/TextAnnotationRenderable.cs @@ -16,7 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Graphics { - public struct TextRenderable : IRenderable, IFinalizedRenderable + public struct TextAnnotationRenderable : IRenderable, IFinalizedRenderable { readonly SpriteFont font; readonly WPos pos; @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Graphics readonly Color bgLight; readonly string text; - public TextRenderable(SpriteFont font, WPos pos, int zOffset, Color color, Color bgDark, Color bgLight, string text) + public TextAnnotationRenderable(SpriteFont font, WPos pos, int zOffset, Color color, Color bgDark, Color bgLight, string text) { this.font = font; this.pos = pos; @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Graphics this.text = text; } - public TextRenderable(SpriteFont font, WPos pos, int zOffset, Color color, string text) + public TextAnnotationRenderable(SpriteFont font, WPos pos, int zOffset, Color color, string text) : this(font, pos, zOffset, color, ChromeMetrics.Get("TextContrastColorDark"), ChromeMetrics.Get("TextContrastColorLight"), @@ -48,9 +48,9 @@ namespace OpenRA.Mods.Common.Graphics public int ZOffset { get { return zOffset; } } public bool IsDecoration { get { return true; } } - public IRenderable WithPalette(PaletteReference newPalette) { return new TextRenderable(font, pos, zOffset, color, text); } - public IRenderable WithZOffset(int newOffset) { return new TextRenderable(font, pos, zOffset, color, text); } - public IRenderable OffsetBy(WVec vec) { return new TextRenderable(font, pos + vec, zOffset, color, text); } + public IRenderable WithPalette(PaletteReference newPalette) { return new TextAnnotationRenderable(font, pos, zOffset, color, text); } + public IRenderable WithZOffset(int newOffset) { return new TextAnnotationRenderable(font, pos, zOffset, color, text); } + public IRenderable OffsetBy(WVec vec) { return new TextAnnotationRenderable(font, pos + vec, zOffset, color, text); } public IRenderable AsDecoration() { return this; } public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; } diff --git a/OpenRA.Mods.Common/Traits/ExitsDebugOverlay.cs b/OpenRA.Mods.Common/Traits/ExitsDebugOverlay.cs index 5b29b66e0d..c6b39ba0e9 100644 --- a/OpenRA.Mods.Common/Traits/ExitsDebugOverlay.cs +++ b/OpenRA.Mods.Common/Traits/ExitsDebugOverlay.cs @@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits var color = self.Owner.Color; var vec = exitCell - self.Location; var center = wr.World.Map.CenterOfCell(exitCell); - yield return new TextRenderable(manager.Font, center, 0, color, vec.ToString()); + yield return new TextAnnotationRenderable(manager.Font, center, 0, color, vec.ToString()); } } @@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits var vec = perimCell - self.Location; var center = wr.World.Map.CenterOfCell(perimCell); - yield return new TextRenderable(manager.Font, center, 0, color, vec.ToString()); + yield return new TextAnnotationRenderable(manager.Font, center, 0, color, vec.ToString()); } } diff --git a/OpenRA.Mods.Common/Traits/Render/CustomTerrainDebugOverlay.cs b/OpenRA.Mods.Common/Traits/Render/CustomTerrainDebugOverlay.cs index 90ef34b04a..83557f2c2e 100644 --- a/OpenRA.Mods.Common/Traits/Render/CustomTerrainDebugOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/CustomTerrainDebugOverlay.cs @@ -74,7 +74,7 @@ namespace OpenRA.Mods.Common.Traits continue; var info = wr.World.Map.GetTerrainInfo(cell); - yield return new TextRenderable(font, center, 0, info.Color, info.Type); + yield return new TextAnnotationRenderable(font, center, 0, info.Color, info.Type); } } diff --git a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs index 848dba38d3..8920819de8 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs @@ -75,12 +75,12 @@ namespace OpenRA.Mods.Common.Traits.Render if (debugVis == null || !debugVis.ActorTags) yield break; - yield return new TextRenderable(font, self.CenterPosition - offset, 0, color, tagString); + yield return new TextAnnotationRenderable(font, self.CenterPosition - offset, 0, color, tagString); // Get the actor's activity. var activity = self.CurrentActivity; if (activity != null) - yield return new TextRenderable(font, self.CenterPosition, 0, color, activity.DebugLabelComponents().JoinWith(".")); + yield return new TextAnnotationRenderable(font, self.CenterPosition, 0, color, activity.DebugLabelComponents().JoinWith(".")); // Get the AI squad that this actor belongs to. if (!self.Owner.IsBot) @@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits.Render yield break; var aiSquadInfo = "{0}, {1}".F(squad.Type, squad.TargetActor); - yield return new TextRenderable(font, self.CenterPosition + offset, 0, color, aiSquadInfo); + yield return new TextAnnotationRenderable(font, self.CenterPosition + offset, 0, color, aiSquadInfo); } bool IRenderAnnotationsWhenSelected.SpatiallyPartitionable { get { return true; } } diff --git a/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs index 30c4ef65a1..4f5eac4398 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs @@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits.Render var spaceBuffer = (int)(10 / wr.Viewport.Zoom); var effectPos = wr.ProjectedPosition(new int2((bounds.Left + bounds.Right) / 2, bounds.Y - spaceBuffer)); - yield return new TextRenderable(font, effectPos, 0, color, name); + yield return new TextAnnotationRenderable(font, effectPos, 0, color, name); } bool IRenderAnnotations.SpatiallyPartitionable { get { return false; } } diff --git a/OpenRA.Mods.Common/Traits/Render/WithTextControlGroupDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithTextControlGroupDecoration.cs index a8097606ef..c89026cc10 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithTextControlGroupDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithTextControlGroupDecoration.cs @@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Traits.Render var screenPos = boundsOffset + sizeOffset + info.ScreenOffset; - yield return new TextRenderable(font, wr.ProjectedPosition(screenPos), info.ZOffset, color, number); + yield return new TextAnnotationRenderable(font, wr.ProjectedPosition(screenPos), info.ZOffset, color, number); } void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) diff --git a/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs index ac3c709191..e0c0aa77bf 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs @@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Traits.Render sizeOffset -= new int2(halfSize.X, 0); } - return new IRenderable[] { new TextRenderable(font, wr.ProjectedPosition(boundsOffset + sizeOffset), Info.ZOffset, color, Info.Text) }; + return new IRenderable[] { new TextAnnotationRenderable(font, wr.ProjectedPosition(boundsOffset + sizeOffset), Info.ZOffset, color, Info.Text) }; } void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)