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

Rewrite ActorInit queries.

Browse Source
This commit is contained in:
Paul Chote
2020-05-24 22:28:16 +01:00
committed by teinarss
parent 626b40f31b
commit 7c6ec577dc
66 changed files with 332 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -49,8 +49,8 @@ namespace OpenRA.Mods.Common.Traits.Render
public IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init)
{
var sequenceProvider = init.World.Map.Rules.Sequences;
var faction = init.Get<FactionInit, string>();
var ownerName = init.Get<OwnerInit>().PlayerName;
var faction = init.GetValue<FactionInit, string>(this);
var ownerName = init.Get<OwnerInit>(this).InternalName;
var image = GetImage(init.Actor, sequenceProvider, faction);
var palette = init.WorldRenderer.Palette(Palette ?? PlayerPalette + ownerName);
@@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public RenderSprites(ActorInitializer init, RenderSpritesInfo info)
{
Info = info;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
faction = init.GetValue<FactionInit, string>(info, init.Self.Owner.Faction.InternalName);
}
public string GetImage(Actor self)

4
OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs
View File

@@ -57,8 +57,8 @@ namespace OpenRA.Mods.Common.Traits.Render
public virtual IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init)
{
var body = init.Actor.TraitInfo<BodyOrientationInfo>();
var faction = init.Get<FactionInit, string>();
var ownerName = init.Get<OwnerInit>().PlayerName;
var faction = init.GetValue<FactionInit, string>(this);
var ownerName = init.Get<OwnerInit>(this).InternalName;
var sequenceProvider = init.World.Map.Rules.Sequences;
var image = Image ?? init.Actor.Name;
var facings = body.QuantizedFacings == -1 ?

7
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -49,14 +49,15 @@ namespace OpenRA.Mods.Common.Traits.Render
p = init.WorldRenderer.Palette(Palette);
Func<WAngle> facing;
if (init.Contains<DynamicFacingInit>())
var dynamicfacingInit = init.GetOrDefault<DynamicFacingInit>(this);
if (dynamicfacingInit != null)
{
var getFacing = init.Get<DynamicFacingInit, Func<int>>();
var getFacing = dynamicfacingInit.Value;
facing = () => WAngle.FromFacing(getFacing());
}
else
{
var f = WAngle.FromFacing(init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0);
var f = WAngle.FromFacing(init.GetValue<FacingInit, int>(this, 0));
facing = () => f;
}

2
OpenRA.Mods.Common/Traits/Render/WithMakeAnimation.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits.Render
this.info = info;
var self = init.Self;
wsbs = self.TraitsImplementing<WithSpriteBody>().Where(w => info.BodyNames.Contains(w.Info.Name)).ToArray();
skipMakeAnimation = init.Contains<SkipMakeAnimsInit>();
skipMakeAnimation = init.Contains<SkipMakeAnimsInit>(info);
}
void INotifyCreated.Created(Actor self)

7
OpenRA.Mods.Common/Traits/Render/WithParachute.cs
View File

@@ -78,11 +78,12 @@ namespace OpenRA.Mods.Common.Traits.Render
p = init.WorldRenderer.Palette(Palette);
Func<int> facing;
if (init.Contains<DynamicFacingInit>())
facing = init.Get<DynamicFacingInit, Func<int>>();
var dynamicfacingInit = init.GetOrDefault<DynamicFacingInit>(this);
if (dynamicfacingInit != null)
facing = dynamicfacingInit.Value;
else
{
var f = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
var f = init.GetValue<FacingInit, int>(this, 0);
facing = () => f;
}

2
OpenRA.Mods.Common/Traits/Render/WithSpriteBarrel.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var t = init.Actor.TraitInfos<TurretedInfo>()
.First(tt => tt.Turret == armament.Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, armament.Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t);
var anim = new Animation(init.World, image, () => WAngle.FromFacing(turretFacing()));
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));

4
OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var t = init.Actor.TraitInfos<TurretedInfo>()
.First(tt => tt.Turret == Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t);
var anim = new Animation(init.World, image, () => WAngle.FromFacing(turretFacing()));
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
@@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits.Render
};
if (IsPlayerPalette)
p = init.WorldRenderer.Palette(Palette + init.Get<OwnerInit>().PlayerName);
p = init.WorldRenderer.Palette(Palette + init.Get<OwnerInit>(this).InternalName);
else if (Palette != null)
p = init.WorldRenderer.Palette(Palette);

2
OpenRA.Mods.Common/Traits/Render/WithVoxelBarrel.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var model = init.World.ModelCache.GetModelSequence(image, Sequence);
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, t.Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t);
Func<WRot> turretOrientation = () => body.QuantizeOrientation(WRot.FromYaw(WAngle.FromFacing(turretFacing()) - orientation().Yaw), facings);
Func<WRot> quantizedTurret = () => body.QuantizeOrientation(turretOrientation(), facings);

2
OpenRA.Mods.Common/Traits/Render/WithVoxelTurret.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var model = init.World.ModelCache.GetModelSequence(image, Sequence);
Func<WVec> turretOffset = () => body.LocalToWorld(t.Offset.Rotate(orientation()));
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t);
Func<WRot> turretBodyOrientation = () => WRot.FromYaw(WAngle.FromFacing(turretFacing()) - orientation().Yaw);
yield return new ModelAnimation(model, turretOffset,
() => new[] { turretBodyOrientation(), body.QuantizeOrientation(orientation(), facings) }, () => false, () => 0, ShowShadow);

14
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -37,15 +37,13 @@ namespace OpenRA.Mods.Common.Traits.Render
yield break;
var adjacent = 0;
var locationInit = init.GetOrDefault<LocationInit>(this);
var neighbourInit = init.GetOrDefault<RuntimeNeighbourInit>(this);
if (init.Contains<RuntimeNeighbourInit>())
if (locationInit != null && neighbourInit != null)
{
var location = CPos.Zero;
if (init.Contains<LocationInit>())
location = init.Get<LocationInit, CPos>();
var neighbours = init.Get<RuntimeNeighbourInit, Dictionary<CPos, string[]>>();
foreach (var kv in neighbours)
var location = locationInit.Value;
foreach (var kv in neighbourInit.Value)
{
var haveNeighbour = false;
foreach (var n in kv.Value)
@@ -177,6 +175,6 @@ namespace OpenRA.Mods.Common.Traits.Render
public RuntimeNeighbourInit() { }
public RuntimeNeighbourInit(Dictionary<CPos, string[]> init) { value = init; }
public Dictionary<CPos, string[]> Value(World world) { return value; }
public Dictionary<CPos, string[]> Value { get { return value; } }
}
}