Merge pull request #7937 from pchote/some-editor-prereqs

A collection of ActorPreview improvements.
This commit is contained in:
Oliver Brakmann
2015-04-26 18:46:26 +02:00
19 changed files with 167 additions and 18 deletions

View File

@@ -48,11 +48,11 @@ 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));
yield return new SpriteActorPreview(anim, offset, offset.Y + offset.Z + 1, p, rs.Scale);
yield return new SpriteActorPreview(anim, offset, -(offset.Y + offset.Z) + 1, p, rs.Scale);
}
}