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

Account for damage state in ActorPreviews.

Browse Source
This commit is contained in:
Paul Chote
2015-04-03 20:50:47 +01:00
parent ef55cb6528
commit 09bad3f0ef
11 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Common/Graphics/ActorPreview.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Graphics
{
@@ -41,5 +42,32 @@ namespace OpenRA.Mods.Common.Graphics
public T Get<T>() where T : IActorInit { return dict.Get<T>(); }
public U Get<T, U>() where T : IActorInit<U> { return dict.Get<T>().Value(World); }
public bool Contains<T>() where T : IActorInit { return dict.Contains<T>(); }
public DamageState GetDamageState()
{
var health = dict.GetOrDefault<HealthInit>();
if (health == null)
return DamageState.Undamaged;
var hf = health.Value(null);
if (hf <= 0)
return DamageState.Dead;
if (hf < 0.25f)
return DamageState.Critical;
if (hf < 0.5f)
return DamageState.Heavy;
if (hf < 0.75f)
return DamageState.Medium;
if (hf < 1.0f)
return DamageState.Light;
return DamageState.Undamaged;
}
}
}

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

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
{
// Show a static frame instead of animating all of the fullness states
var anim = new Animation(init.World, image, () => 0);
anim.PlayFetchIndex(Sequence, () => 0);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}

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

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
// Show the correct turret facing
var anim = new Animation(init.World, image, () => t.InitialFacing);
anim.PlayRepeating(Sequence);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}

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

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
{
// Show a static frame instead of animating all of the wall states
var anim = new Animation(init.World, image, () => 0);
anim.PlayFetchIndex(Sequence, () => 0);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}

3
OpenRA.Mods.Common/Traits/Render/RenderSimple.cs
View File

@@ -28,7 +28,8 @@ namespace OpenRA.Mods.Common.Traits
var facing = ifacing != null ? init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing() : 0;
var anim = new Animation(init.World, image, () => facing);
anim.PlayRepeating(Sequence);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}

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

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
.First(tt => tt.Turret == armament.Turret);
var anim = new Animation(init.World, image, () => t.InitialFacing);
anim.Play(Sequence);
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
var turretOrientation = body.QuantizeOrientation(new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(t.InitialFacing)), facings);
var turretOffset = body.LocalToWorld(t.Offset.Rotate(turretOrientation));

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

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
var body = init.Actor.Traits.Get<BodyOrientationInfo>();
var facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
var anim = new Animation(init.World, image, () => facing);
anim.PlayRepeating(Sequence);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
var orientation = body.QuantizeOrientation(new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facing)), facings);
var offset = body.LocalToWorld(Offset.Rotate(orientation));

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

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits
facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing();
var anim = new Animation(init.World, image, () => facing);
anim.PlayRepeating(StandSequences.First());
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), StandSequences.First()));
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}

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

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.TS.Traits
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, image, () => 0);
anim.PlayFetchIndex(Sequence, () => 0);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
var bi = init.Actor.Traits.Get<BuildingInfo>();
var offset = FootprintUtils.CenterOffset(init.World, bi).Y + 512; // Additional 512 units move from center -> top of cell

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

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
var body = init.Actor.Traits.Get<BodyOrientationInfo>();
var facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
var anim = new Animation(init.World, image, () => facing);
anim.PlayRepeating(Sequence);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
var orientation = body.QuantizeOrientation(new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facing)), facings);
var offset = body.LocalToWorld(Offset.Rotate(orientation));

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

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits
var turretFacing = init.Contains<TurretFacingInit>() ? init.Get<TurretFacingInit, int>() : t.InitialFacing;
var anim = new Animation(init.World, image, () => turretFacing);
anim.Play(Sequence);
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
var orientation = body.QuantizeOrientation(new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(bodyFacing)), facings);
var offset = body.LocalToWorld(t.Offset.Rotate(orientation));