diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-10 00:39:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-10 00:44:03 +0400 |
commit | 30dab51c29e863d3f605343f6308c71d0a6d3ce1 (patch) | |
tree | 5bb2f3ca81cff63ac0529277114bb373ebb5424a /source/blender/blenlib | |
parent | ad4980ce5e411e094bd2ccb67dfab4d1fa697a83 (diff) |
Cleanup: use bool and const args
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 19 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 28 |
2 files changed, 29 insertions, 18 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 81ca2908619..ba32b29becc 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -275,17 +275,22 @@ void map_to_sphere(float *r_u, float *r_v, const float x, const float y, const f /********************************** Normals **********************************/ -void accumulate_vertex_normals(float n1[3], float n2[3], float n3[3], - float n4[3], const float f_no[3], const float co1[3], const float co2[3], - const float co3[3], const float co4[3]); +void accumulate_vertex_normals( + float n1[3], float n2[3], float n3[3], float n4[3], + const float f_no[3], + const float co1[3], const float co2[3], const float co3[3], const float co4[3]); -void accumulate_vertex_normals_poly(float **vertnos, const float polyno[3], - const float **vertcos, float vdiffs[][3], const int nverts); +void accumulate_vertex_normals_poly( + float **vertnos, const float polyno[3], + const float **vertcos, float vdiffs[][3], const int nverts); /********************************* Tangents **********************************/ -void tangent_from_uv(float uv1[2], float uv2[2], float uv3[2], - float co1[3], float co2[3], float co3[3], float n[3], float tang[3]); +void tangent_from_uv( + const float uv1[2], const float uv2[2], const float uv3[2], + const float co1[3], const float co2[3], const float co3[3], + const float n[3], + float r_tang[3]); /******************************** Vector Clouds ******************************/ diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 496e5362cc4..da0855ad022 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -3231,9 +3231,10 @@ void map_to_sphere(float *r_u, float *r_v, const float x, const float y, const f /********************************* Normals **********************************/ -void accumulate_vertex_normals(float n1[3], float n2[3], float n3[3], - float n4[3], const float f_no[3], const float co1[3], const float co2[3], - const float co3[3], const float co4[3]) +void accumulate_vertex_normals( + float n1[3], float n2[3], float n3[3], float n4[3], + const float f_no[3], + const float co1[3], const float co2[3], const float co3[3], const float co4[3]) { float vdiffs[4][3]; const int nverts = (n4 != NULL && co4 != NULL) ? 4 : 3; @@ -3305,7 +3306,11 @@ void accumulate_vertex_normals_poly(float **vertnos, const float polyno[3], /********************************* Tangents **********************************/ -void tangent_from_uv(float uv1[2], float uv2[2], float uv3[3], float co1[3], float co2[3], float co3[3], float n[3], float tang[3]) +void tangent_from_uv( + const float uv1[2], const float uv2[2], const float uv3[3], + const float co1[3], const float co2[3], const float co3[3], + const float n[3], + float r_tang[3]) { const float s1 = uv2[0] - uv1[0]; const float s2 = uv3[0] - uv1[0]; @@ -3313,7 +3318,8 @@ void tangent_from_uv(float uv1[2], float uv2[2], float uv3[3], float co1[3], flo const float t2 = uv3[1] - uv1[1]; float det = (s1 * t2 - s2 * t1); - if (det != 0.0f) { /* otherwise 'tang' becomes nan */ + /* otherwise 'r_tang' becomes nan */ + if (det != 0.0f) { float tangv[3], ct[3], e1[3], e2[3]; det = 1.0f / det; @@ -3321,21 +3327,21 @@ void tangent_from_uv(float uv1[2], float uv2[2], float uv3[3], float co1[3], flo /* normals in render are inversed... */ sub_v3_v3v3(e1, co1, co2); sub_v3_v3v3(e2, co1, co3); - tang[0] = (t2 * e1[0] - t1 * e2[0]) * det; - tang[1] = (t2 * e1[1] - t1 * e2[1]) * det; - tang[2] = (t2 * e1[2] - t1 * e2[2]) * det; + r_tang[0] = (t2 * e1[0] - t1 * e2[0]) * det; + r_tang[1] = (t2 * e1[1] - t1 * e2[1]) * det; + r_tang[2] = (t2 * e1[2] - t1 * e2[2]) * det; tangv[0] = (s1 * e2[0] - s2 * e1[0]) * det; tangv[1] = (s1 * e2[1] - s2 * e1[1]) * det; tangv[2] = (s1 * e2[2] - s2 * e1[2]) * det; - cross_v3_v3v3(ct, tang, tangv); + cross_v3_v3v3(ct, r_tang, tangv); /* check flip */ if (dot_v3v3(ct, n) < 0.0f) { - negate_v3(tang); + negate_v3(r_tang); } } else { - tang[0] = tang[1] = tang[2] = 0.0f; + zero_v3(r_tang); } } |