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

Convert QuantizeFacing to WAngle facings.

Browse Source
This commit is contained in:
Paul Chote
2020-05-25 21:35:01 +01:00
committed by reaperrr
parent bfb6c671fb
commit c999b2d778
11 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Graphics/ClassicSpriteSequence.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Cnc.Graphics
protected override int GetFacingFrameOffset(WAngle facing)
{
return useClassicFacings ? Util.ClassicIndexFacing(facing.Facing, Facings) : Common.Util.IndexFacing(facing.Facing, Facings);
return useClassicFacings ? Util.ClassicIndexFacing(facing, Facings) : Common.Util.IndexFacing(facing, Facings);
}
}
}

2
OpenRA.Mods.Cnc/Traits/ClassicFacingBodyOrientation.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Fudge the coordinate system angles like the early games (for sprite sequences that use classic facing fudge).")]
public class ClassicFacingBodyOrientationInfo : BodyOrientationInfo
{
public override int QuantizeFacing(int facing, int facings)
public override WAngle QuantizeFacing(WAngle facing, int facings)
{
return Util.ClassicQuantizeFacing(facing, facings);
}

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

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
var passengerInits = new TypeDictionary()
{
new OwnerInit(p.Owner),
new DynamicFacingInit(() => body.QuantizeFacing(facing.Facing)),
new DynamicFacingInit(() => body.QuantizeFacing(WAngle.FromFacing(facing.Facing)).Facing),
};
foreach (var api in p.TraitsImplementing<IActorPreviewInitModifier>())

29
OpenRA.Mods.Cnc/Util.cs
View File

@@ -15,23 +15,23 @@ namespace OpenRA.Mods.Cnc
{
// TD and RA used a nonlinear mapping between artwork frames and unit facings for units with 32 facings.
// This table defines the exclusive maximum facing for the i'th sprite frame.
// i.e. sprite frame 1 is used for facings 5-13, sprite frame 2 for 14-21, and so on.
// Sprite frame 0 is used for facings smaller than 5 or larger than 249.
// i.e. sprite frame 1 is used for facings 20-55, sprite frame 2 for 56-87, and so on.
// Sprite frame 0 is used for facings smaller than 20 or larger than 999.
static readonly int[] SpriteRanges =
{
5, 14, 22, 33, 39, 46, 53, 60,
67, 74, 81, 88, 96, 104, 113, 122,
133, 142, 151, 161, 167, 174, 181, 188,
195, 202, 209, 216, 224, 232, 241, 250
20, 56, 88, 132, 156, 184, 212, 240,
268, 296, 324, 352, 384, 416, 452, 488,
532, 568, 604, 644, 668, 696, 724, 752,
780, 808, 836, 864, 896, 928, 964, 1000
};
// The actual facing associated with each sprite frame.
static readonly int[] SpriteFacings =
static readonly WAngle[] SpriteFacings =
{
0, 10, 18, 28, 36, 43, 50, 57,
64, 71, 78, 85, 92, 100, 109, 118,
128, 138, 147, 156, 164, 171, 178, 185,
192, 199, 206, 213, 220, 228, 237, 246
WAngle.Zero, new WAngle(40), new WAngle(74), new WAngle(112), new WAngle(146), new WAngle(172), new WAngle(200), new WAngle(228),
new WAngle(256), new WAngle(284), new WAngle(312), new WAngle(340), new WAngle(370), new WAngle(402), new WAngle(436), new WAngle(472),
new WAngle(512), new WAngle(552), new WAngle(588), new WAngle(626), new WAngle(658), new WAngle(684), new WAngle(712), new WAngle(740),
new WAngle(768), new WAngle(796), new WAngle(824), new WAngle(852), new WAngle(882), new WAngle(914), new WAngle(948), new WAngle(984)
};
/// <summary>
@@ -39,12 +39,13 @@ namespace OpenRA.Mods.Cnc
/// should be used for the given facing value, accounting
/// for the non-linear facing mapping for sprites with 32 directions.
/// </summary>
public static int ClassicIndexFacing(int facing, int numFrames)
public static int ClassicIndexFacing(WAngle facing, int numFrames)
{
if (numFrames == 32)
{
var angle = facing.Angle;
for (var i = 0; i < SpriteRanges.Length; i++)
if (facing < SpriteRanges[i])
if (angle < SpriteRanges[i])
return i;
return 0;
@@ -57,7 +58,7 @@ namespace OpenRA.Mods.Cnc
/// Rounds the given facing value to the nearest quantized step,
/// accounting for the non-linear facing mapping for sprites with 32 directions.
/// </summary>
public static int ClassicQuantizeFacing(int facing, int steps)
public static WAngle ClassicQuantizeFacing(WAngle facing, int steps)
{
if (steps == 32)
return SpriteFacings[ClassicIndexFacing(facing, steps)];