CTurt/dsgmLib
1
Fork 0
mirror of https://github.com/CTurt/dsgmLib.git synced 2025-06-19 07:05:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistent euler naming

Browse Source
This commit is contained in:
CTurt 2014-10-30 08:28:42 +00:00
parent 90f2fb8ba9
commit 0125bc99d6
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/DSGM_quaternion.h
View File

@ -49,15 +49,13 @@ Quaternion Quaternion_withValues(int32 x, int32 y, int32 z, int32 w);
Quaternion Quaternion_fromVector(vect3D vector); Quaternion Quaternion_fromVector(vect3D vector);
vect3D Quaternion_toVector(Quaternion quaternion); vect3D Quaternion_toVector(Quaternion quaternion);
Quaternion Quaternion_fromAxisAngle(vect3D axis, int angle); Quaternion Quaternion_fromAxisAngle(vect3D axis, int angle);
inline Quaternion Quaternion_fromRollPitchYaw(int32 roll, int32 pitch, int32 yaw); inline Quaternion Quaternion_fromEuler(int32 roll, int32 pitch, int32 yaw);
vect3D Quaternion_toEuler(Quaternion q); vect3D Quaternion_toEuler(Quaternion q);
m4x4 Quaternion_toMatrix(Quaternion quaternion); m4x4 Quaternion_toMatrix(Quaternion quaternion);
void Quaternion_multiply(Quaternion * quaternion1, Quaternion quaternion2); void Quaternion_multiply(Quaternion * quaternion1, Quaternion quaternion2);
Quaternion Quaternion_multiplied(Quaternion quaternion1, Quaternion quaternion2); Quaternion Quaternion_multiplied(Quaternion quaternion1, Quaternion quaternion2);
inline void DSGM_RotateRollPitchYaw(int32 roll, int32 pitch, int32 yaw);
void Quaternion_normalize(Quaternion *quaternion); void Quaternion_normalize(Quaternion *quaternion);
Quaternion Quaternion_normalized(Quaternion quaternion); Quaternion Quaternion_normalized(Quaternion quaternion);

BIN
lib/libdsgm.a
View File

Binary file not shown.

8
source/DSGM_quaternion.c
View File

@ -94,7 +94,7 @@ Quaternion Quaternion_fromAxisAngle(vect3D axis, int angle) {
return quaternion; return quaternion;
} }
inline Quaternion Quaternion_fromRollPitchYaw(int32 roll, int32 pitch, int32 yaw) { inline Quaternion Quaternion_fromEuler(int32 roll, int32 pitch, int32 yaw) {
//http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q60 //http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q60
/*Quaternion q = Quaternion_identity(); /*Quaternion q = Quaternion_identity();
Quaternion qt = Quaternion_identity(); Quaternion qt = Quaternion_identity();
@ -209,12 +209,6 @@ Quaternion Quaternion_multiplied(Quaternion quaternion1, Quaternion quaternion2)
return quaternion1; return quaternion1;
} }
inline void DSGM_RotateRollPitchYaw(int32 roll, int32 pitch, int32 yaw) {
Quaternion q = Quaternion_fromRollPitchYaw(roll, pitch, yaw);
m4x4 m = Quaternion_toMatrix(q);
glMultMatrix4x4(&m);
}
void Quaternion_normalize(Quaternion *quaternion) { void Quaternion_normalize(Quaternion *quaternion) {
int32 magnitude; int32 magnitude;