archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Germano Cavalcante
2017-09-19 13:59:37 -03:00
parent e2e8f4b9e1 98ea79cfde
commit 869f0a840f
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1069,36 +1069,20 @@ static float dist_squared_to_projected_aabb(
main_axis += 3;
}
/* if rtmin < rtmax, ray intersect `AABB` */
if (rtmin <= rtmax) {
#define IGNORE_BEHIND_RAY
#ifdef IGNORE_BEHIND_RAY
/* `if rtmax < depth_min`, the hit is behind us */
if (rtmax < data->ray_min_dist) {
/* Test if the entire AABB is behind us */
float depth = depth_get(
local_bvmax, data->ray_origin_local, data->ray_direction_local);
if (depth < (data->ray_min_dist)) {
return FLT_MAX;
}
}
#endif
const float proj = rtmin * data->ray_direction_local[main_axis];
r_axis_closest[main_axis] = (proj - va[main_axis]) < (vb[main_axis] - proj);
return 0.0f;
}
#ifdef IGNORE_BEHIND_RAY
/* `if rtmin < depth_min`, the hit is behing us */
else if (rtmin < data->ray_min_dist) {
/* Test if the entire AABB is behind us */
float depth = depth_get(
local_bvmax, data->ray_origin_local, data->ray_direction_local);
if (depth < (data->ray_min_dist)) {
return FLT_MAX;
}
float depth_max = depth_get(local_bvmax, data->ray_origin_local, data->ray_direction_local);
if (depth_max < data->ray_min_dist) {
return FLT_MAX;
}
#endif
#undef IGNORE_BEHIND_RAY
/* if rtmin <= rtmax, ray intersect `AABB` */
if (rtmin <= rtmax) {
return 0;
}
if (data->sign[main_axis]) {
va[main_axis] = local_bvmax[main_axis];
vb[main_axis] = local_bvmin[main_axis];