diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 21:47:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 21:47:10 +0400 |
commit | ca4ef8aa263a356a0e900ba81af4ff7e4207ddb9 (patch) | |
tree | ac2c3ce9f9a4a3d1ebf345738c982710866237e6 /source | |
parent | 2fce23c99a91590e810d74294f16ad210f9cb896 (diff) |
add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/intern/math_vector.c | 8 | ||||
-rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c index 47deb705def..ce9896b99cc 100644 --- a/source/blender/blenlib/intern/math_vector.c +++ b/source/blender/blenlib/intern/math_vector.c @@ -112,8 +112,12 @@ void mid_v3_v3v3(float v[3], const float v1[3], const float v2[3]) /********************************** Angles ***********************************/ /* Return the angle in radians between vecs 1-2 and 2-3 in radians - If v1 is a shoulder, v2 is the elbow and v3 is the hand, - this would return the angle at the elbow */ + * If v1 is a shoulder, v2 is the elbow and v3 is the hand, + * this would return the angle at the elbow. + * + * note that when v1/v2/v3 represent 3 points along a straight line + * that the angle returned will be pi (180deg), rather then 0.0 + */ float angle_v3v3v3(const float v1[3], const float v2[3], const float v3[3]) { float vec1[3], vec2[3]; diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 319b2c755b1..005f5f6da95 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -181,9 +181,9 @@ static void laplacian_triangle_area(LaplacianSystem *sys, int i1, int i2, int i3 t2= cotan_weight(v2, v3, v1); t3= cotan_weight(v3, v1, v2); - if(RAD2DEGF(angle_v3v3v3(v2, v1, v3)) > 90) obtuse= 1; - else if(RAD2DEGF(angle_v3v3v3(v1, v2, v3)) > 90) obtuse= 2; - else if(RAD2DEGF(angle_v3v3v3(v1, v3, v2)) > 90) obtuse= 3; + if (angle_v3v3v3(v2, v1, v3) > DEG2RADF(90.0f)) obtuse= 1; + else if(angle_v3v3v3(v1, v2, v3) > DEG2RADF(90.0f)) obtuse= 2; + else if(angle_v3v3v3(v1, v3, v2) > DEG2RADF(90.0f)) obtuse= 3; if (obtuse > 0) { area= area_tri_v3(v1, v2, v3); |