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

Make the calculation of DesiredLocalFacing more readable

Browse Source
This commit is contained in:
abcdefg30
2020-10-12 11:51:59 +02:00
committed by Paul Chote
parent 10cb8090ec
commit a7bb217887
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -221,14 +221,17 @@ namespace OpenRA.Mods.Common.Traits
if (desiredDirection == WVec.Zero) if (desiredDirection == WVec.Zero)
return LocalOrientation.Yaw; return LocalOrientation.Yaw;
if (facing == null)
return desiredDirection.Yaw;
// PERF: If the turret rotation axis is vertical we can directly take the difference in facing/yaw // PERF: If the turret rotation axis is vertical we can directly take the difference in facing/yaw
var o = facing != null ? facing.Orientation : (WRot?)null; var orientation = facing.Orientation;
if (o == null || (o.Value.Pitch == WAngle.Zero && o.Value.Roll == WAngle.Zero)) if (orientation.Pitch == WAngle.Zero && orientation.Roll == WAngle.Zero)
return o.HasValue ? desiredDirection.Yaw - o.Value.Yaw : desiredDirection.Yaw; return desiredDirection.Yaw - orientation.Yaw;
// If the turret rotation axis is not vertical we must transform the // If the turret rotation axis is not vertical we must transform the
// target direction into the turrets local coordinate system // target direction into the turrets local coordinate system
return desiredDirection.Rotate(-o.Value).Yaw; return desiredDirection.Rotate(-orientation).Yaw;
} }
} }