diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
commit | 9892736206676c5b7fabc8d1184f9655511ff2dd (patch) | |
tree | 83562ac50c93fe3004959d35c1af4a5b380fdd97 /source/blender/blenlib/BLI_math_rotation.h | |
parent | cffaa42d3a34c6b310c3c87c98e1f8313881e473 (diff) |
code cleanup: header cleanup and remove some duplicate defines.
Diffstat (limited to 'source/blender/blenlib/BLI_math_rotation.h')
-rw-r--r-- | source/blender/blenlib/BLI_math_rotation.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index 62b81530c65..912534e0aca 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -34,12 +34,12 @@ extern "C" { #endif -#define RAD2DEG(_rad) ((_rad)*(180.0/M_PI)) -#define DEG2RAD(_deg) ((_deg)*(M_PI/180.0)) +#define RAD2DEG(_rad) ((_rad) * (180.0 / M_PI)) +#define DEG2RAD(_deg) ((_deg) * (M_PI / 180.0)) -#define RAD2DEGF(_rad) ((_rad)*(float)(180.0/M_PI)) -#define DEG2RADF(_deg) ((_deg)*(float)(M_PI/180.0)) +#define RAD2DEGF(_rad) ((_rad) * (float)(180.0 / M_PI)) +#define DEG2RADF(_deg) ((_deg) * (float)(M_PI / 180.0)) /******************************** Quaternions ********************************/ /* stored in (w, x, y, z) order */ @@ -171,10 +171,10 @@ typedef struct DualQuat { void copy_dq_dq(DualQuat *r, DualQuat *dq); void normalize_dq(DualQuat *dq, float totw); void add_weighted_dq_dq(DualQuat *r, DualQuat *dq, float weight); -void mul_v3m3_dq(float r[3], float R[3][3], DualQuat *dq); +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 dquat_to_mat4(float R[4][4], DualQuat *dq); +void mat4_to_dquat(DualQuat * r, float base[4][4], float M[4][4]); +void dquat_to_mat4(float R[4][4], DualQuat * dq); void quat_apply_track(float quat[4], short axis, short upflag); void vec_apply_track(float vec[3], short axis); |