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

Remove fp from facing calculation.

Browse Source
This commit is contained in:
Paul Chote
2011-01-27 12:00:40 +13:00
parent ad0e0a18bd
commit 9db41f5638
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.FileFormats/Primitives/int2.cs
View File

@@ -78,5 +78,8 @@ namespace OpenRA
return new int2(Math.Min(r.Right, Math.Max(X, r.Left)), return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
Math.Min(r.Bottom, Math.Max(Y, r.Top))); Math.Min(r.Bottom, Math.Max(Y, r.Top)));
} }
public static int Dot(int2 a, int2 b) { return a.X * b.X + a.Y * b.Y; }
} }
} }

13
OpenRA.Game/Traits/Util.cs
View File

@@ -31,21 +31,20 @@ namespace OpenRA.Traits
return ( facing - rot ) & 0xFF; return ( facing - rot ) & 0xFF;
} }
static float2[] fvecs = Graphics.Util.MakeArray<float2>( 32, static int2[] fvecs = Graphics.Util.MakeArray<int2>( 32,
i => -float2.FromAngle( i / 16.0f * (float)Math.PI ) * new float2( 1f, 1.3f ) ); i => (-1024*float2.FromAngle( i / 16.0f * (float)Math.PI ) * new float2( 1f, 1.3f )).ToInt2() );
public static int GetFacing( int2 dd, int currentFacing ) public static int GetFacing( int2 d, int currentFacing )
{ {
var d = dd.ToFloat2(); if (d == int2.Zero)
if (float2.WithinEpsilon(d, float2.Zero, 0.001f))
return currentFacing; return currentFacing;
int highest = -1; int highest = -1;
float highestDot = -1.0f; int highestDot = -1;
for( int i = 0 ; i < fvecs.Length ; i++ ) for( int i = 0 ; i < fvecs.Length ; i++ )
{ {
float dot = float2.Dot( fvecs[ i ], d ); int dot = int2.Dot( fvecs[ i ], d );
if( dot > highestDot ) if( dot > highestDot )
{ {
highestDot = dot; highestDot = dot;