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

Merge pull request #9296 from RoosterDragon/can-view-actor-perf

Browse Source 
Speed up Player.CanViewActor
This commit is contained in:
Pavel Penev
2015-09-09 14:14:06 +03:00
parent 7c7506fafb d1960258db
commit f65a049e61
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Actor.cs
View File

@@ -71,6 +71,8 @@ namespace OpenRA
readonly IRenderModifier[] renderModifiers; readonly IRenderModifier[] renderModifiers;
readonly IRender[] renders; readonly IRender[] renders;
readonly IDisable[] disables; readonly IDisable[] disables;
readonly IVisibilityModifier[] visibilityModifiers;
readonly IDefaultVisibility defaultVisibility;
internal Actor(World world, string name, TypeDictionary initDict) internal Actor(World world, string name, TypeDictionary initDict)
{ {
@@ -130,6 +132,8 @@ namespace OpenRA
renderModifiers = TraitsImplementing<IRenderModifier>().ToArray(); renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
renders = TraitsImplementing<IRender>().ToArray(); renders = TraitsImplementing<IRender>().ToArray();
disables = TraitsImplementing<IDisable>().ToArray(); disables = TraitsImplementing<IDisable>().ToArray();
visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
defaultVisibility = Trait<IDefaultVisibility>();
} }
public void Tick() public void Tick()
@@ -295,6 +299,15 @@ namespace OpenRA
return false; return false;
} }
public bool CanBeViewedByPlayer(Player player)
{
foreach (var visibilityModifier in visibilityModifiers)
if (!visibilityModifier.IsVisible(this, player))
return false;
return defaultVisibility.IsVisible(this, player);
}
#region Scripting interface #region Scripting interface
Lazy<ScriptActorInterface> luaInterface; Lazy<ScriptActorInterface> luaInterface;

10
OpenRA.Game/Player.cs
View File

@@ -154,10 +154,7 @@ namespace OpenRA
public bool CanViewActor(Actor a) public bool CanViewActor(Actor a)
{ {
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, this))) return a.CanBeViewedByPlayer(this);
return false;
return a.Trait<IDefaultVisibility>().IsVisible(a, this);
} }
public bool CanTargetActor(Actor a) public bool CanTargetActor(Actor a)
@@ -165,10 +162,7 @@ namespace OpenRA
if (HasFogVisibility) if (HasFogVisibility)
return true; return true;
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, this))) return CanViewActor(a);
return false;
return a.Trait<IDefaultVisibility>().IsVisible(a, this);
} }
public bool HasFogVisibility { get { return fogVisibilities.Any(f => f.HasFogVisibility(this)); } } public bool HasFogVisibility { get { return fogVisibilities.Any(f => f.HasFogVisibility(this)); } }