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

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)