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

Use a BitSet for representing target types.

Browse Source 
- Rename Bits<T> to BitSet<T>.
- Implement set based helpers for BitSet<T>.
- When representing TargetTypes of ITargetable in various traits, use a BitSet<TargetableType> instead of HashSet<string> for better performance & reduced memory usage.
- Fix FieldLoader to trim input values when generating a BitSet<T>.
- Require T in BitSet<T> and BitSetAllocator<T> to be a class since it's just a marker value. This allows the JIT to instantiate generic code for these classes once, as they don't benefit from specialized code for T. (Typically JITs will generate shared code for all reference types, and unique code for every value type encountered).
This commit is contained in:
RoosterDragon
2018-03-18 18:45:16 +00:00
committed by abcdefg30
parent 8fa94c5301
commit 5bd5a384b7
36 changed files with 250 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -16,6 +16,7 @@ using System.Linq;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
@@ -84,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Traits
public readonly Stance ValidStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
[Desc("Target types of actors that this actor disguise as.")]
public readonly HashSet<string> TargetTypes = new HashSet<string> { "Disguise" };
public readonly BitSet<TargetableType> TargetTypes = new BitSet<TargetableType>("Disguise");
[Desc("Triggers which cause the actor to drop it's disguise. Possible values: None, Attack, Damaged,",
"Unload, Infiltrate, Demolish, Move.")]
@@ -317,7 +318,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (!info.ValidStances.HasStance(stance))
return false;
return info.TargetTypes.Overlaps(target.Info.TraitInfos<ITargetableInfo>().SelectMany(ti => ti.GetTargetTypes()));
return info.TargetTypes.Overlaps(target.Info.GetAllTargetTypes());
}
}
}

5
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
@@ -20,7 +21,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("This structure can be infiltrated causing funds to be stolen.")]
class InfiltrateForCashInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
[Desc("Percentage of the victim's resources that will be stolen.")]
public readonly int Percentage = 100;
@@ -47,7 +48,7 @@ namespace OpenRA.Mods.Cnc.Traits
public InfiltrateForCash(InfiltrateForCashInfo info) { this.info = info; }
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
{
if (!info.Types.Overlaps(types))
return;

5
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
@@ -20,7 +21,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Reveals a decoration sprite to the indicated players when infiltrated.")]
class InfiltrateForDecorationInfo : WithDecorationInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
public override object Create(ActorInitializer init) { return new InfiltrateForDecoration(init.Self, this); }
}
@@ -36,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
{
if (!info.Types.Overlaps(types))
return;

5
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs
View File

@@ -12,6 +12,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Steal and reset the owner's exploration.")]
class InfiltrateForExplorationInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
public object Create(ActorInitializer init) { return new InfiltrateForExploration(init.Self, this); }
}
@@ -33,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
{
if (!info.Types.Overlaps(types))
return;

5
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs
View File

@@ -11,13 +11,14 @@
using System.Collections.Generic;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
class InfiltrateForPowerOutageInfo : ITraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
public readonly int Duration = 25 * 20;
@@ -35,7 +36,7 @@ namespace OpenRA.Mods.Cnc.Traits
playerPower = self.Owner.PlayerActor.Trait<PowerManager>();
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
{
if (!info.Types.Overlaps(types))
return;

4
OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Cnc.Traits
{
[ActorReference, FieldLoader.Require] public readonly string Proxy = null;
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
public object Create(ActorInitializer init) { return new InfiltrateForSupportPower(this); }
}
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info;
}
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, HashSet<string> types)
void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
{
if (!info.Types.Overlaps(types))
return;

9
OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs
View File

@@ -17,13 +17,14 @@ using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits
{
public class InfiltratesInfo : ConditionalTraitInfo
{
public readonly HashSet<string> Types = new HashSet<string>();
public readonly BitSet<TargetableType> Types;
[VoiceReference] public readonly string Voice = "Action";
@@ -72,14 +73,14 @@ namespace OpenRA.Mods.Cnc.Traits
if (IsTraitDisabled)
return false;
IEnumerable<string> targetTypes = null;
var targetTypes = new BitSet<TargetableType>();
if (order.Target.Type == TargetType.FrozenActor)
targetTypes = order.Target.FrozenActor.TargetTypes;
if (order.Target.Type == TargetType.Actor)
targetTypes = order.TargetActor.GetEnabledTargetTypes();
return targetTypes != null && Info.Types.Overlaps(targetTypes);
return Info.Types.Overlaps(targetTypes);
}
public string VoicePhraseForOrder(Actor self, Order order)
@@ -133,7 +134,7 @@ namespace OpenRA.Mods.Cnc.Traits
if (!info.ValidStances.HasStance(stance))
return false;
return info.Types.Overlaps(target.Info.TraitInfos<ITargetableInfo>().SelectMany(ti => ti.GetTargetTypes()));
return info.Types.Overlaps(target.Info.GetAllTargetTypes());
}
}
}

2
OpenRA.Mods.Cnc/Traits/MadTank.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Cnc.Traits
{
get
{
yield return new TargetTypeOrderTargeter(new HashSet<string> { "DetonateAttack" }, "DetonateAttack", 5, "attack", true, false) { ForceAttack = false };
yield return new TargetTypeOrderTargeter(new BitSet<TargetableType>("DetonateAttack"), "DetonateAttack", 5, "attack", true, false) { ForceAttack = false };
yield return new DeployOrderTargeter("Detonate", 5);
}
}