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

Avoid allocating a compiler generated enumerator in WithDecoration.Render.

Browse Source
This commit is contained in:
RoosterDragon
2015-07-09 20:25:58 +01:00
parent 1d9c6251c0
commit 218712f5d3
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
@@ -87,27 +88,27 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
{ {
if (IsTraitDisabled) if (IsTraitDisabled)
yield break; return Enumerable.Empty<IRenderable>();
if (self.IsDead || !self.IsInWorld) if (self.IsDead || !self.IsInWorld)
yield break; return Enumerable.Empty<IRenderable>();
if (anim == null) if (anim == null)
yield break; return Enumerable.Empty<IRenderable>();
var allied = self.Owner.IsAlliedWith(self.World.RenderPlayer); var allied = self.Owner.IsAlliedWith(self.World.RenderPlayer);
if (!allied && !info.ShowToEnemies) if (!allied && !info.ShowToEnemies)
yield break; return Enumerable.Empty<IRenderable>();
if (allied && !info.ShowToAllies) if (allied && !info.ShowToAllies)
yield break; return Enumerable.Empty<IRenderable>();
if (!ShouldRender(self)) if (!ShouldRender(self))
yield break; return Enumerable.Empty<IRenderable>();
if (self.World.FogObscures(self)) if (self.World.FogObscures(self))
yield break; return Enumerable.Empty<IRenderable>();
var pxPos = wr.ScreenPxPosition(self.CenterPosition); var pxPos = wr.ScreenPxPosition(self.CenterPosition);
var actorBounds = self.Bounds; var actorBounds = self.Bounds;
@@ -150,7 +151,7 @@ namespace OpenRA.Mods.Common.Traits
anim.Tick(); anim.Tick();
yield return new SpriteRenderable(img, renderPos, WVec.Zero, info.ZOffset, wr.Palette(info.Palette), info.Scale, true); return new IRenderable[] { new SpriteRenderable(img, renderPos, WVec.Zero, info.ZOffset, wr.Palette(info.Palette), info.Scale, true) };
} }
} }
} }