REVIEWED: Vector2Angle()
This commit is contained in:
parent
72b9f3c5de
commit
d7f7c94c4d
1 changed files with 13 additions and 5 deletions
|
@ -307,15 +307,23 @@ RMAPI float Vector2DistanceSqr(Vector2 v1, Vector2 v2)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calculate angle from two vectors
|
// Calculate angle from two vectors
|
||||||
// Parameters need to be normalized
|
// NOTE: Parameters need to be normalized
|
||||||
|
// Current implementation should be aligned with glm::angle
|
||||||
RMAPI float Vector2Angle(Vector2 v1, Vector2 v2)
|
RMAPI float Vector2Angle(Vector2 v1, Vector2 v2)
|
||||||
{
|
{
|
||||||
float dotProduct = v1.x*v2.x + v1.y*v2.y; // Dot product
|
float result = 0.0f;
|
||||||
|
|
||||||
float t = dotProduct < -1 ? -1 : dotProduct; // Clamp
|
float dot = v1.x*v2.x + v1.y*v2.y; // Dot product
|
||||||
if (t > 1) t = 1;
|
|
||||||
|
|
||||||
float result = acosf(t);
|
float dotClamp = (dot < -1.0f)? -1.0f : dot; // Clamp
|
||||||
|
if (dotClamp > 1.0f) dotClamp = 1.0f;
|
||||||
|
|
||||||
|
result = acosf(dotClamp);
|
||||||
|
|
||||||
|
// Alternative implementation, more costly
|
||||||
|
//float v1Length = sqrtf((v1.x*v1.x) + (v1.y*v1.y));
|
||||||
|
//float v2Length = sqrtf((v2.x*v2.x) + (v2.y*v2.y));
|
||||||
|
//float result = -acosf((v1.x*v2.x + v1.y*v2.y)/(v1Length*v2Length));
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue