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

Add a PerfSample to UpdateCellBlocking.

Browse Source
This commit is contained in:
Paul Chote
2019-07-27 09:57:46 +01:00
committed by reaperrr
parent 8ae2b00414
commit 6345655bb1
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
OpenRA.Mods.Common/Traits/World/Locomotor.cs
View File

@@ -14,6 +14,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -423,52 +424,55 @@ namespace OpenRA.Mods.Common.Traits
void UpdateCellBlocking(CPos cell) void UpdateCellBlocking(CPos cell)
{ {
var current = pathabilityCache[cell]; using (new PerfSample("locomotor_cache"))
var actors = actorMap.GetActorsAt(cell);
if (!actors.Any())
{ {
pathabilityCache[cell] = current.WithBlocking(default(LongBitSet<PlayerBitMask>), CellBlocking.Empty); var current = pathabilityCache[cell];
return;
}
var cellBlocking = CellBlocking.HasActor; var actors = actorMap.GetActorsAt(cell);
if (sharesCell && actorMap.HasFreeSubCell(cell))
{
pathabilityCache[cell] = current.WithBlocking(default(LongBitSet<PlayerBitMask>), cellBlocking | CellBlocking.FreeSubCell);
return;
}
var cellBits = default(LongBitSet<PlayerBitMask>); if (!actors.Any())
foreach (var actor in actors)
{
var actorBits = default(LongBitSet<PlayerBitMask>);
var crushables = actor.TraitsImplementing<ICrushable>();
var mobile = actor.OccupiesSpace as Mobile;
var isMoving = mobile != null && mobile.CurrentMovementTypes.HasFlag(MovementType.Horizontal);
if (crushables.Any())
{ {
LongBitSet<PlayerBitMask> crushingBits; pathabilityCache[cell] = current.WithBlocking(default(LongBitSet<PlayerBitMask>), CellBlocking.Empty);
foreach (var crushable in crushables) return;
if (crushable.TryCalculatePlayerBlocking(actor, Info.Crushes, out crushingBits))
{
actorBits = actorBits.Union(crushingBits);
cellBlocking |= CellBlocking.Crushable;
}
if (isMoving)
actorBits = actorBits.Except(actor.Owner.AllyMask);
} }
else
actorBits = isMoving ? actor.Owner.EnemyMask : allPlayerMask;
cellBits = cellBits.Union(actorBits); var cellBlocking = CellBlocking.HasActor;
if (sharesCell && actorMap.HasFreeSubCell(cell))
{
pathabilityCache[cell] = current.WithBlocking(default(LongBitSet<PlayerBitMask>), cellBlocking | CellBlocking.FreeSubCell);
return;
}
var cellBits = default(LongBitSet<PlayerBitMask>);
foreach (var actor in actors)
{
var actorBits = default(LongBitSet<PlayerBitMask>);
var crushables = actor.TraitsImplementing<ICrushable>();
var mobile = actor.OccupiesSpace as Mobile;
var isMoving = mobile != null && mobile.CurrentMovementTypes.HasFlag(MovementType.Horizontal);
if (crushables.Any())
{
LongBitSet<PlayerBitMask> crushingBits;
foreach (var crushable in crushables)
if (crushable.TryCalculatePlayerBlocking(actor, Info.Crushes, out crushingBits))
{
actorBits = actorBits.Union(crushingBits);
cellBlocking |= CellBlocking.Crushable;
}
if (isMoving)
actorBits = actorBits.Except(actor.Owner.AllyMask);
}
else
actorBits = isMoving ? actor.Owner.EnemyMask : allPlayerMask;
cellBits = cellBits.Union(actorBits);
}
pathabilityCache[cell] = current.WithBlocking(cellBits, cellBlocking);
} }
pathabilityCache[cell] = current.WithBlocking(cellBits, cellBlocking);
} }
void MapCellEntryChanged(CPos cell) void MapCellEntryChanged(CPos cell)