diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 18:52:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 18:52:16 +0400 |
commit | 8d7c3f8a7e6de7625b3631cd91242fbefa98cf3a (patch) | |
tree | e839ba73dfdff4795060b63fa88c1fdecdf03b73 /source/blender/blenlib | |
parent | 0b9f67061ce34e6147a013cc7025bb194c4e693e (diff) |
interface: floats were being implicitly promoted to doubles, adjust to use floats (in most cases) otherwise cast to double.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_rotation.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index 11849e0be6d..0385ad5846f 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -39,6 +39,10 @@ extern "C" { #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)) + /******************************** Quaternions ********************************/ /* stored in (w, x, y, z) order */ diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 55f227f0284..bee5c031fc9 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -125,6 +125,7 @@ #define CLAMPTEST(a, b, c) if((b)<(c)) {CLAMP(a, b, c);} else {CLAMP(a, c, b);} #define IS_EQ(a,b) ((fabs((double)(a)-(b)) >= (double) FLT_EPSILON) ? 0 : 1) +#define IS_EQF(a,b) ((fabsf((float)(a)-(b)) >= (float) FLT_EPSILON) ? 0 : 1) #define IS_EQT(a, b, c) ((a > b)? (((a-b) <= c)? 1:0) : ((((b-a) <= c)? 1:0))) #define IN_RANGE(a, b, c) ((b < c)? ((b<a && a<c)? 1:0) : ((c<a && a<b)? 1:0)) |