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

Cache DomainIndex in PathFinder

Browse Source 
Should save a trait look-up for each path search. Also ditch bogus null checks (this trait is a must-have anyway, so we *want* to crash if it's missing).
This commit is contained in:
reaperrr
2018-06-18 23:36:46 +02:00
committed by abcdefg30
parent 893e20ee76
commit adc03c41b1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Traits/World/PathFinder.cs
View File

@@ -55,6 +55,8 @@ namespace OpenRA.Mods.Common.Traits
{ {
static readonly List<CPos> EmptyPath = new List<CPos>(0); static readonly List<CPos> EmptyPath = new List<CPos>(0);
readonly World world; readonly World world;
DomainIndex domainIndex;
bool cached;
public PathFinder(World world) public PathFinder(World world)
{ {
@@ -64,9 +66,13 @@ namespace OpenRA.Mods.Common.Traits
public List<CPos> FindUnitPath(CPos source, CPos target, Actor self, Actor ignoreActor) public List<CPos> FindUnitPath(CPos source, CPos target, Actor self, Actor ignoreActor)
{ {
var li = self.Info.TraitInfo<MobileInfo>().LocomotorInfo; var li = self.Info.TraitInfo<MobileInfo>().LocomotorInfo;
if (!cached)
{
domainIndex = world.WorldActor.TraitOrDefault<DomainIndex>();
cached = true;
}
// If a water-land transition is required, bail early // If a water-land transition is required, bail early
var domainIndex = world.WorldActor.TraitOrDefault<DomainIndex>();
if (domainIndex != null && !domainIndex.IsPassable(source, target, li)) if (domainIndex != null && !domainIndex.IsPassable(source, target, li))
return EmptyPath; return EmptyPath;
@@ -86,6 +92,12 @@ namespace OpenRA.Mods.Common.Traits
public List<CPos> FindUnitPathToRange(CPos source, SubCell srcSub, WPos target, WDist range, Actor self) public List<CPos> FindUnitPathToRange(CPos source, SubCell srcSub, WPos target, WDist range, Actor self)
{ {
if (!cached)
{
domainIndex = world.WorldActor.TraitOrDefault<DomainIndex>();
cached = true;
}
var mi = self.Info.TraitInfo<MobileInfo>(); var mi = self.Info.TraitInfo<MobileInfo>();
var li = mi.LocomotorInfo; var li = mi.LocomotorInfo;
var targetCell = world.Map.CellContaining(target); var targetCell = world.Map.CellContaining(target);
@@ -101,7 +113,6 @@ namespace OpenRA.Mods.Common.Traits
// See if there is any cell within range that does not involve a cross-domain request // See if there is any cell within range that does not involve a cross-domain request
// Really, we only need to check the circle perimeter, but it's not clear that would be a performance win // Really, we only need to check the circle perimeter, but it's not clear that would be a performance win
var domainIndex = world.WorldActor.TraitOrDefault<DomainIndex>();
if (domainIndex != null) if (domainIndex != null)
{ {
tilesInRange = new List<CPos>(tilesInRange.Where(t => domainIndex.IsPassable(source, t, li))); tilesInRange = new List<CPos>(tilesInRange.Where(t => domainIndex.IsPassable(source, t, li)));