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

Merge the 3 turret rendering traits into WithTurret.

Browse Source
This commit is contained in:
Paul Chote
2013-04-08 03:04:20 +12:00
parent b7ea36b858
commit c91f0dfd2f
14 changed files with 137 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -310,7 +310,6 @@
<Compile Include="Render\RenderBuildingCharge.cs" />
<Compile Include="Render\RenderBuildingSilo.cs" />
<Compile Include="Render\RenderBuildingTurreted.cs" />
<Compile Include="Render\RenderBuildingSeparateTurret.cs" />
<Compile Include="Render\RenderBuildingWall.cs" />
<Compile Include="Render\RenderBuildingWarFactory.cs" />
<Compile Include="Render\RenderEditorOnly.cs" />
@@ -321,7 +320,6 @@
<Compile Include="Render\RenderSpy.cs" />
<Compile Include="Render\RenderUnit.cs" />
<Compile Include="Render\RenderUnitReload.cs" />
<Compile Include="Render\RenderUnitTurreted.cs" />
<Compile Include="Render\WithBuildingExplosion.cs" />
<Compile Include="Render\WithMuzzleFlash.cs" />
<Compile Include="Render\WithRotor.cs" />
@@ -437,6 +435,7 @@
<Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
<Compile Include="Widgets\ColorMixerWidget.cs" />
<Compile Include="Widgets\HueSliderWidget.cs" />
<Compile Include="Render\WithTurret.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

41
OpenRA.Mods.RA/Render/RenderBuildingSeparateTurret.cs
View File

@@ -1,41 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.RA.Buildings;
namespace OpenRA.Mods.RA.Render
{
class RenderBuildingSeparateTurretInfo : RenderBuildingInfo, Requires<TurretedInfo>, Requires<AttackBaseInfo>
{
public override object Create(ActorInitializer init) { return new RenderBuildingSeparateTurret(init, this); }
}
class RenderBuildingSeparateTurret : RenderBuilding
{
public RenderBuildingSeparateTurret(ActorInitializer init, RenderBuildingInfo info)
: base(init, info)
{
var self = init.self;
var turreted = self.TraitsImplementing<Turreted>();
var i = 0;
foreach (var t in turreted)
{
var anim = new Animation(GetImage(self), () => t.turretFacing);
anim.Play("turret");
anims.Add("turret_{0}".F(i++), new AnimationWithOffset(anim,
wr => wr.ScreenPxOffset(t.Position(self)), null));
}
}
}
}

21
OpenRA.Mods.RA/Render/RenderUnitReload.cs
View File

@@ -32,25 +32,4 @@ namespace OpenRA.Mods.RA.Render
base.Tick(self);
}
}
/* TODO: native elevation support on turrets, and this dies? */
class RenderUnitTurretedAimInfo : RenderUnitTurretedInfo
{
public override object Create(ActorInitializer init) { return new RenderUnitTurretedAim(init.self); }
}
class RenderUnitTurretedAim : RenderUnitTurreted
{
public RenderUnitTurretedAim(Actor self)
: base(self) { }
public override void Tick(Actor self)
{
var attack = self.TraitOrDefault<AttackBase>();
var isAttacking = attack.IsAttacking;
anims["turret_0"].Animation.ReplaceAnim(isAttacking ? "aim" : "turret");
base.Tick(self);
}
}
}

58
OpenRA.Mods.RA/Render/RenderUnitTurreted.cs
View File

@@ -1,58 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class RenderUnitTurretedInfo : RenderUnitInfo, Requires<TurretedInfo>, Requires<AttackBaseInfo>
{
public override object Create(ActorInitializer init) { return new RenderUnitTurreted(init.self); }
}
class RenderUnitTurreted : RenderUnit
{
public RenderUnitTurreted(Actor self)
: base(self)
{
var facing = self.Trait<IFacing>();
var turreted = self.TraitsImplementing<Turreted>();
var i = 0;
foreach (var t in turreted)
{
var turret = t;
var anim = new Animation(GetImage(self), () => turret.turretFacing);
anim.Play("turret");
anims.Add("turret_{0}".F(i++), new AnimationWithOffset(anim,
wr => TurretPosition(self, wr, turret, facing), null));
}
}
float2 TurretPosition(Actor self, WorldRenderer wr, Turreted t, IFacing facing)
{
var recoil = self.TraitsImplementing<Armament>()
.Where(w => w.Info.Turret == t.Name)
.Aggregate(WRange.Zero, (a,b) => a + b.Recoil);
var localOffset = new WVec(-recoil, WRange.Zero, WRange.Zero);
var bodyOrientation = QuantizeOrientation(self, self.Orientation);
var turretOrientation = QuantizeOrientation(self, t.LocalOrientation(self));
var worldPos = t.Position(self) + LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
return wr.ScreenPxOffset(worldPos);
}
}
}

