blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Math Lib: increase epsilon for ortho_basis_v3v3_v3 

passing in a unit length vector wouldn't always compute unit length vectors because the epsilon tested was too small.
This commit is contained in:
Campbell Barton 2014-04-16 17:24:27 +10:00
parent d050577176
commit 233dac1494
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_math_vector.h
View File

@ -261,7 +261,7 @@ void project_v2_v2v2(float c[2], const float v1[2], const float v2[2]);
void project_v3_v3v3(float r[3], const float p[3], const float n[3]);
void project_v3_plane(float v[3], const float n[3], const float p[3]);
void reflect_v3_v3v3(float r[3], const float v[3], const float n[3]);
void ortho_basis_v3v3_v3(float r1[3], float r2[3], const float a[3]);
void ortho_basis_v3v3_v3(float r_n1[3], float r_n2[3], const float n[3]);
void ortho_v3_v3(float p[3], const float v[3]);
void ortho_v2_v2(float p[3], const float v[3]);
void bisect_v3_v3v3v3(float r[3], const float a[3], const float b[3], const float c[3]);

38
source/blender/blenlib/intern/math_vector.c
View File

@ -583,25 +583,33 @@ void reflect_v3_v3v3(float out[3], const float vec[3], const float normal[3])
out[2] = vec[2] - (dot2 * normal[2]);
}
void ortho_basis_v3v3_v3(float v1[3], float v2[3], const float v[3])
/**
* Takes a vector and computes 2 orthogonal directions.
*
* \note if \a n is n unit length, computed values will be too.
*/
void ortho_basis_v3v3_v3(float r_n1[3], float r_n2[3], const float n[3])
{
const float f = sqrtf(v[0] * v[0] + v[1] * v[1]);
const float eps = FLT_EPSILON;
const float f = len_squared_v2(n);
if (f < 1e-35f) {
// degenerate case
v1[0] = (v[2] < 0.0f) ? -1.0f : 1.0f;
v1[1] = v1[2] = v2[0] = v2[2] = 0.0f;
v2[1] = 1.0f;
if (f > eps) {
const float d = 1.0f / sqrtf(f);
BLI_assert(finite(d));
r_n1[0] = n[1] * d;
r_n1[1] = -n[0] * d;
r_n1[2] = 0.0f;
r_n2[0] = -n[2] * r_n1[1];
r_n2[1] = n[2] * r_n1[0];
r_n2[2] = n[0] * r_n1[1] - n[1] * r_n1[0];
}
else {
const float d = 1.0f / f;
v1[0] = v[1] * d;
v1[1] = -v[0] * d;
v1[2] = 0.0f;
v2[0] = -v[2] * v1[1];
v2[1] = v[2] * v1[0];
v2[2] = v[0] * v1[1] - v[1] * v1[0];
/* degenerate case */
r_n1[0] = (n[2] < 0.0f) ? -1.0f : 1.0f;
r_n1[1] = r_n1[2] = r_n2[0] = r_n2[2] = 0.0f;
r_n2[1] = 1.0f;
}
}