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

Change ActorIndex to work in terms of TraitInfo, instead of Trait.

Browse Source 
This allows actor.Info.HasTraitInfo to be used when checking if an actor needs to be added to the index, which is a cheaper call than actor.TraitsImplementing.
This commit is contained in:
RoosterDragon
2024-09-14 18:32:54 +01:00
committed by Gustas
parent 327c1ba23b
commit ab50182c92
7 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Common/ActorIndex.cs
View File

@@ -12,6 +12,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common
{
@@ -97,9 +98,9 @@ namespace OpenRA.Mods.Common
/// <summary>
/// Maintains an index of actors in the world that
/// have one of the given <see cref="ActorInfo.Name"/>
/// and have the trait of type <typeparamref name="T"/>.
/// and have the trait with info of type <typeparamref name="TTraitInfo"/>.
/// </summary>
public sealed class NamesAndTrait<T> : ActorIndex
public sealed class NamesAndTrait<TTraitInfo> : ActorIndex where TTraitInfo : ITraitInfoInterface
{
readonly HashSet<string> names;
@@ -111,12 +112,12 @@ namespace OpenRA.Mods.Common
static IEnumerable<Actor> ActorsToIndex(World world, HashSet<string> names)
{
return world.ActorsHavingTrait<T>().Where(a => names.Contains(a.Info.Name));
return world.Actors.Where(a => names.Contains(a.Info.Name) && a.Info.HasTraitInfo<TTraitInfo>());
}
protected override bool ShouldIndexActor(Actor actor)
{
return names.Contains(actor.Info.Name) && actor.TraitsImplementing<T>().Any();
return names.Contains(actor.Info.Name) && actor.Info.HasTraitInfo<TTraitInfo>();
}
}
@@ -124,9 +125,9 @@ namespace OpenRA.Mods.Common
/// Maintains an index of actors in the world that
/// are owned by a given <see cref="Player"/>,
/// have one of the given <see cref="ActorInfo.Name"/>
/// and have the trait of type <typeparamref name="T"/>.
/// and have the trait with info of type <typeparamref name="TTraitInfo"/>.
/// </summary>
public sealed class OwnerAndNamesAndTrait<T> : ActorIndex
public sealed class OwnerAndNamesAndTrait<TTraitInfo> : ActorIndex where TTraitInfo : ITraitInfoInterface
{
readonly HashSet<string> names;
readonly Player owner;
@@ -140,12 +141,12 @@ namespace OpenRA.Mods.Common
static IEnumerable<Actor> ActorsToIndex(World world, HashSet<string> names, Player owner)
{
return world.ActorsHavingTrait<T>().Where(a => a.Owner == owner && names.Contains(a.Info.Name));
return world.Actors.Where(a => a.Owner == owner && names.Contains(a.Info.Name) && a.Info.HasTraitInfo<TTraitInfo>());
}
protected override bool ShouldIndexActor(Actor actor)
{
return actor.Owner == owner && names.Contains(actor.Info.Name) && actor.TraitsImplementing<T>().Any();
return actor.Owner == owner && names.Contains(actor.Info.Name) && actor.Info.HasTraitInfo<TTraitInfo>();
}
}
}