81
OpenRA.Mods.RA/Render/WithTurret.cs Executable file
View File

@@ -0,0 +1,81 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class WithTurretInfo : ITraitInfo, Requires<RenderSimpleInfo>, Requires<TurretedInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "turret";
[Desc("Sequence name to use when prepared to fire")]
public readonly string AimSequence = null;
[Desc("Turreted 'Turret' key to display")]
public readonly string Turret = "primary";
public object Create(ActorInitializer init) { return new WithTurret(init.self, this); }
}
class WithTurret : ITick
{
WithTurretInfo info;
RenderSimple rs;
AttackBase ab;
Turreted t;
IEnumerable<Armament> arms;
Animation anim;
public WithTurret(Actor self, WithTurretInfo info)
{
this.info = info;
rs = self.Trait<RenderSimple>();
ab = self.TraitOrDefault<AttackBase>();
t = self.TraitsImplementing<Turreted>()
.First(tt => tt.Name == info.Turret);
arms = self.TraitsImplementing<Armament>()
.Where(w => w.Info.Turret == info.Turret);
anim = new Animation(rs.GetImage(self), () => t.turretFacing);
anim.Play(info.Sequence);
rs.anims.Add("turret_{0}".F(info.Turret), new AnimationWithOffset(
anim,
wr => TurretPosition(self, wr),
null) { ZOffset = 1 });
}
int2 TurretPosition(Actor self, WorldRenderer wr)
{
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));
var worldPos = t.Position(self) + rs.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
return wr.ScreenPxOffset(worldPos);
}
public void Tick(Actor self)
{
if (info.AimSequence == null)
return;
var sequence = ab.IsAttacking ? info.AimSequence : info.Sequence;
rs.anims["turret_{0}".F(info.Turret)].Animation.ReplaceAnim(sequence);
}
}
}

26
mods/cnc/rules/vehicles.yaml
View File

@@ -111,7 +111,8 @@ APC:
LocalOffset: 85,85,299, 85,-85,299
AttackTurreted:
WithMuzzleFlash:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Cargo:
Types: Infantry
@@ -217,7 +218,8 @@ BGGY:
Weapon: MachineGun
AttackTurreted:
WithMuzzleFlash:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
LeavesHusk:
HuskActor: BGGY.Husk
@@ -288,7 +290,8 @@ JEEP:
Weapon: MachineGun
AttackTurreted:
WithMuzzleFlash:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
LeavesHusk:
HuskActor: JEEP.Husk
@@ -322,7 +325,8 @@ LTNK:
RecoilRecovery: 17
LocalOffset: -128,0,85
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
LeavesHusk:
HuskActor: LTNK.Husk
@@ -358,7 +362,8 @@ MTNK:
RecoilRecovery: 26
LocalOffset: 0,0,43
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
LeavesHusk:
HuskActor: MTNK.Husk
@@ -403,7 +408,8 @@ HTNK:
LocalYaw: -100, 100
Recoil: 42
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
SelfHealing:
Ticks: 10
@@ -445,7 +451,9 @@ MSAM:
Weapon: 227mm
LocalOffset: 213,128,0, 213,-128,0
AttackFrontal:
RenderUnitTurretedAim:
RenderUnit:
WithTurret:
AimSequence: aim
AutoTarget:
LeavesHusk:
HuskActor: MSAM.Husk
@@ -479,7 +487,9 @@ MLRS:
Weapon: Patriot
LocalOffset: 0,-171,0, 0,171,0
AttackTurreted:
RenderUnitTurretedAim:
RenderUnit:
WithTurret:
AimSequence: aim
AutoTarget:
InitialStance: Defend
Explodes:

