diff options
Diffstat (limited to 'source/blender/blenlib/BLI_math_rotation.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_rotation.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index fbd026f7617..24c20ee7b50 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -59,6 +59,8 @@ void sub_qt_qtqt(float q[4], const float a[4], const float b[4]); void invert_qt(float q[4]); void invert_qt_qt(float q1[4], const float q2[4]); +void invert_qt_normalized(float q[4]); +void invert_qt_qt_normalized(float q1[4], const float q2[4]); void conjugate_qt(float q[4]); void conjugate_qt_qt(float q1[4], const float q2[4]); float dot_qtqt(const float a[4], const float b[4]); @@ -77,6 +79,8 @@ void add_qt_qtqt(float q[4], const float a[4], const float b[4], const float t); void quat_to_mat3(float mat[3][3], const float q[4]); void quat_to_mat4(float mat[4][4], const float q[4]); +void mat3_normalized_to_quat(float q[4], float mat[3][3]); +void mat4_normalized_to_quat(float q[4], float mat[4][4]); void mat3_to_quat(float q[4], float mat[3][3]); void mat4_to_quat(float q[4], float mat[4][4]); void tri_to_quat_ex(float quat[4], const float v1[3], const float v2[3], const float v3[3], @@ -112,13 +116,17 @@ void axis_angle_normalized_to_mat3_ex(float mat[3][3], const float axis[3], void axis_angle_normalized_to_mat3(float R[3][3], const float axis[3], const float angle); void axis_angle_to_mat4(float R[4][4], const float axis[3], const float angle); -void quat_to_axis_angle(float axis[3], float *angle, const float q[4]); +void mat3_normalized_to_axis_angle(float axis[3], float *angle, float M[3][3]); +void mat4_normalized_to_axis_angle(float axis[3], float *angle, float M[4][4]); void mat3_to_axis_angle(float axis[3], float *angle, float M[3][3]); void mat4_to_axis_angle(float axis[3], float *angle, float M[4][4]); +void quat_to_axis_angle(float axis[3], float *angle, const float q[4]); void axis_angle_to_mat3_single(float R[3][3], const char axis, const float angle); void angle_to_mat2(float R[2][2], const float angle); +void axis_angle_to_quat_single(float q[4], const char axis, const float angle); + /****************************** Exponential Map ******************************/ void quat_to_expmap(float expmap[3], const float q[4]); void quat_normalized_to_expmap(float expmap[3], const float q[4]); @@ -130,12 +138,16 @@ void eul_to_quat(float quat[4], const float eul[3]); void eul_to_mat3(float mat[3][3], const float eul[3]); void eul_to_mat4(float mat[4][4], const float eul[3]); -void quat_to_eul(float eul[3], const float quat[4]); +void mat3_normalized_to_eul(float eul[3], float mat[3][3]); +void mat4_normalized_to_eul(float eul[3], float mat[4][4]); void mat3_to_eul(float eul[3], float mat[3][3]); void mat4_to_eul(float eul[3], float mat[4][4]); +void quat_to_eul(float eul[3], const float quat[4]); -void compatible_eul(float eul[3], const float old[3]); +void mat3_normalized_to_compatible_eul(float eul[3], const float old[3], float mat[3][3]); void mat3_to_compatible_eul(float eul[3], const float old[3], float mat[3][3]); +void quat_to_compatible_eul(float eul[3], const float oldrot[3], const float quat[4]); +void compatible_eul(float eul[3], const float old[3]); void rotate_eul(float eul[3], const char axis, const float angle); @@ -160,14 +172,19 @@ void eulO_to_mat3(float mat[3][3], const float eul[3], const short order); void eulO_to_mat4(float mat[4][4], const float eul[3], const short order); void eulO_to_axis_angle(float axis[3], float *angle, const float eul[3], const short order); void eulO_to_gimbal_axis(float gmat[3][3], const float eul[3], const short order); - -void quat_to_eulO(float eul[3], const short order, const float quat[4]); + +void mat3_normalized_to_eulO(float eul[3], const short order, float mat[3][3]); +void mat4_normalized_to_eulO(float eul[3], const short order, float mat[4][4]); void mat3_to_eulO(float eul[3], const short order, float mat[3][3]); void mat4_to_eulO(float eul[3], const short order, float mat[4][4]); +void quat_to_eulO(float eul[3], const short order, const float quat[4]); void axis_angle_to_eulO(float eul[3], const short order, const float axis[3], const float angle); +void mat3_normalized_to_compatible_eulO(float eul[3], float old[3], const short order, float mat[3][3]); +void mat4_normalized_to_compatible_eulO(float eul[3], float old[3], const short order, float mat[4][4]); void mat3_to_compatible_eulO(float eul[3], float old[3], const short order, float mat[3][3]); void mat4_to_compatible_eulO(float eul[3], float old[3], const short order, float mat[4][4]); +void quat_to_compatible_eulO(float eul[3], float old[3], const short order, const float quat[4]); void rotate_eulO(float eul[3], const short order, char axis, float angle); |