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

Change traits to use RenderSprites directly.

Browse Source
This commit is contained in:
Paul Chote
2013-05-25 11:41:23 +12:00
parent 07f3c0171d
commit e7aa6ce998
18 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Render
foreach (var r in p)
yield return r;
var anim = new Animation(RenderSimple.GetImage(building), () => 0);
var anim = new Animation(RenderSprites.GetImage(building), () => 0);
anim.PlayRepeating("idle-top");
yield return new SpriteRenderable(anim.Image, WPos.Zero + Origin, 0, pr, 1f);
}

2
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.RA.Render
public AnimationState State { get; private set; }
public RenderInfantry(Actor self, RenderInfantryInfo info)
: base(self, RenderSimple.MakeFacingFunc(self))
: base(self, MakeFacingFunc(self))
{
Info = info;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0);

5
OpenRA.Mods.RA/Render/RenderUnit.cs
View File

@@ -22,10 +22,7 @@ namespace OpenRA.Mods.RA.Render
public class RenderUnit : RenderSimple
{
public RenderUnit(Actor self)
: base(self, RenderSimple.MakeFacingFunc(self))
{
anim.PlayRepeating("idle");
}
: base(self) { }
public void PlayCustomAnimation(Actor self, string newAnim, Action after)
{

4
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Mods.RA;
namespace OpenRA.Mods.RA.Render
{
class WithMuzzleFlashInfo : ITraitInfo, Requires<RenderSimpleInfo>, Requires<AttackBaseInfo>
class WithMuzzleFlashInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<AttackBaseInfo>
{
public object Create(ActorInitializer init) { return new WithMuzzleFlash(init.self); }
}
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Render
public WithMuzzleFlash(Actor self)
{
var render = self.Trait<RenderSimple>();
var render = self.Trait<RenderSprites>();
var facing = self.TraitOrDefault<IFacing>();
var arms = self.TraitsImplementing<Armament>();

7
OpenRA.Mods.RA/Render/WithRotor.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
public class WithRotorInfo : ITraitInfo, Requires<RenderSimpleInfo>
public class WithRotorInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<LocalCoordinatesModelInfo>
{
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;
@@ -28,12 +28,13 @@ namespace OpenRA.Mods.RA.Render
public Animation rotorAnim;
public WithRotor(Actor self, WithRotorInfo info)
{
var rs = self.Trait<RenderSimple>();
var rs = self.Trait<RenderSprites>();
var coords = self.Trait<ILocalCoordinatesModel>();
rotorAnim = new Animation(rs.GetImage(self));
rotorAnim.PlayRepeating("rotor");
rs.anims.Add(info.Id, new AnimationWithOffset(rotorAnim,
() => rs.LocalToWorld(info.Offset.Rotate(rs.QuantizeOrientation(self, self.Orientation))),
() => coords.LocalToWorld(info.Offset.Rotate(coords.QuantizeOrientation(self, self.Orientation))),
null, p => WithTurret.ZOffsetFromCenter(self, p, 1)));
}

4
OpenRA.Mods.RA/Render/WithSmoke.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
public class WithSmokeInfo : ITraitInfo, Requires<RenderSimpleInfo>
public class WithSmokeInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
public object Create(ActorInitializer init) { return new WithSmoke(init.self); }
}
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Render
public WithSmoke(Actor self)
{
var rs = self.Trait<RenderSimple>();
var rs = self.Trait<RenderSprites>();
anim = new Animation("smoke_m");
rs.anims.Add("smoke", new AnimationWithOffset(anim, null, () => !isSmoking));

8
OpenRA.Mods.RA/Render/WithSpinner.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class WithSpinnerInfo : ITraitInfo, Requires<RenderSimpleInfo>
class WithSpinnerInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<LocalCoordinatesModelInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "spinner";
@@ -29,11 +29,13 @@ namespace OpenRA.Mods.RA.Render
{
public WithSpinner(Actor self, WithSpinnerInfo info)
{
var rs = self.Trait<RenderSimple>();
var rs = self.Trait<RenderSprites>();
var coords = self.Trait<ILocalCoordinatesModel>();
var spinner = new Animation(rs.GetImage(self));
spinner.PlayRepeating(info.Sequence);
rs.anims.Add("spinner_{0}".F(info.Sequence), new AnimationWithOffset(spinner,
() => rs.LocalToWorld(info.Offset.Rotate(rs.QuantizeOrientation(self, self.Orientation))),
() => coords.LocalToWorld(info.Offset.Rotate(coords.QuantizeOrientation(self, self.Orientation))),
null, p => WithTurret.ZOffsetFromCenter(self, p, 1)));
}
}

15
OpenRA.Mods.RA/Render/WithTurret.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class WithTurretInfo : ITraitInfo, Requires<RenderSimpleInfo>, Requires<TurretedInfo>
class WithTurretInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<TurretedInfo>, Requires<LocalCoordinatesModelInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "turret";
@@ -37,7 +37,8 @@ namespace OpenRA.Mods.RA.Render
class WithTurret : ITick
{
WithTurretInfo info;
RenderSimple rs;
RenderSprites rs;
ILocalCoordinatesModel coords;
AttackBase ab;
Turreted t;
IEnumerable<Armament> arms;
@@ -46,7 +47,9 @@ namespace OpenRA.Mods.RA.Render
public WithTurret(Actor self, WithTurretInfo info)
{
this.info = info;
rs = self.Trait<RenderSimple>();
rs = self.Trait<RenderSprites>();
coords = self.Trait<ILocalCoordinatesModel>();
ab = self.TraitOrDefault<AttackBase>();
t = self.TraitsImplementing<Turreted>()
.First(tt => tt.Name == info.Turret);
@@ -69,9 +72,9 @@ namespace OpenRA.Mods.RA.Render
var recoil = arms.Aggregate(WRange.Zero, (a,b) => a + b.Recoil);
var localOffset = new WVec(-recoil, WRange.Zero, WRange.Zero);
var bodyOrientation = rs.QuantizeOrientation(self, self.Orientation);
var turretOrientation = rs.QuantizeOrientation(self, t.LocalOrientation(self));
return t.Position(self) + rs.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
var bodyOrientation = coords.QuantizeOrientation(self, self.Orientation);
var turretOrientation = coords.QuantizeOrientation(self, t.LocalOrientation(self));
return t.Position(self) + coords.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
}
public void Tick(Actor self)