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

Cache unchanging values for MoveWithinRange

Browse Source 
In theory, CandidateMovementCells could be called
every tick, so let's avoid creating the vars
every time.
This commit is contained in:
reaperrr
2021-07-24 15:50:52 +02:00
committed by teinarss
parent 0249116206
commit 777a927c04
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Activities/Move/MoveWithinRange.cs
View File

@@ -20,6 +20,9 @@ namespace OpenRA.Mods.Common.Activities
{ {
readonly WDist maxRange; readonly WDist maxRange;
readonly WDist minRange; readonly WDist minRange;
readonly Map map;
readonly int maxCells;
readonly int minCells;
public MoveWithinRange(Actor self, in Target target, WDist minRange, WDist maxRange, public MoveWithinRange(Actor self, in Target target, WDist minRange, WDist maxRange,
WPos? initialTargetPosition = null, Color? targetLineColor = null) WPos? initialTargetPosition = null, Color? targetLineColor = null)
@@ -27,6 +30,9 @@ namespace OpenRA.Mods.Common.Activities
{ {
this.minRange = minRange; this.minRange = minRange;
this.maxRange = maxRange; this.maxRange = maxRange;
map = self.World.Map;
maxCells = (maxRange.Length + 1023) / 1024;
minCells = minRange.Length / 1024;
} }
protected override bool ShouldStop(Actor self) protected override bool ShouldStop(Actor self)
@@ -44,10 +50,6 @@ namespace OpenRA.Mods.Common.Activities
protected override IEnumerable<CPos> CandidateMovementCells(Actor self) protected override IEnumerable<CPos> CandidateMovementCells(Actor self)
{ {
var map = self.World.Map;
var maxCells = (maxRange.Length + 1023) / 1024;
var minCells = minRange.Length / 1024;
return map.FindTilesInAnnulus(lastVisibleTargetLocation, minCells, maxCells) return map.FindTilesInAnnulus(lastVisibleTargetLocation, minCells, maxCells)
.Where(c => Mobile.CanStayInCell(c) && AtCorrectRange(map.CenterOfSubCell(c, Mobile.FromSubCell))); .Where(c => Mobile.CanStayInCell(c) && AtCorrectRange(map.CenterOfSubCell(c, Mobile.FromSubCell)));
} }