diff --git a/include/DSGM_quaternion.h b/include/DSGM_quaternion.h index 0404111..791d30f 100644 --- a/include/DSGM_quaternion.h +++ b/include/DSGM_quaternion.h @@ -49,15 +49,13 @@ Quaternion Quaternion_withValues(int32 x, int32 y, int32 z, int32 w); Quaternion Quaternion_fromVector(vect3D vector); vect3D Quaternion_toVector(Quaternion quaternion); 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); m4x4 Quaternion_toMatrix(Quaternion quaternion); void Quaternion_multiply(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); Quaternion Quaternion_normalized(Quaternion quaternion); diff --git a/lib/libdsgm.a b/lib/libdsgm.a index 2bf30a5..331c3de 100644 Binary files a/lib/libdsgm.a and b/lib/libdsgm.a differ diff --git a/source/DSGM_quaternion.c b/source/DSGM_quaternion.c index 27b8fca..d774217 100644 --- a/source/DSGM_quaternion.c +++ b/source/DSGM_quaternion.c @@ -94,7 +94,7 @@ Quaternion Quaternion_fromAxisAngle(vect3D axis, int angle) { 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 /*Quaternion q = Quaternion_identity(); Quaternion qt = Quaternion_identity(); @@ -209,12 +209,6 @@ Quaternion Quaternion_multiplied(Quaternion quaternion1, Quaternion quaternion2) 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) { int32 magnitude;