diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-12-15 10:14:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-15 10:16:41 +0300 |
commit | fa3fe2ee102afeb3d1fdc613f2207bbbe38d92bb (patch) | |
tree | 155322b1ffbe57745571b696904225793541b19e /source/blender/blenlib/BLI_math_geom.h | |
parent | a7c7ae5bf76f9b9036289fa38c2c2ad11f5e2986 (diff) |
Cleanup: math lib naming
Distinguish between line / line_segment
Diffstat (limited to 'source/blender/blenlib/BLI_math_geom.h')
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 9f8f010d586..d8e2b7f5e4c 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -186,8 +186,9 @@ bool isect_ray_plane_v3( float *r_lambda, const bool clip); bool isect_point_planes_v3(float (*planes)[4], int totplane, const float p[3]); -bool isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], - const float plane_co[3], const float plane_no[3]) ATTR_WARN_UNUSED_RESULT; +bool isect_line_plane_v3( + float r_isect_co[3], const float l1[3], const float l2[3], + const float plane_co[3], const float plane_no[3]) ATTR_WARN_UNUSED_RESULT; bool isect_plane_plane_plane_v3( const float plane_a[4], const float plane_b[4], const float plane_c[4], @@ -197,14 +198,18 @@ bool isect_plane_plane_v3( float r_isect_co[3], float r_isect_no[3]) ATTR_WARN_UNUSED_RESULT; /* line/ray triangle */ -bool isect_line_tri_v3( +bool isect_line_segment_tri_v3( const float p1[3], const float p2[3], const float v0[3], const float v1[3], const float v2[3], float *r_lambda, float r_uv[2]); -bool isect_line_tri_epsilon_v3( +bool isect_line_segment_tri_epsilon_v3( const float p1[3], const float p2[3], const float v0[3], const float v1[3], const float v2[3], float *r_lambda, float r_uv[2], const float epsilon); +bool isect_axial_line_segment_tri_v3( + const int axis, const float p1[3], const float p2[3], + const float v0[3], const float v1[3], const float v2[3], float *r_lambda); + bool isect_ray_tri_v3( const float ray_origin[3], const float ray_direction[3], const float v0[3], const float v1[3], const float v2[3], @@ -279,9 +284,6 @@ bool isect_ray_aabb(const IsectRayAABBData *data, const float bb_min[3], const f bool isect_sweeping_sphere_tri_v3(const float p1[3], const float p2[3], const float radius, const float v0[3], const float v1[3], const float v2[3], float *r_lambda, float ipoint[3]); -bool isect_axial_line_tri_v3(const int axis, const float co1[3], const float co2[3], - const float v0[3], const float v1[3], const float v2[3], float *r_lambda); - bool clip_segment_v3_plane(float p1[3], float p2[3], const float plane[4]); bool clip_segment_v3_plane_n(float p1[3], float p2[3], float plane_array[][4], const int plane_tot); |