archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Math Lib: add constant: M_SQRT1_3 1/sqrt(3)

Browse Source
This commit is contained in:
Campbell Barton
2014-11-22 18:11:46 +01:00
parent 789eaa0f5b
commit 25c5542fe7
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenlib/BLI_math_base.h
View File

@@ -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

4
source/blender/blenlib/intern/math_matrix.c
View File

@@ -1448,7 +1448,7 @@ float mat3_to_scale(float mat[3][3])
{
/* unit length vector */
float unit_vec[3];
copy_v3_fl(unit_vec, (float)(1.0 / M_SQRT3));
copy_v3_fl(unit_vec, (float)M_SQRT1_3);
mul_m3_v3(mat, unit_vec);
return len_v3(unit_vec);
}
@@ -1457,7 +1457,7 @@ float mat4_to_scale(float mat[4][4])
{
/* unit length vector */
float unit_vec[3];
copy_v3_fl(unit_vec, (float)(1.0 / M_SQRT3));
copy_v3_fl(unit_vec, (float)M_SQRT1_3);
mul_mat3_m4_v3(mat, unit_vec);
return len_v3(unit_vec);
}

7
source/blender/bmesh/tools/bmesh_bevel.c
View File

@@ -2229,7 +2229,6 @@ static VMesh *make_cube_corner_adj_vmesh(BevelParams *bp)
BoundVert *bndv;
int i, j, k, ns2;
float co[3], coc[3];
float w;
if (r == PRO_SQUARE_R)
return make_cube_corner_straight(mem_arena, nseg);
@@ -2262,10 +2261,8 @@ static VMesh *make_cube_corner_adj_vmesh(BevelParams *bp)
bndv = bndv->next;
}
/* center vertex */
w = (float)(1.0 / M_SQRT3);
co[0] = w;
co[1] = w;
co[2] = w;
copy_v3_fl(co, M_SQRT1_3);
if (nseg > 2) {
if (r > 1.5f)
mul_v3_fl(co, 1.4f);