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

Merge pull request #11470 from pchote/fix-direction-check

Browse Source 
Fix Mobile.IsMovingInMyDirection check.
This commit is contained in:
Oliver Brakmann
2016-06-22 22:49:03 +02:00
committed by GitHub
parent 34c6edbbe7 cf23c85834
commit c2d4a3a8e8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -179,18 +179,17 @@ namespace OpenRA.Mods.Common.Traits
static bool IsMovingInMyDirection(Actor self, Actor other) static bool IsMovingInMyDirection(Actor self, Actor other)
{ {
var selfMobile = self.TraitOrDefault<Mobile>();
if (selfMobile == null)
return false;
var otherMobile = other.TraitOrDefault<Mobile>(); var otherMobile = other.TraitOrDefault<Mobile>();
if (otherMobile == null || !otherMobile.IsMoving) if (otherMobile == null || !otherMobile.IsMoving)
return false; return false;
// Sign of dot-product indicates (roughly) if vectors are facing in same or opposite directions: var selfMobile = self.TraitOrDefault<Mobile>();
var dp = CVec.Dot(selfMobile.ToCell - self.Location, otherMobile.ToCell - other.Location); if (selfMobile == null)
return false;
return dp > 0; // Moving in the same direction if the facing delta is between +/- 90 degrees
var delta = Util.NormalizeFacing(otherMobile.Facing - selfMobile.Facing);
return delta < 64 || delta > 192;
} }
public int TileSetMovementHash(TileSet tileSet) public int TileSetMovementHash(TileSet tileSet)