diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-16 14:50:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-16 14:50:11 +0300 |
| commit | 6cd3ebfc9fa4838a74192f2e5cc82b5d5d2e6fe7 (patch) | |
| tree | 546c8e187f3b5185f019153ee083fa246b698436 /source/blender/blenlib/BLI_math_base.h | |
| parent | 97a50e78ca88b4ffe180bc6567e5ed0358239efe (diff) | |
| parent | 5684ad80723454f0d910aad3fa48240da19c4e3b (diff) | |
Merge branch 'master' into alembic_pointcache
Conflicts:
release/scripts/addons
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_util.c
Diffstat (limited to 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 5711d09b530..2bc23c8a72d 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -48,13 +48,16 @@ #define M_PI_2 1.57079632679489661923 #endif #ifndef M_SQRT2 -#define M_SQRT2 1.41421356237309504880 +#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ #endif #ifndef M_SQRT1_2 -#define M_SQRT1_2 0.70710678118654752440 +#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ #endif #ifndef M_SQRT3 -#define M_SQRT3 1.7320508075688772 +#define M_SQRT3 1.73205080756887729352 /* sqrt(3) */ +#endif +#ifndef M_SQRT1_3 +#define M_SQRT1_3 0.57735026918962576450 /* 1/sqrt(3) */ #endif #ifndef M_1_PI #define M_1_PI 0.318309886183790671538 @@ -191,6 +194,8 @@ MINLINE int min_iiii(int a, int b, int c, int d); MINLINE int max_iiii(int a, int b, int c, int d); MINLINE float signf(float f); +MINLINE int signum_i_ex(float a, float eps); +MINLINE int signum_i(float a); MINLINE float power_of_2(float f); |