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

Added CellUpdated event to ActorMap

Browse Source
This commit is contained in:
teinarss
2019-07-07 19:46:33 +02:00
committed by reaperrr
parent 3a17b26405
commit 27077d6427
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -259,6 +259,8 @@ namespace OpenRA.Traits
WDist LargestActorRadius { get; } WDist LargestActorRadius { get; }
WDist LargestBlockingActorRadius { get; } WDist LargestBlockingActorRadius { get; }
event Action<IEnumerable<CPos>> CellsUpdated;
} }
[RequireExplicitImplementation] [RequireExplicitImplementation]

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

@@ -173,7 +173,7 @@ namespace OpenRA.Mods.Common.Traits
readonly CellLayer<InfluenceNode> influence; readonly CellLayer<InfluenceNode> influence;
readonly Dictionary<int, CellLayer<InfluenceNode>> customInfluence = new Dictionary<int, CellLayer<InfluenceNode>>(); readonly Dictionary<int, CellLayer<InfluenceNode>> customInfluence = new Dictionary<int, CellLayer<InfluenceNode>>();
public readonly Dictionary<int, ICustomMovementLayer> CustomMovementLayers = new Dictionary<int, ICustomMovementLayer>(); public readonly Dictionary<int, ICustomMovementLayer> CustomMovementLayers = new Dictionary<int, ICustomMovementLayer>();
public event Action<IEnumerable<CPos>> CellsUpdated;
readonly Bin[] bins; readonly Bin[] bins;
readonly int rows, cols; readonly int rows, cols;
@@ -182,6 +182,7 @@ namespace OpenRA.Mods.Common.Traits
readonly HashSet<Actor> addActorPosition = new HashSet<Actor>(); readonly HashSet<Actor> addActorPosition = new HashSet<Actor>();
readonly HashSet<Actor> removeActorPosition = new HashSet<Actor>(); readonly HashSet<Actor> removeActorPosition = new HashSet<Actor>();
readonly Predicate<Actor> actorShouldBeRemoved; readonly Predicate<Actor> actorShouldBeRemoved;
readonly HashSet<CPos> updatedCells = new HashSet<CPos>();
public WDist LargestActorRadius { get; private set; } public WDist LargestActorRadius { get; private set; }
public WDist LargestBlockingActorRadius { get; private set; } public WDist LargestBlockingActorRadius { get; private set; }
@@ -370,6 +371,8 @@ namespace OpenRA.Mods.Common.Traits
if (cellTriggerInfluence.TryGetValue(c.First, out triggers)) if (cellTriggerInfluence.TryGetValue(c.First, out triggers))
foreach (var t in triggers) foreach (var t in triggers)
t.Dirty = true; t.Dirty = true;
updatedCells.Add(c.First);
} }
} }
@@ -390,6 +393,8 @@ namespace OpenRA.Mods.Common.Traits
if (cellTriggerInfluence.TryGetValue(c.First, out triggers)) if (cellTriggerInfluence.TryGetValue(c.First, out triggers))
foreach (var t in triggers) foreach (var t in triggers)
t.Dirty = true; t.Dirty = true;
updatedCells.Add(c.First);
} }
} }
@@ -437,6 +442,12 @@ namespace OpenRA.Mods.Common.Traits
foreach (var t in proximityTriggers) foreach (var t in proximityTriggers)
t.Value.Tick(this); t.Value.Tick(this);
self.World.AddFrameEndTask(s =>
{
if (CellsUpdated != null)
CellsUpdated(updatedCells);
});
} }
public int AddCellTrigger(CPos[] cells, Action<Actor> onEntry, Action<Actor> onExit) public int AddCellTrigger(CPos[] cells, Action<Actor> onEntry, Action<Actor> onExit)
@@ -515,7 +526,7 @@ namespace OpenRA.Mods.Common.Traits
public void AddPosition(Actor a, IOccupySpace ios) public void AddPosition(Actor a, IOccupySpace ios)
{ {
UpdatePosition(a, ios); addActorPosition.Add(a);
} }
public void RemovePosition(Actor a, IOccupySpace ios) public void RemovePosition(Actor a, IOccupySpace ios)
@@ -526,7 +537,7 @@ namespace OpenRA.Mods.Common.Traits
public void UpdatePosition(Actor a, IOccupySpace ios) public void UpdatePosition(Actor a, IOccupySpace ios)
{ {
RemovePosition(a, ios); RemovePosition(a, ios);
addActorPosition.Add(a); AddPosition(a, ios);
} }
int CellCoordToBinIndex(int cell) int CellCoordToBinIndex(int cell)