UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed functions Vector2Angle and Vector3Angle (#2203)

Browse source 
* Fixed functions Vector2Angle and Vector3Angle

* typo

* Unrolled everything.
This commit is contained in:
Andrea Fontana 2021-12-09 22:30:52 +01:00 • committed by GitHub
parent fd0e3a4fdd
commit c0715c1225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/raymath.h
View file

@ -99,7 +99,8 @@
// Types and Structures Definition // Types and Structures Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#if !defined(RL_VECTOR2_TYPE) #if !defined(RL_VECTOR2_TYPE)
// Vector2 type //
type
typedef struct Vector2 { typedef struct Vector2 {
float x; float x;
float y; float y;
@ -278,13 +279,11 @@ RMAPI float Vector2Distance(Vector2 v1, Vector2 v2)
return result; return result;
} }
// Calculate angle from two vectors in X-axis // Calculate angle from two vectors
RMAPI float Vector2Angle(Vector2 v1, Vector2 v2) RMAPI float Vector2Angle(Vector2 v1, Vector2 v2)
{ {
float result = atan2f(v2.y, v2.x) - atan2f(v1.y, v1.x); float result = atan2f(v2.y, v2.x) - atan2f(v1.y, v1.x);
if (result < 0) result += 2 * PI;
return result; return result;
} }
@ -532,18 +531,14 @@ RMAPI float Vector3Distance(Vector3 v1, Vector3 v2)
return result; return result;
} }
// Calculate angle between two vectors in XY and XZ // Calculate angle between two vectors
RMAPI Vector2 Vector3Angle(Vector3 v1, Vector3 v2) RMAPI float Vector3Angle(Vector3 v1, Vector3 v2)
{ {
Vector2 result = { 0 }; Vector3 cross = { v1.y*v2.z - v1.z*v2.y, v1.z*v2.x - v1.x*v2.z, v1.x*v2.y - v1.y*v2.x };
float len = sqrtf(cross.x*cross.x + cross.y*cross.y + cross.z*cross.z);
float dx = v2.x - v1.x; float dot = (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z);
float dy = v2.y - v1.y; float result = atan2f(len, dot);
float dz = v2.z - v1.z;
result.x = atan2f(dx, dz); // Angle in XZ
result.y = atan2f(dy, sqrtf(dx*dx + dz*dz)); // Angle in XY
return result; return result;
} }