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

Convert IFacing.Facing and TurnSpeed to WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-06-01 20:42:28 +01:00
committed by teinarss
parent 01417c88c5
commit 6adf45bcb4
44 changed files with 101 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
readonly Cargo cargo;
readonly BodyOrientation body;
readonly IFacing facing;
int cachedFacing;
WAngle cachedFacing;
Dictionary<Actor, IActorPreview[]> previews = new Dictionary<Actor, IActorPreview[]>();
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
var passengerInits = new TypeDictionary()
{
new OwnerInit(p.Owner),
new DynamicFacingInit(() => body.QuantizeFacing(WAngle.FromFacing(facing.Facing)).Facing),
new DynamicFacingInit(() => body.QuantizeFacing(facing.Facing).Facing),
};
foreach (var api in p.TraitsImplementing<IActorPreviewInitModifier>())

2
OpenRA.Mods.Cnc/Traits/Render/WithGunboatBody.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
void ITick.Tick(Actor self)
{
if (facing.Facing <= 128)
if (facing.Facing.Angle <= 512)
{
var left = NormalizeSequence(self, info.LeftSequence);
if (DefaultAnimation.CurrentSequence.Name != left)

25
OpenRA.Mods.Cnc/Traits/TDGunboat.cs
View File

@@ -58,12 +58,14 @@ namespace OpenRA.Mods.Cnc.Traits
{
public readonly TDGunboatInfo Info;
readonly Actor self;
static readonly WAngle Left = new WAngle(256);
static readonly WAngle Right = new WAngle(768);
IEnumerable<int> speedModifiers;
INotifyVisualPositionChanged[] notifyVisualPositionChanged;
[Sync]
public int Facing { get; set; }
public WAngle Facing { get; set; }
[Sync]
public WPos CenterPosition { get; private set; }
@@ -88,11 +90,11 @@ namespace OpenRA.Mods.Cnc.Traits
if (centerPositionInit != null)
SetPosition(self, centerPositionInit.Value);
Facing = init.GetValue<FacingInit, int>(info, Info.GetInitialFacing());
Facing = WAngle.FromFacing(init.GetValue<FacingInit, int>(info, Info.GetInitialFacing()));
// Prevent mappers from setting bogus facings
if (Facing != 64 && Facing != 192)
Facing = Facing > 127 ? 192 : 64;
if (Facing != Left && Facing != Right)
Facing = Facing.Angle > 511 ? Right : Left;
}
void INotifyCreated.Created(Actor self)
@@ -128,10 +130,7 @@ namespace OpenRA.Mods.Cnc.Traits
void Turn()
{
if (Facing == 64)
Facing = 192;
else
Facing = 64;
Facing = Facing == Left ? Right : Left;
}
int MovementSpeed
@@ -141,20 +140,20 @@ namespace OpenRA.Mods.Cnc.Traits
public Pair<CPos, SubCell>[] OccupiedCells() { return new[] { Pair.New(TopLeft, SubCell.FullCell) }; }
WVec MoveStep(int facing)
WVec MoveStep(WAngle facing)
{
return MoveStep(MovementSpeed, facing);
}
WVec MoveStep(int speed, int facing)
WVec MoveStep(int speed, WAngle facing)
{
var dir = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing));
var dir = new WVec(0, -1024, 0).Rotate(WRot.FromYaw(facing));
return speed * dir / 1024;
}
void IDeathActorInitModifier.ModifyDeathActorInit(Actor self, TypeDictionary init)
{
init.Add(new FacingInit(Facing));
init.Add(new FacingInit(Facing.Facing));
}
public bool CanExistInCell(CPos cell) { return true; }
@@ -225,7 +224,7 @@ namespace OpenRA.Mods.Cnc.Traits
void IActorPreviewInitModifier.ModifyActorPreviewInit(Actor self, TypeDictionary inits)
{
if (!inits.Contains<DynamicFacingInit>() && !inits.Contains<FacingInit>())
inits.Add(new DynamicFacingInit(() => Facing));
inits.Add(new DynamicFacingInit(() => Facing.Facing));
}
}
}