3
mods/d2k/rules/atreides.yaml
View File

@@ -138,8 +138,9 @@ COMBATA:
RecoilRecovery: 34
LocalOffset: 85,0,128
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
Image: COMBATA
WithTurret:
LeavesHusk:
HuskActor: Combata.Husk

3
mods/d2k/rules/harkonnen.yaml
View File

@@ -163,8 +163,9 @@ COMBATH:
ROT: 5
Health:
HP: 440
RenderUnitTurreted:
RenderUnit:
Image: COMBATH
WithTurret:
LeavesHusk:
HuskActor: Combath.Husk

3
mods/d2k/rules/ordos.yaml
View File

@@ -108,8 +108,9 @@ COMBATO:
Speed: 9
ROT: 8
Crushes: crate, infantry
RenderUnitTurreted:
RenderUnit:
Image: COMBATO
WithTurret:
LeavesHusk:
HuskActor: Combato.Husk

8
mods/d2k/rules/structures.yaml
View File

@@ -402,11 +402,11 @@ GUNTOWER:
RevealsShroud:
Range: 8
RenderRangeCircle:
-RenderBuilding:
-AutoTargetIgnore:
RenderBuildingSeparateTurret:
RenderBuilding:
HasMakeAnimation: false
Image: guntowera
WithTurret:
Turreted:
ROT: 6
InitialFacing: 128
@@ -460,11 +460,11 @@ ROCKETTOWER:
RevealsShroud:
Range: 10
RenderRangeCircle:
-RenderBuilding:
-AutoTargetIgnore:
RenderBuildingSeparateTurret:
RenderBuilding:
HasMakeAnimation: false
Image: rockettowera
WithTurret:
Armament:
Weapon: TowerMissile
LocalOffset: 85,597,469, 85,-597,469

6
mods/d2k/rules/vehicles.yaml
View File

@@ -223,7 +223,8 @@ QUAD.starport:
RecoilRecovery: 34
LocalOffset: 85,0,128
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall
@@ -272,8 +273,9 @@ SIEGETANK:
RecoilRecovery: 19
LocalOffset: 171,0,299
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
Image: SIEGETANK
WithTurret:
Explodes:
Weapon: UnitExplodeScale
EmptyWeapon: UnitExplodeScale

3
mods/ra/maps/monster-tank-madness/map.yaml
View File

@@ -2586,8 +2586,9 @@ Rules:
LocalYaw: -100,100
Recoil: 43
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
Image: 4TNK
WithTurret:
AutoTarget:
Explodes:
Weapon: MiniNuke

12
mods/ra/rules/ships.yaml
View File

@@ -130,7 +130,8 @@ DD:
AttackTurreted:
Selectable:
Bounds: 38,38
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Chronoshiftable:
IronCurtainable:
@@ -185,7 +186,11 @@ CA:
AttackTurreted:
Selectable:
Bounds: 44,44
RenderUnitTurreted:
RenderUnit:
WithTurret@PRIMARY:
Turret: primary
WithTurret@SECONDARY:
Turret: secondary
AutoTarget:
Chronoshiftable:
IronCurtainable:
@@ -255,7 +260,8 @@ PT:
AttackTurreted:
Selectable:
Bounds: 32,32
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Chronoshiftable:
IronCurtainable:

18
mods/ra/rules/vehicles.yaml
View File

@@ -55,7 +55,8 @@ V2RL:
Recoil: 85
RecoilRecovery: 25
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall
@@ -92,7 +93,8 @@ V2RL:
Recoil: 128
RecoilRecovery: 38
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall
@@ -132,7 +134,8 @@ V2RL:
RecoilRecovery: 38
LocalOffset: 0,85,0, 0,-85,0
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall
@@ -177,7 +180,8 @@ V2RL:
LocalYaw: -100,100
Recoil: 43
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall
@@ -332,7 +336,8 @@ JEEP:
Weapon: M60mg
AttackTurreted:
WithMuzzleFlash:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Cargo:
Types: Infantry
@@ -667,7 +672,8 @@ FTRK:
Weapon: FLAK-23
Recoil: 85
AttackTurreted:
RenderUnitTurreted:
RenderUnit:
WithTurret:
AutoTarget:
Explodes:
Weapon: UnitExplodeSmall