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

Change IFacing.TurnSpeed to WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-06-03 18:01:15 +01:00
committed by teinarss
parent 6adf45bcb4
commit 803b930405
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

@@ -60,14 +60,14 @@ namespace OpenRA.Mods.Common.Activities
this.minRange = minRange;
}
public static void FlyTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, WVec moveOverride, int turnSpeedOverride = -1)
public static void FlyTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, WVec moveOverride, WAngle? turnSpeedOverride = null)
{
var dat = self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition);
var move = aircraft.Info.CanSlide ? aircraft.FlyStep(desiredFacing) : aircraft.FlyStep(aircraft.Facing);
if (moveOverride != WVec.Zero)
move = moveOverride;
var turnSpeed = turnSpeedOverride > -1 ? turnSpeedOverride : aircraft.TurnSpeed;
var turnSpeed = turnSpeedOverride ?? aircraft.TurnSpeed;
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, turnSpeed);
// Note: we assume that if move.Z is not zero, it's intentional and we want to move in that vertical direction instead of towards desiredAltitude.
@@ -83,18 +83,18 @@ namespace OpenRA.Mods.Common.Activities
aircraft.SetPosition(self, aircraft.CenterPosition + move);
}
public static void FlyTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, int turnSpeedOverride = -1)
public static void FlyTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, WAngle? turnSpeedOverride = null)
{
FlyTick(self, aircraft, desiredFacing, desiredAltitude, WVec.Zero, turnSpeedOverride);
}
// Should only be used for vertical-only movement, usually VTOL take-off or land. Terrain-induced altitude changes should always be handled by FlyTick.
public static bool VerticalTakeOffOrLandTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, int turnSpeedOverride = -1)
public static bool VerticalTakeOffOrLandTick(Actor self, Aircraft aircraft, WAngle desiredFacing, WDist desiredAltitude, WAngle? turnSpeedOverride = null)
{
var dat = self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition);
var move = WVec.Zero;
var turnSpeed = turnSpeedOverride > -1 ? turnSpeedOverride : aircraft.TurnSpeed;
var turnSpeed = turnSpeedOverride ?? aircraft.TurnSpeed;
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, turnSpeed);
if (dat != desiredAltitude)
@@ -261,12 +261,12 @@ namespace OpenRA.Mods.Common.Activities
yield return new TargetLineNode(useLastVisibleTarget ? lastVisibleTarget : target, targetLineColor.Value);
}
public static int CalculateTurnRadius(int speed, int turnSpeed)
public static int CalculateTurnRadius(int speed, WAngle turnSpeed)
{
// turnSpeed -> divide into 256 to get the number of ticks per complete rotation
// speed -> multiply to get distance travelled per rotation (circumference)
// 180 -> divide by 2*pi to get the turn radius: 180==1024/(2*pi), with some extra leeway
return turnSpeed > 0 ? 180 * speed / turnSpeed : 0;
return turnSpeed.Angle > 0 ? 180 * speed / turnSpeed.Angle : 0;
}
}
}

4
OpenRA.Mods.Common/Activities/Air/FlyIdle.cs
View File

@@ -20,13 +20,13 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Aircraft aircraft;
readonly INotifyIdle[] tickIdles;
readonly int turnSpeed;
readonly WAngle turnSpeed;
int remainingTicks;
public FlyIdle(Actor self, int ticks = -1, bool tickIdle = true)
{
aircraft = self.Trait<Aircraft>();
turnSpeed = aircraft.IdleTurnSpeed > -1 ? aircraft.IdleTurnSpeed : aircraft.TurnSpeed;
turnSpeed = aircraft.IdleTurnSpeed ?? aircraft.TurnSpeed;
remainingTicks = ticks;
if (tickIdle)