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

Convert (Dynamic)FacingInit, (Dynamic)TurretFacingInit to WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-06-26 00:33:08 +01:00
committed by abcdefg30
parent e8f443f4a9
commit a2269e7ee7
36 changed files with 133 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Graphics/ActorPreview.cs
View File

@@ -74,13 +74,13 @@ namespace OpenRA.Mods.Common.Graphics
{
// TODO: Account for terrain slope
var getFacing = dynamicInit.Value;
return () => WRot.FromFacing(getFacing());
return () => WRot.FromYaw(getFacing());
}
// Fall back to initial actor facing if an Init isn't available
var facingInit = reference.GetOrDefault<FacingInit>();
var facing = facingInit != null ? facingInit.Value : facingInfo.GetInitialFacing();
var orientation = WRot.FromFacing(facing);
var orientation = WRot.FromYaw(facing);
return () => orientation;
}
@@ -93,14 +93,11 @@ namespace OpenRA.Mods.Common.Graphics
// Dynamic facing takes priority
var dynamicInit = reference.GetOrDefault<DynamicFacingInit>();
if (dynamicInit != null)
{
var getFacing = dynamicInit.Value;
return () => WAngle.FromFacing(getFacing());
}
return dynamicInit.Value;
// Fall back to initial actor facing if an Init isn't available
var facingInit = reference.GetOrDefault<FacingInit>();
var facing = WAngle.FromFacing(facingInit != null ? facingInit.Value : facingInfo.GetInitialFacing());
var facing = facingInit != null ? facingInit.Value : facingInfo.GetInitialFacing();
return () => facing;
}