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

Avoid duplicated frozen visibility checks.

Browse Source 
The FrozenUnderFog.Tick method will now reuse the calculation do by the frozen actor when it had to calculate its visibility, this prevents it having to re-do the fairly expensive visibility calculation.
This commit is contained in:
RoosterDragon
2015-02-28 19:07:54 +00:00
committed by RoosterDragon
parent 721ba5e9c3
commit c3531d6f70
2 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
public bool Visible;
public FrozenActor(Actor self, MPos[] footprint, CellRegion footprintRegion)
public FrozenActor(Actor self, MPos[] footprint, CellRegion footprintRegion, Shroud shroud)
{
actor = self;
Footprint = footprint;
@@ -48,6 +48,8 @@ namespace OpenRA.Traits
CenterPosition = self.CenterPosition;
Bounds = self.Bounds;
UpdateVisibility(shroud);
}
public uint ID { get { return actor.ActorID; } }
@@ -56,7 +58,15 @@ namespace OpenRA.Traits
public Actor Actor { get { return !actor.IsDead ? actor : null; } }
int flashTicks;
public void Tick(World world, Shroud shroud)
public void Tick(Shroud shroud)
{
UpdateVisibility(shroud);
if (flashTicks > 0)
flashTicks--;
}
void UpdateVisibility(Shroud shroud)
{
// We are doing the following LINQ manually to avoid allocating an extra delegate since this is a hot path.
// Visible = !Footprint.Any(shroud.IsVisibleTest(FootprintRegion));
@@ -68,9 +78,6 @@ namespace OpenRA.Traits
Visible = false;
break;
}
if (flashTicks > 0)
flashTicks--;
}
public void Flash()
@@ -129,22 +136,24 @@ namespace OpenRA.Traits
VisibilityHash = 0;
FrozenHash = 0;
foreach (var kv in frozen)
foreach (var kvp in frozen)
{
FrozenHash += (int)kv.Key;
var hash = (int)kvp.Key;
FrozenHash += hash;
kv.Value.Tick(self.World, self.Owner.Shroud);
if (kv.Value.Visible)
VisibilityHash += (int)kv.Key;
var frozenActor = kvp.Value;
frozenActor.Tick(self.Owner.Shroud);
if (!kv.Value.Visible && kv.Value.Actor == null)
remove.Add(kv.Key);
if (frozenActor.Visible)
VisibilityHash += hash;
else if (frozenActor.Actor == null)
remove.Add(kvp.Key);
}
foreach (var r in remove)
foreach (var actorID in remove)
{
world.ScreenMap.Remove(owner, frozen[r]);
frozen.Remove(r);
world.ScreenMap.Remove(owner, frozen[actorID]);
frozen.Remove(actorID);
}
}