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

Avoid or reduce LINQ allocations required in various areas.

Browse Source
This commit is contained in:
RoosterDragon
2020-10-11 11:46:39 +01:00
committed by abcdefg30
parent da53d5b776
commit bb116034c7
9 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Actor.cs
View File

@@ -110,7 +110,7 @@ namespace OpenRA
readonly IDefaultVisibility defaultVisibility;
readonly INotifyBecomingIdle[] becomingIdles;
readonly INotifyIdle[] tickIdles;
readonly ITargetablePositions[] targetablePositions;
readonly IEnumerable<ITargetablePositions> enabledTargetablePositions;
WPos[] staticTargetablePositions;
bool created;
@@ -166,7 +166,8 @@ namespace OpenRA
becomingIdles = TraitsImplementing<INotifyBecomingIdle>().ToArray();
tickIdles = TraitsImplementing<INotifyIdle>().ToArray();
Targetables = TraitsImplementing<ITargetable>().ToArray();
targetablePositions = TraitsImplementing<ITargetablePositions>().ToArray();
var targetablePositions = TraitsImplementing<ITargetablePositions>().ToArray();
enabledTargetablePositions = targetablePositions.Where(Exts.IsTraitEnabled);
world.AddFrameEndTask(w =>
{
// Caching this in a AddFrameEndTask, because trait construction order might cause problems if done directly at creation time.
@@ -515,9 +516,8 @@ namespace OpenRA
if (staticTargetablePositions != null)
return staticTargetablePositions;
var enabledTargetablePositionTraits = targetablePositions.Where(Exts.IsTraitEnabled);
if (enabledTargetablePositionTraits.Any())
return enabledTargetablePositionTraits.SelectMany(tp => tp.TargetablePositions(this));
if (enabledTargetablePositions.Any())
return enabledTargetablePositions.SelectMany(tp => tp.TargetablePositions(this));
return new[] { CenterPosition };
}

10
OpenRA.Game/Graphics/SpriteFont.cs
View File

@@ -239,7 +239,15 @@ namespace OpenRA.Graphics
return new int2(0, size);
var lines = text.Split('\n');
return new int2((int)Math.Ceiling(lines.Max(lineWidth)), lines.Length * size);
return new int2((int)Math.Ceiling(MaxLineWidth(lines, lineWidth)), lines.Length * size);
}
static float MaxLineWidth(string[] lines, Func<string, float> lineWidth)
{
var maxWidth = 0f;
foreach (var line in lines)
maxWidth = Math.Max(maxWidth, lineWidth(line));
return maxWidth;
}
GlyphInfo CreateGlyph(char c)

6
OpenRA.Game/Map/Map.cs
View File

@@ -1282,16 +1282,12 @@ namespace OpenRA
throw new ArgumentOutOfRangeException("maxRange",
"The requested range ({0}) cannot exceed the value of MaximumTileSearchRange ({1})".F(maxRange, Grid.MaximumTileSearchRange));
Func<CPos, bool> valid = Contains;
if (allowOutsideBounds)
valid = Tiles.Contains;
for (var i = minRange; i <= maxRange; i++)
{
foreach (var offset in Grid.TilesByDistance[i])
{
var t = offset + center;
if (valid(t))
if (allowOutsideBounds ? Tiles.Contains(t) : Contains(t))
yield return t;
}
}

2
OpenRA.Mods.Common/Traits/CapturableProgressBlink.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
return;
if (!captorOwners.Any())
if (captorOwners.Count == 0)
{
tick = 0;
return;

8
OpenRA.Mods.Common/Traits/CreatesShroud.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
@@ -25,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
public class CreatesShroud : AffectsShroud
{
readonly CreatesShroudInfo info;
ICreatesShroudModifier[] rangeModifiers;
IEnumerable<int> rangeModifiers;
public CreatesShroud(Actor self, CreatesShroudInfo info)
: base(self, info)
@@ -37,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
{
base.Created(self);
rangeModifiers = self.TraitsImplementing<ICreatesShroudModifier>().ToArray();
rangeModifiers = self.TraitsImplementing<ICreatesShroudModifier>().ToArray().Select(x => x.GetCreatesShroudModifier());
}
protected override void AddCellsToPlayerShroud(Actor self, Player p, PPos[] uv)
@@ -57,8 +58,7 @@ namespace OpenRA.Mods.Common.Traits
if (CachedTraitDisabled)
return WDist.Zero;
var revealsShroudModifier = rangeModifiers.Select(x => x.GetCreatesShroudModifier());
var range = Util.ApplyPercentageModifiers(Info.Range.Length, revealsShroudModifier);
var range = Util.ApplyPercentageModifiers(Info.Range.Length, rangeModifiers);
return new WDist(range);
}
}

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits.Render
protected override bool ShouldRender(Actor self)
{
if (!rb.Repairers.Any())
if (rb.Repairers.Count == 0)
return false;
return base.ShouldRender(self);

6
OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
View File

@@ -106,8 +106,10 @@ namespace OpenRA.Mods.Common.Traits.Render
if (!Info.Recoils)
return t.Position(self);
var recoilDist = arms.Aggregate(WDist.Zero, (a, b) => a + b.Recoil);
var recoil = new WVec(-recoilDist, WDist.Zero, WDist.Zero);
var recoilDist = 0;
foreach (var arm in arms)
recoilDist += arm.Recoil.Length;
var recoil = new WVec(new WDist(-recoilDist), WDist.Zero, WDist.Zero);
return t.Position(self) + body.LocalToWorld(recoil.Rotate(t.WorldOrientation));
}

8
OpenRA.Mods.Common/Traits/RevealsShroud.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly RevealsShroudInfo info;
readonly Shroud.SourceType type;
IRevealsShroudModifier[] rangeModifiers;
IEnumerable<int> rangeModifiers;
public RevealsShroud(Actor self, RevealsShroudInfo info)
: base(self, info)
@@ -43,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
{
base.Created(self);
rangeModifiers = self.TraitsImplementing<IRevealsShroudModifier>().ToArray();
rangeModifiers = self.TraitsImplementing<IRevealsShroudModifier>().ToArray().Select(x => x.GetRevealsShroudModifier());
}
protected override void AddCellsToPlayerShroud(Actor self, Player p, PPos[] uv)
@@ -63,8 +64,7 @@ namespace OpenRA.Mods.Common.Traits
if (CachedTraitDisabled)
return WDist.Zero;
var revealsShroudModifier = rangeModifiers.Select(x => x.GetRevealsShroudModifier());
var range = Util.ApplyPercentageModifiers(Info.Range.Length, revealsShroudModifier);
var range = Util.ApplyPercentageModifiers(Info.Range.Length, rangeModifiers);
return new WDist(range);
}
}

3
OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -249,7 +249,8 @@ namespace OpenRA.Mods.Common.Widgets
var position = GetTextPosition(text, font, rb);
var hover = Ui.MouseOverWidget == this || Children.Any(c => c == Ui.MouseOverWidget);
// PERF: Avoid LINQ by using Children.Find(...) != null instead of Children.Any(...)
var hover = Ui.MouseOverWidget == this || Children.Find(c => c == Ui.MouseOverWidget) != null;
DrawBackground(rb, disabled, Depressed, hover, highlighted);
if (Contrast)
font.DrawTextWithContrast(text, position + stateOffset,