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

queries dies

Browse Source
This commit is contained in:
Chris Forbes
2011-03-17 22:05:53 +13:00
parent caa52b2780
commit a3994df925
34 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -136,7 +136,7 @@ namespace OpenRA.Graphics
{
int* c = (int*)bitmapData.Scan0;
foreach (var t in world.Queries.WithTrait<IRadarSignature>())
foreach (var t in world.ActorsWithTrait<IRadarSignature>())
{
if (!world.LocalShroud.IsVisible(t.Actor))
continue;

2
OpenRA.Game/Network/SyncReport.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Network
report.Frame = orderManager.NetFrameNumber;
report.SyncedRandom = orderManager.world.SharedRandom.Last;
report.Traits.Clear();
foreach (var a in orderManager.world.Queries.WithTrait<ISync>())
foreach (var a in orderManager.world.ActorsWithTrait<ISync>())
{
var sync = Sync.CalculateSyncHash(a.Trait);
if (sync != 0)

2
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -190,7 +190,7 @@ namespace OpenRA.Network
if (target == w.LocalPlayer)
w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
foreach (var nsc in w.Queries.WithTrait<INotifyStanceChanged>())
foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);
}
}

2
OpenRA.Game/Orders/GenericSelectTarget.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Orders
public override void Tick(World world)
{
var hasStructure = world.Queries.WithTrait<T>()
var hasStructure = world.ActorsWithTrait<T>()
.Any( a => a.Actor.Owner == world.LocalPlayer );
if (!hasStructure)

2
OpenRA.Game/Traits/Player/PlayerResources.cs
View File

@@ -132,7 +132,7 @@ namespace OpenRA.Traits
{
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
OreCapacity = self.World.Queries.WithTrait<IStoreOre>()
OreCapacity = self.World.ActorsWithTrait<IStoreOre>()
.Where(a => a.Actor.Owner == Owner)
.Sum(a => a.Trait.Capacity);

2
OpenRA.Game/Traits/World/SpatialBins.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Traits
for (var i = 0; i <= bins.GetUpperBound(0); i++)
bins[i, j].Clear();
foreach (var a in self.World.Queries.WithTrait<IHasLocation>())
foreach (var a in self.World.ActorsWithTrait<IHasLocation>())
{
var bounds = a.Actor.GetBounds(true);

20
OpenRA.Game/World.cs
View File

@@ -100,8 +100,6 @@ namespace OpenRA
WorldActor = CreateActor( "World", new TypeDictionary() );
LocalShroud = WorldActor.Trait<Shroud>();
Queries = new AllQueries(this);
// Add players
foreach (var cmp in WorldActor.TraitsImplementing<ICreatePlayers>())
cmp.CreatePlayers(this);
@@ -160,7 +158,7 @@ namespace OpenRA
if (!DisableTick)
{
actors.Do( x => x.Tick() );
Queries.WithTrait<ITick>().DoTimed( x =>
ActorsWithTrait<ITick>().DoTimed( x =>
{
x.Trait.Tick( x.Actor );
}, "[{2}] Trait: {0} ({1:0.000} ms)", Game.Settings.Debug.LongTickThreshold );
@@ -204,22 +202,10 @@ namespace OpenRA
}
}
public class AllQueries
public IEnumerable<TraitPair<T>> ActorsWithTrait<T>()
{
readonly World world;
public AllQueries( World world )
{
this.world = world;
return traitDict.ActorsWithTraitMultiple<T>(this);
}
public IEnumerable<TraitPair<T>> WithTrait<T>()
{
return world.traitDict.ActorsWithTraitMultiple<T>( world );
}
}
public AllQueries Queries;
}
public struct TraitPair<T>

2
OpenRA.Mods.RA/Activities/CaptureBuilding.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Activities
foreach (var t in target.TraitsImplementing<INotifyCapture>())
t.OnCapture(target, self, oldOwner, self.Owner);
foreach (var t in self.World.Queries.WithTrait<INotifyOtherCaptured>())
foreach (var t in self.World.ActorsWithTrait<INotifyOtherCaptured>())
t.Trait.OnActorCaptured(t.Actor, target, self, oldOwner, self.Owner);
self.Destroy();

2
OpenRA.Mods.RA/Air/ReturnToBase.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Air
public static Actor ChooseAirfield(Actor self)
{
return self.World.Queries.WithTrait<BuildingInfo>()
return self.World.ActorsWithTrait<BuildingInfo>()
.Where(a => a.Actor.Owner == self.Owner)
.Where(a => self.Info.Traits.Get<PlaneInfo>().RearmBuildings.Contains(a.Actor.Info.Name)
&& !Reservable.IsReserved(a.Actor))

2
OpenRA.Mods.RA/Buildings/TechTree.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Buildings
if (player == null)
return ret;
foreach (var b in player.World.Queries.WithTrait<BuildingInfo>()
foreach (var b in player.World.ActorsWithTrait<BuildingInfo>()
.Where(a => a.Actor.Owner == player).Select(a => a.Actor))
{
ret[b.Info.Name].Add(b);

2
OpenRA.Mods.RA/Buildings/Util.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Mods.RA.Buildings
continue; // Cell is empty; continue search
// Cell contains an actor. Is it the type we want?
if (world.Queries.WithTrait<LineBuild>().Any(a => (a.Actor.Info.Name == name && a.Actor.Location.X == cell.X && a.Actor.Location.Y == cell.Y)))
if (world.ActorsWithTrait<LineBuild>().Any(a => (a.Actor.Info.Name == name && a.Actor.Location.X == cell.X && a.Actor.Location.Y == cell.Y)))
dirs[d] = i; // Cell contains actor of correct type
else
dirs[d] = -1; // Cell is blocked by another actor type

2
OpenRA.Mods.RA/ChronoshiftDeploy.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA
Sound.Play("chrotnk1.aud", Game.CellSize * order.TargetLocation.ToFloat2());
chargeTick = 25 * self.Info.Traits.Get<ChronoshiftDeployInfo>().ChargeTime;
foreach (var a in self.World.Queries.WithTrait<ChronoshiftPaletteEffect>())
foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
a.Trait.Enable();
}
}

2
OpenRA.Mods.RA/Cloak.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA.Mods.RA
self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally)
return true;
return self.World.Queries.WithTrait<DetectCloaked>().Any(a =>
return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);
}

2
OpenRA.Mods.RA/ConquestVictoryConditions.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA
{
if (self.Owner.WinState != WinState.Undefined || self.Owner.NonCombatant) return;
var hasAnything = self.World.Queries.WithTrait<MustBeDestroyed>()
var hasAnything = self.World.ActorsWithTrait<MustBeDestroyed>()
.Any( a => a.Actor.Owner == self.Owner );
if (!hasAnything && !self.Owner.NonCombatant)

2
OpenRA.Mods.RA/Crates/GiveMcvCrateAction.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Crates
if (base.GetSelectionShares(collector) == 0)
return 0; // there's some other really good reason why we shouldn't give this.
var hasBase = self.World.Queries.WithTrait<BaseBuilding>()
var hasBase = self.World.ActorsWithTrait<BaseBuilding>()
.Any(a => a.Actor.Owner == collector.Owner);
return hasBase ? info.SelectionShares :

2
OpenRA.Mods.RA/Effects/NukeLaunch.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA.Effects
if (altitude <= 0)
{
// Trigger screen desaturate effect
foreach (var a in world.Queries.WithTrait<NukePaletteEffect>())
foreach (var a in world.ActorsWithTrait<NukePaletteEffect>())
a.Trait.Enable();
Explode(world);

12
OpenRA.Mods.RA/HackyAI.cs
View File

@@ -150,8 +150,8 @@ namespace OpenRA.Mods.RA
.OrderByDescending(a => GetPowerProvidedBy(a)).FirstOrDefault();
}
var myBuildings = p.World.Queries
.WithTrait<Building>()
var myBuildings = p.World
.ActorsWithTrait<Building>()
.Where( a => a.Actor.Owner == p )
.Select(a => a.Actor.Info.Name).ToArray();
@@ -272,7 +272,7 @@ namespace OpenRA.Mods.RA
attackForce.RemoveAll(a => a.Destroyed);
// don't select harvesters.
var newUnits = self.World.Queries.WithTrait<IMove>()
var newUnits = self.World.ActorsWithTrait<IMove>()
.Where(a => a.Actor.Owner == p && a.Actor.Info != Rules.Info["harv"]
&& !activeUnits.Contains(a.Actor))
.Select(a => a.Actor).ToArray();
@@ -309,7 +309,7 @@ namespace OpenRA.Mods.RA
void SetRallyPointsForNewProductionBuildings(Actor self)
{
var buildings = self.World.Queries.WithTrait<RallyPoint>()
var buildings = self.World.ActorsWithTrait<RallyPoint>()
.Where(rp => rp.Actor.Owner == p &&
!IsRallyPointValid(rp.Trait.rallyPoint)).ToArray();
@@ -399,7 +399,7 @@ namespace OpenRA.Mods.RA
private void BuildRandom(string category)
{
// Pick a free queue
var queue = world.Queries.WithTrait<ProductionQueue>()
var queue = world.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == p &&
a.Trait.Info.Type == category &&
a.Trait.CurrentItem() == null)
@@ -447,7 +447,7 @@ namespace OpenRA.Mods.RA
public void Tick()
{
// Pick a free queue
var queue = ai.world.Queries.WithTrait<ProductionQueue>()
var queue = ai.world.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == ai.p && a.Trait.Info.Type == category)
.Select(a => a.Trait)
.FirstOrDefault();

2
OpenRA.Mods.RA/Harvester.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Mods.RA
Actor ClosestProc(Actor self, Actor ignore)
{
var refs = self.World.Queries.WithTrait<IAcceptOre>()
var refs = self.World.ActorsWithTrait<IAcceptOre>()
.Where(x => x.Actor != ignore && x.Actor.Owner == self.Owner)
.ToList();
var mi = self.Info.Traits.Get<MobileInfo>();

2
OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Orders
public static bool PlayerIsAllowedToRepair( World world )
{
return world.Queries.WithTrait<AllowsBuildingRepair>()
return world.ActorsWithTrait<AllowsBuildingRepair>()
.Any(a => a.Actor.Owner == world.LocalPlayer);
}

2
OpenRA.Mods.RA/OreRefinery.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<TraitPair<Harvester>> GetLinkedHarvesters()
{
return self.World.Queries.WithTrait<Harvester>()
return self.World.ActorsWithTrait<Harvester>()
.Where(a => a.Trait.LinkedProc == self);
}

6
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
[Sync] bool QueueActive = false;
public override void Tick( Actor self )
{
QueueActive = self.World.Queries.WithTrait<Production>()
QueueActive = self.World.ActorsWithTrait<Production>()
.Where(x => x.Actor.Owner == self.Owner)
.Where(x => x.Trait.Info.Produces.Contains(Info.Type))
.Any();
@@ -50,8 +50,8 @@ namespace OpenRA.Mods.RA
protected override bool BuildUnit( string name )
{
// Find a production structure to build this actor
var producers = self.World.Queries
.WithTrait<Production>()
var producers = self.World
.ActorsWithTrait<Production>()
.Where(x => x.Actor.Owner == self.Owner)
.Where(x => x.Trait.Info.Produces.Contains(Info.Type))
.OrderByDescending(x => x.Actor.IsPrimaryBuilding() ? 1 : 0 ); // prioritize the primary.

6
OpenRA.Mods.RA/Player/PlaceBuilding.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
var prevItems = GetNumBuildables(self.Owner);
// Find the queue with the target actor
var queue = w.Queries.WithTrait<ProductionQueue>()
var queue = w.ActorsWithTrait<ProductionQueue>()
.Where(p => p.Actor.Owner == self.Owner &&
p.Trait.CurrentItem() != null &&
p.Trait.CurrentItem().Item == order.TargetString &&
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA
if (bi == null)
return;
var producers = self.World.Queries.WithTrait<Production>()
var producers = self.World.ActorsWithTrait<Production>()
.Where( x => x.Actor.Owner == self.Owner )
.Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( bi.Queue ) )
.ToList();
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.RA
{
if (p != p.World.LocalPlayer) return 0; // this only matters for local players.
return p.World.Queries.WithTrait<ProductionQueue>()
return p.World.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == p)
.SelectMany(a => a.Trait.BuildableItems()).Distinct().Count();
}

4
OpenRA.Mods.RA/PrimaryBuilding.cs
View File

@@ -57,8 +57,8 @@ namespace OpenRA.Mods.RA
// THIS IS SHIT
// Cancel existing primaries
foreach (var p in self.Info.Traits.Get<ProductionInfo>().Produces)
foreach (var b in self.World.Queries
.WithTrait<PrimaryBuilding>()
foreach (var b in self.World
.ActorsWithTrait<PrimaryBuilding>()
.Where(a => a.Actor.Owner == self.Owner)
.Where(x => x.Trait.IsPrimary
&& (x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains(p))))

2
OpenRA.Mods.RA/ProvidesRadar.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
return false;
var isJammed = self.World.Queries.WithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
var isJammed = self.World.ActorsWithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);
return !isJammed;

2
OpenRA.Mods.RA/RenderRangeCircle.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA
centerLocation,
ai.Traits.Get<AttackBaseInfo>().GetMaximumRange());
foreach (var a in w.Queries.WithTrait<RenderRangeCircle>())
foreach (var a in w.ActorsWithTrait<RenderRangeCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer)
if (a.Actor.Info.Traits.Get<RenderRangeCircleInfo>().RangeCircleType == RangeCircleType)
a.Trait.RenderBeforeWorld(wr, a.Actor);

2
OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Scripting
chronosphere.Trait<RenderBuilding>().PlayCustomAnim(chronosphere, "active");
// Trigger screen desaturate effect
foreach (var a in world.Queries.WithTrait<ChronoshiftPaletteEffect>())
foreach (var a in world.ActorsWithTrait<ChronoshiftPaletteEffect>())
a.Trait.Enable();
Sound.Play("chrono2.aud", units.First().First.CenterLocation);

2
OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs
View File

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.RA
{
if (p == Self.Owner || (p.Stances[Self.Owner] == Stance.Ally && Self.Owner.Stances[p] == Stance.Ally))
{
total += Self.World.Queries.WithTrait<StrategicPoint>()
total += Self.World.ActorsWithTrait<StrategicPoint>()
.Where(a => a.Actor.Owner == p)
.Count(a => a.Trait.Critical == critical);
}

2
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA
self.Trait<RenderBuilding>().PlayCustomAnim(self, "active");
// Trigger screen desaturate effect
foreach (var a in self.World.Queries.WithTrait<ChronoshiftPaletteEffect>())
foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
a.Trait.Enable();
Sound.Play("chrono2.aud", Game.CellSize * order.TargetLocation);

2
OpenRA.Mods.RA/SupportPowers/GpsPower.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA
void RefreshGps(Actor self)
{
if (self.World.LocalPlayer != null)
self.World.LocalShroud.Disabled = self.World.Queries.WithTrait<GpsPower>()
self.World.LocalShroud.Disabled = self.World.ActorsWithTrait<GpsPower>()
.Any(p => p.Actor.Owner.Stances[self.World.LocalPlayer] == Stance.Ally &&
p.Trait.Granted);
}

2
OpenRA.Mods.RA/TargetableUnit.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA
if (!Cloak.Cloaked || self.Owner == byActor.Owner || self.Owner.Stances[byActor.Owner] == Stance.Ally)
return true;
return self.World.Queries.WithTrait<DetectCloaked>().Any(a => (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);
return self.World.ActorsWithTrait<DetectCloaked>().Any(a => (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);
}
public virtual string[] TargetTypes { get { return info.TargetTypes; } }

2
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.RA.Widgets
{
VisibleQueues.Clear();
var queues = world.Queries.WithTrait<ProductionQueue>()
var queues = world.ActorsWithTrait<ProductionQueue>()
.Where(p => p.Actor.Owner == world.LocalPlayer)
.Select(p => p.Trait);

4
OpenRA.Mods.RA/Widgets/RadarBinWidget.cs
View File

@@ -165,8 +165,8 @@ namespace OpenRA.Mods.RA.Widgets
int updateTicks = 0;
public override void Tick()
{
var hasRadarNew = world.Queries
.WithTrait<ProvidesRadar>()
var hasRadarNew = world
.ActorsWithTrait<ProvidesRadar>()
.Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
if (hasRadarNew != hasRadar)

4
OpenRA.Mods.RA/Widgets/RadarWidget.cs
View File

@@ -156,8 +156,8 @@ namespace OpenRA.Mods.RA.Widgets
int updateTicks = 0;
public override void Tick()
{
var hasRadarNew = world.Queries
.WithTrait<ProvidesRadar>()
var hasRadarNew = world
.ActorsWithTrait<ProvidesRadar>()
.Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
if (hasRadarNew != hasRadar)

2
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.RA.Widgets
bool CycleBases()
{
var bases = World.Queries.WithTrait<BaseBuilding>()
var bases = World.ActorsWithTrait<BaseBuilding>()
.Where( a => a.Actor.Owner == World.LocalPlayer ).ToArray();
if (!bases.Any()) return true;