[Bf-blender-cvs] [213ac7b1ace] master: Cleanup: use const args for BLI_math_rotation
Campbell Barton
noreply at git.blender.org
Mon Feb 25 13:20:00 CET 2019
Commit: 213ac7b1aceea3b5a210e86a07402d4415c9a6b6
Author: Campbell Barton
Date: Mon Feb 25 23:14:48 2019 +1100
Branches: master
https://developer.blender.org/rB213ac7b1aceea3b5a210e86a07402d4415c9a6b6
Cleanup: use const args for BLI_math_rotation
===================================================================
M source/blender/blenlib/BLI_math_rotation.h
M source/blender/blenlib/intern/math_rotation.c
===================================================================
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h
index 699deb7d8f9..5246d7ad1a9 100644
--- a/source/blender/blenlib/BLI_math_rotation.h
+++ b/source/blender/blenlib/BLI_math_rotation.h
@@ -77,10 +77,10 @@ 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 mat3_normalized_to_quat(float q[4], const float mat[3][3]);
+void mat4_normalized_to_quat(float q[4], const float mat[4][4]);
+void mat3_to_quat(float q[4], const float mat[3][3]);
+void mat4_to_quat(float q[4], const float mat[4][4]);
void tri_to_quat_ex(float quat[4], const float v1[3], const float v2[3], const float v3[3],
const float no_orig[3]);
float tri_to_quat(float q[4], const float a[3], const float b[3], const float c[3]);
@@ -101,7 +101,7 @@ float angle_signed_qt(const float q[4]);
float angle_signed_qtqt(const float q1[4], const float q2[4]);
/* TODO: don't what this is, but it's not the same as mat3_to_quat */
-void mat3_to_quat_is_ok(float q[4], float mat[3][3]);
+void mat3_to_quat_is_ok(float q[4], const float mat[3][3]);
/* other */
void print_qt(const char *str, const float q[4]);
@@ -119,10 +119,10 @@ 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 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 mat3_normalized_to_axis_angle(float axis[3], float *angle, const float M[3][3]);
+void mat4_normalized_to_axis_angle(float axis[3], float *angle, const float M[4][4]);
+void mat3_to_axis_angle(float axis[3], float *angle, const float M[3][3]);
+void mat4_to_axis_angle(float axis[3], float *angle, const float M[4][4]);
void quat_to_axis_angle(float axis[3], float *angle, const float q[4]);
void angle_to_mat2(float R[2][2], const float angle);
@@ -142,10 +142,10 @@ 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 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 mat3_normalized_to_eul(float eul[3], const float mat[3][3]);
+void mat4_normalized_to_eul(float eul[3], const float mat[4][4]);
+void mat3_to_eul(float eul[3], const float mat[3][3]);
+void mat4_to_eul(float eul[3], const float mat[4][4]);
void quat_to_eul(float eul[3], const float quat[4]);
void mat3_normalized_to_compatible_eul(float eul[3], const float old[3], float mat[3][3]);
@@ -177,18 +177,18 @@ 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 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 mat3_normalized_to_eulO(float eul[3], const short order, const float mat[3][3]);
+void mat4_normalized_to_eulO(float eul[3], const short order, const float mat[4][4]);
+void mat3_to_eulO(float eul[3], const short order, const float mat[3][3]);
+void mat4_to_eulO(float eul[3], const short order, const 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 mat3_normalized_to_compatible_eulO(float eul[3], const float old[3], const short order, const float mat[3][3]);
+void mat4_normalized_to_compatible_eulO(float eul[3], const float old[3], const short order, const float mat[4][4]);
+void mat3_to_compatible_eulO(float eul[3], const float old[3], const short order, const float mat[3][3]);
+void mat4_to_compatible_eulO(float eul[3], const float old[3], const short order, const float mat[4][4]);
+void quat_to_compatible_eulO(float eul[3], const float old[3], const short order, const float quat[4]);
void rotate_eulO(float eul[3], const short order, char axis, float angle);
@@ -207,7 +207,7 @@ void normalize_dq(DualQuat *dq, float totw);
void add_weighted_dq_dq(DualQuat *r, const DualQuat *dq, float weight);
void mul_v3m3_dq(float r[3], float R[3][3], DualQuat *dq);
-void mat4_to_dquat(DualQuat *r, float base[4][4], float M[4][4]);
+void mat4_to_dquat(DualQuat *r, const float base[4][4], const float M[4][4]);
void dquat_to_mat4(float R[4][4], const DualQuat *dq);
void quat_apply_track(float quat[4], short axis, short upflag);
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index c8d4ce9690b..a8629e93483 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -291,7 +291,7 @@ void quat_to_mat4(float m[4][4], const float q[4])
m[3][3] = 1.0f;
}
-void mat3_normalized_to_quat(float q[4], float mat[3][3])
+void mat3_normalized_to_quat(float q[4], const float mat[3][3])
{
double tr, s;
@@ -339,7 +339,7 @@ void mat3_normalized_to_quat(float q[4], float mat[3][3])
normalize_qt(q);
}
-void mat3_to_quat(float q[4], float m[3][3])
+void mat3_to_quat(float q[4], const float m[3][3])
{
float unit_mat[3][3];
@@ -349,7 +349,7 @@ void mat3_to_quat(float q[4], float m[3][3])
mat3_normalized_to_quat(q, unit_mat);
}
-void mat4_normalized_to_quat(float q[4], float m[4][4])
+void mat4_normalized_to_quat(float q[4], const float m[4][4])
{
float mat3[3][3];
@@ -357,7 +357,7 @@ void mat4_normalized_to_quat(float q[4], float m[4][4])
mat3_normalized_to_quat(q, mat3);
}
-void mat4_to_quat(float q[4], float m[4][4])
+void mat4_to_quat(float q[4], const float m[4][4])
{
float mat3[3][3];
@@ -365,7 +365,7 @@ void mat4_to_quat(float q[4], float m[4][4])
mat3_to_quat(q, mat3);
}
-void mat3_to_quat_is_ok(float q[4], float wmat[3][3])
+void mat3_to_quat_is_ok(float q[4], const float wmat[3][3])
{
float mat[3][3], matr[3][3], matn[3][3], q1[4], q2[4], angle, si, co, nor[3];
@@ -1033,7 +1033,7 @@ void axis_angle_to_mat4(float mat[4][4], const float axis[3], const float angle)
}
/* 3x3 matrix to axis angle */
-void mat3_normalized_to_axis_angle(float axis[3], float *angle, float mat[3][3])
+void mat3_normalized_to_axis_angle(float axis[3], float *angle, const float mat[3][3])
{
float q[4];
@@ -1042,7 +1042,7 @@ void mat3_normalized_to_axis_angle(float axis[3], float *angle, float mat[3][3])
mat3_normalized_to_quat(q, mat);
quat_to_axis_angle(axis, angle, q);
}
-void mat3_to_axis_angle(float axis[3], float *angle, float mat[3][3])
+void mat3_to_axis_angle(float axis[3], float *angle, const float mat[3][3])
{
float q[4];
@@ -1053,7 +1053,7 @@ void mat3_to_axis_angle(float axis[3], float *angle, float mat[3][3])
}
/* 4x4 matrix to axis angle */
-void mat4_normalized_to_axis_angle(float axis[3], float *angle, float mat[4][4])
+void mat4_normalized_to_axis_angle(float axis[3], float *angle, const float mat[4][4])
{
float q[4];
@@ -1064,7 +1064,7 @@ void mat4_normalized_to_axis_angle(float axis[3], float *angle, float mat[4][4])
}
/* 4x4 matrix to axis angle */
-void mat4_to_axis_angle(float axis[3], float *angle, float mat[4][4])
+void mat4_to_axis_angle(float axis[3], float *angle, const float mat[4][4])
{
float q[4];
@@ -1279,7 +1279,7 @@ static void mat3_normalized_to_eul2(const float mat[3][3], float eul1[3], float
}
/* XYZ order */
-void mat3_normalized_to_eul(float eul[3], float mat[3][3])
+void mat3_normalized_to_eul(float eul[3], const float mat[3][3])
{
float eul1[3], eul2[3];
@@ -1293,7 +1293,7 @@ void mat3_normalized_to_eul(float eul[3], float mat[3][3])
copy_v3_v3(eul, eul1);
}
}
-void mat3_to_eul(float eul[3], float mat[3][3])
+void mat3_to_eul(float eul[3], const float mat[3][3])
{
float unit_mat[3][3];
normalize_m3_m3(unit_mat, mat);
@@ -1301,13 +1301,13 @@ void mat3_to_eul(float eul[3], float mat[3][3])
}
/* XYZ order */
-void mat4_normalized_to_eul(float eul[3], float m[4][4])
+void mat4_normalized_to_eul(float eul[3], const float m[4][4])
{
float mat3[3][3];
copy_m3_m4(mat3, m);
mat3_normalized_to_eul(eul, mat3);
}
-void mat4_to_eul(float eul[3], float m[4][4])
+void mat4_to_eul(float eul[3], const float m[4][4])
{
float mat3[3][3];
copy_m3_m4(mat3, m);
@@ -1576,7 +1576,7 @@ void eulO_to_mat3(float M[3][3], const float e[3], const short order)
}
/* returns two euler calculation methods, so we can pick the best */
-static void mat3_normalized_to_eulo2(float mat[3][3], float eul1[3], float eul2[3], const short order)
+static void mat3_normalized_to_eulo2(const float mat[3][3], float eul1[3], float eul2[3], const short order)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list