blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: Rename 'isect_ray_seg_v3' to 'isect_ray_line_v3' 

The name was misleading as it returns true whenever it intersects the
line represented by the points.
This commit is contained in:
Germano Cavalcante 2020-07-24 12:07:58 -03:00
parent c64b12c0b8
commit d7c4e96493
Notes: blender-bot 2023-02-14 11:28:39 +01:00 
Referenced by issue #79258, Eevee: Exposure triggers viewport update
Referenced by issue #78307, Drawing artifacts in the Blender UI on macOS
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/BLI_math_geom.h
View File

@ -454,11 +454,11 @@ bool isect_ray_seg_v2(const float ray_origin[2],
float *r_lambda,
float *r_u);
bool isect_ray_seg_v3(const float ray_origin[3],
const float ray_direction[3],
const float v0[3],
const float v1[3],
float *r_lambda);
bool isect_ray_line_v3(const float ray_origin[3],
const float ray_direction[3],
const float v0[3],
const float v1[3],
float *r_lambda);
/* point in polygon */
bool isect_point_poly_v2(const float pt[2],

12
source/blender/blenlib/intern/math_geom.c
View File

@ -630,7 +630,7 @@ float dist_squared_ray_to_seg_v3(const float ray_origin[3],
float *r_depth)
{
float lambda, depth;
if (isect_ray_seg_v3(ray_origin, ray_direction, v0, v1, &lambda)) {
if (isect_ray_line_v3(ray_origin, ray_direction, v0, v1, &lambda)) {
if (lambda <= 0.0f) {
copy_v3_v3(r_point, v0);
}
@ -2129,11 +2129,11 @@ bool isect_ray_seg_v2(const float ray_origin[2],
return false;
}
bool isect_ray_seg_v3(const float ray_origin[3],
const float ray_direction[3],
const float v0[3],
const float v1[3],
float *r_lambda)
bool isect_ray_line_v3(const float ray_origin[3],
const float ray_direction[3],
const float v0[3],
const float v1[3],
float *r_lambda)
{
float a[3], t[3], n[3];
sub_v3_v3v3(a, v1, v0);

12
source/blender/editors/transform/transform_snap_object.c
View File

@ -1276,7 +1276,7 @@ static bool test_projected_edge_dist(const struct DistProjectedAABBPrecalc *prec
float r_co[3])
{
float near_co[3], lambda;
if (!isect_ray_seg_v3(precalc->ray_origin, precalc->ray_direction, va, vb, &lambda)) {
if (!isect_ray_line_v3(precalc->ray_origin, precalc->ray_direction, va, vb, &lambda)) {
copy_v3_v3(near_co, va);
}
else {
@ -1668,11 +1668,11 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx,
};
float lambda;
if (!isect_ray_seg_v3(neasrest_precalc.ray_origin,
neasrest_precalc.ray_direction,
v_pair[0],
v_pair[1],
&lambda)) {
if (!isect_ray_line_v3(neasrest_precalc.ray_origin,
neasrest_precalc.ray_direction,
v_pair[0],
v_pair[1],
&lambda)) {
/* do nothing */
}
else {