Reuse a HashSet for deduplicating footprints in AffectsShroud.
Shroud footprints are recalculated as actors move around the map, and thus this gets called quite often. This allows us to avoid allocating a new set and the CPU hit required to set it up each time.
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
*/
|
*/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using OpenRA.Traits;
|
using OpenRA.Traits;
|
||||||
|
|
||||||
@@ -30,6 +31,8 @@ namespace OpenRA.Mods.Common.Traits
|
|||||||
{
|
{
|
||||||
static readonly PPos[] NoCells = { };
|
static readonly PPos[] NoCells = { };
|
||||||
|
|
||||||
|
readonly HashSet<PPos> footprint;
|
||||||
|
|
||||||
[Sync] CPos cachedLocation;
|
[Sync] CPos cachedLocation;
|
||||||
[Sync] bool cachedTraitDisabled;
|
[Sync] bool cachedTraitDisabled;
|
||||||
|
|
||||||
@@ -37,7 +40,11 @@ namespace OpenRA.Mods.Common.Traits
|
|||||||
protected abstract void RemoveCellsFromPlayerShroud(Actor self, Player player);
|
protected abstract void RemoveCellsFromPlayerShroud(Actor self, Player player);
|
||||||
|
|
||||||
public AffectsShroud(Actor self, AffectsShroudInfo info)
|
public AffectsShroud(Actor self, AffectsShroudInfo info)
|
||||||
: base(info) { }
|
: base(info)
|
||||||
|
{
|
||||||
|
if (Info.Type == VisibilityType.Footprint)
|
||||||
|
footprint = new HashSet<PPos>();
|
||||||
|
}
|
||||||
|
|
||||||
PPos[] ProjectedCells(Actor self)
|
PPos[] ProjectedCells(Actor self)
|
||||||
{
|
{
|
||||||
@@ -47,9 +54,14 @@ namespace OpenRA.Mods.Common.Traits
|
|||||||
return NoCells;
|
return NoCells;
|
||||||
|
|
||||||
if (Info.Type == VisibilityType.Footprint)
|
if (Info.Type == VisibilityType.Footprint)
|
||||||
return self.OccupiesSpace.OccupiedCells()
|
{
|
||||||
.SelectMany(kv => Shroud.ProjectedCellsInRange(map, kv.First, range, Info.MaxHeightDelta))
|
// PERF: Reuse collection to avoid allocations.
|
||||||
.Distinct().ToArray();
|
footprint.UnionWith(self.OccupiesSpace.OccupiedCells()
|
||||||
|
.SelectMany(kv => Shroud.ProjectedCellsInRange(map, kv.First, range, Info.MaxHeightDelta)));
|
||||||
|
var cells = footprint.ToArray();
|
||||||
|
footprint.Clear();
|
||||||
|
return cells;
|
||||||
|
}
|
||||||
|
|
||||||
var pos = self.CenterPosition;
|
var pos = self.CenterPosition;
|
||||||
if (Info.Type == VisibilityType.GroundPosition)
|
if (Info.Type == VisibilityType.GroundPosition)
|
||||||
|
|||||||
Reference in New Issue
Block a user