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

ActorMap, do not look up influence node up to three times in cell layer.

Browse Source
This commit is contained in:
Vapre
2023-05-27 23:04:36 +02:00
committed by Matthias Mailänder
parent c82be175e1
commit d72b1ffd49
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.Common/Traits/World/ActorMap.cs
View File

@@ -298,14 +298,15 @@ namespace OpenRA.Mods.Common.Traits
if (!layer.Contains(uv))
return preferredSubCell != SubCell.Any ? preferredSubCell : SubCell.First;
if (preferredSubCell != SubCell.Any && !AnyActorsAt(uv, cell, layer, preferredSubCell, checkTransient))
var influenceNode = layer[uv];
if (preferredSubCell != SubCell.Any && !AnyActorsAt(influenceNode, cell, preferredSubCell, checkTransient))
return preferredSubCell;
if (!AnyActorsAt(uv, layer))
if (influenceNode == null)
return map.Grid.DefaultSubCell;
for (var i = (int)SubCell.First; i < map.Grid.SubCellOffsets.Length; i++)
if (i != (int)preferredSubCell && !AnyActorsAt(uv, cell, layer, (SubCell)i, checkTransient))
if (i != (int)preferredSubCell && !AnyActorsAt(influenceNode, cell, (SubCell)i, checkTransient))
return (SubCell)i;
return SubCell.Invalid;
@@ -318,25 +319,20 @@ namespace OpenRA.Mods.Common.Traits
if (!layer.Contains(uv))
return preferredSubCell != SubCell.Any ? preferredSubCell : SubCell.First;
if (preferredSubCell != SubCell.Any && !AnyActorsAt(uv, layer, preferredSubCell, checkIfBlocker))
var influenceNode = layer[uv];
if (preferredSubCell != SubCell.Any && !AnyActorsAt(influenceNode, preferredSubCell, checkIfBlocker))
return preferredSubCell;
if (!AnyActorsAt(uv, layer))
if (influenceNode == null)
return map.Grid.DefaultSubCell;
for (var i = (byte)SubCell.First; i < map.Grid.SubCellOffsets.Length; i++)
if (i != (byte)preferredSubCell && !AnyActorsAt(uv, layer, (SubCell)i, checkIfBlocker))
if (i != (byte)preferredSubCell && !AnyActorsAt(influenceNode, (SubCell)i, checkIfBlocker))
return (SubCell)i;
return SubCell.Invalid;
}
// NOTE: pos required to be in map bounds
bool AnyActorsAt(MPos uv, CellLayer<InfluenceNode> layer)
{
return layer[uv] != null;
}
// NOTE: always includes transients with influence
public bool AnyActorsAt(CPos a)
{
@@ -345,14 +341,14 @@ namespace OpenRA.Mods.Common.Traits
if (!layer.Contains(uv))
return false;
return AnyActorsAt(uv, layer);
return layer[uv] != null;
}
// NOTE: pos required to be in map bounds
bool AnyActorsAt(MPos uv, CPos a, CellLayer<InfluenceNode> layer, SubCell sub, bool checkTransient)
bool AnyActorsAt(InfluenceNode influenceNode, CPos a, SubCell sub, bool checkTransient)
{
var always = sub == SubCell.FullCell || sub == SubCell.Any;
for (var i = layer[uv]; i != null; i = i.Next)
for (var i = influenceNode; i != null; i = i.Next)
{
if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell)
{
@@ -376,14 +372,15 @@ namespace OpenRA.Mods.Common.Traits
if (!layer.Contains(uv))
return false;
return AnyActorsAt(uv, a, layer, sub, checkTransient);
return AnyActorsAt(layer[uv], a, sub, checkTransient);
}
// NOTE: can not check aircraft
bool AnyActorsAt(MPos uv, CellLayer<InfluenceNode> layer, SubCell sub, Func<Actor, bool> withCondition)
bool AnyActorsAt(InfluenceNode influenceNode, SubCell sub, Func<Actor, bool> withCondition)
{
var always = sub == SubCell.FullCell || sub == SubCell.Any;
for (var i = layer[uv]; i != null; i = i.Next)
for (var i = influenceNode; i != null; i = i.Next)
if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && withCondition(i.Actor))
return true;
@@ -398,7 +395,7 @@ namespace OpenRA.Mods.Common.Traits
if (!layer.Contains(uv))
return false;
return AnyActorsAt(uv, layer, sub, withCondition);
return AnyActorsAt(layer[uv], sub, withCondition);
}
public IEnumerable<Actor> AllActors()