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

Fix WithTextDecoration rendering.

Browse Source
This commit is contained in:
Paul Chote
2019-12-14 18:42:50 +00:00
committed by reaperrr
parent 5a686b3289
commit 032c412e09
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits.Render
} }
} }
public class WithTextDecoration : ConditionalTrait<WithTextDecorationInfo>, IRender, IRenderAnnotationsWhenSelected, INotifyOwnerChanged public class WithTextDecoration : ConditionalTrait<WithTextDecorationInfo>, IRenderAnnotations, IRenderAnnotationsWhenSelected, INotifyOwnerChanged
{ {
readonly SpriteFont font; readonly SpriteFont font;
readonly IDecorationBounds[] decorationBounds; readonly IDecorationBounds[] decorationBounds;
@@ -73,16 +73,12 @@ namespace OpenRA.Mods.Common.Traits.Render
public virtual bool ShouldRender(Actor self) { return true; } public virtual bool ShouldRender(Actor self) { return true; }
IEnumerable<IRenderable> IRender.Render(Actor self, WorldRenderer wr) IEnumerable<IRenderable> IRenderAnnotations.RenderAnnotations(Actor self, WorldRenderer wr)
{ {
return !Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None; return !Info.RequiresSelection ? RenderInner(self, wr) : SpriteRenderable.None;
} }
IEnumerable<Rectangle> IRender.ScreenBounds(Actor self, WorldRenderer wr) public bool SpatiallyPartitionable { get { return true; } }
{
// Text decorations don't contribute to actor bounds
yield break;
}
IEnumerable<IRenderable> IRenderAnnotationsWhenSelected.RenderAnnotations(Actor self, WorldRenderer wr) IEnumerable<IRenderable> IRenderAnnotationsWhenSelected.RenderAnnotations(Actor self, WorldRenderer wr)
{ {