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

Speed up Player.CanViewActor

OpenRA.Game/Actor.cs

@@ -71,6 +71,8 @@ namespace OpenRA
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
 		readonly IDisable[] disables;
+		readonly IVisibilityModifier[] visibilityModifiers;
+		readonly IDefaultVisibility defaultVisibility;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -130,6 +132,8 @@ namespace OpenRA
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
 			disables = TraitsImplementing<IDisable>().ToArray();
+			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
+			defaultVisibility = Trait<IDefaultVisibility>();
 		}
 
 		public void Tick()
@@ -295,6 +299,15 @@ namespace OpenRA
 			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
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/Player.cs

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