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

Defer rollover checks while generating selection decorations

Browse Source
This commit is contained in:
abcdefg30
2021-07-19 22:47:00 +02:00
committed by Pavel Penev
parent 35e9fade06
commit 453d59ae16
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/World/Selection.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
public class SelectionInfo : TraitInfo public class SelectionInfo : TraitInfo
{ {
public override object Create(ActorInitializer init) { return new Selection(this); } public override object Create(ActorInitializer init) { return new Selection(); }
} }
[TraitLocation(SystemActors.World | SystemActors.EditorWorld)] [TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
@@ -29,13 +29,11 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<Actor> Actors => actors; public IEnumerable<Actor> Actors => actors;
readonly HashSet<Actor> actors = new HashSet<Actor>(); readonly HashSet<Actor> actors = new HashSet<Actor>();
readonly List<Actor> rolloverActors = new List<Actor>();
World world; World world;
IEnumerable<Actor> rolloverActors;
INotifySelection[] worldNotifySelection; INotifySelection[] worldNotifySelection;
public Selection(SelectionInfo info) { }
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
worldNotifySelection = self.TraitsImplementing<INotifySelection>().ToArray(); worldNotifySelection = self.TraitsImplementing<INotifySelection>().ToArray();
@@ -157,12 +155,13 @@ namespace OpenRA.Mods.Common.Traits
public void SetRollover(IEnumerable<Actor> rollover) public void SetRollover(IEnumerable<Actor> rollover)
{ {
rolloverActors = rollover; rolloverActors.Clear();
rolloverActors.AddRange(rollover);
} }
public bool RolloverContains(Actor a) public bool RolloverContains(Actor a)
{ {
return rolloverActors != null && rolloverActors.Contains(a); return rolloverActors.Contains(a);
} }
void ITick.Tick(Actor self) void ITick.Tick(Actor self)