diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-23 18:37:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-23 18:37:22 +0400 |
commit | 09ff49755fc84a0dd4214099a0dd47facba83288 (patch) | |
tree | e317ad76b20daf06484a4e76004030cf0a5fc921 /source/blender/blenlib/intern | |
parent | 01e22d1b9f3606d97f06c2d8a2bc969214322e9c (diff) |
math api edits - replace point-normal form for a plane with dist_to_plane_v3()
also correct python mathutils api, was missing vector checks.
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 2b5b0c5d0d2..1bf7b1f6a9a 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -321,25 +321,17 @@ void closest_to_plane_v3(float close_r[3], const float plane[4], const float pt[ madd_v3_v3v3fl(close_r, pt, plane, -side / length); } -/* signed distance from the point to the plane in 3D */ -float dist_to_plane_normalized_v3(const float p[3], const float plane_co[3], const float plane_no_unit[3]) +float dist_to_plane_v3(const float pt[3], const float plane[4]) { - float plane_co_other[3]; + float close[3]; - add_v3_v3v3(plane_co_other, plane_co, plane_no_unit); - - return line_point_factor_v3(p, plane_co, plane_co_other); -} - -float dist_to_plane_v3(const float p[3], const float plane_co[3], const float plane_no[3]) -{ - float plane_no_unit[3]; - float plane_co_other[3]; - - normalize_v3_v3(plane_no_unit, plane_no); - add_v3_v3v3(plane_co_other, plane_co, plane_no_unit); + /* same logic as closest_to_plane_v3() */ + const float length = len_squared_v3(plane); + const float side = plane_point_side_v3(plane, pt); + madd_v3_v3v3fl(close, pt, plane, -side / length); + /* end same logic */ - return line_point_factor_v3(p, plane_co, plane_co_other); + return copysign(len_v3v3(pt, close), side); } /* distance v1 to line-piece l1-l2 in 3D */ |