[Bf-blender-cvs] [8ed7466] master: Remove redundant abs ray/line point functions
Campbell Barton
noreply at git.blender.org
Thu Apr 14 05:04:55 CEST 2016
Commit: 8ed746683a312057c1c3e469ab41d7b1f017d257
Author: Campbell Barton
Date: Thu Apr 14 13:00:53 2016 +1000
Branches: master
https://developer.blender.org/rB8ed746683a312057c1c3e469ab41d7b1f017d257
Remove redundant abs ray/line point functions
===================================================================
M source/blender/blenlib/intern/math_geom.c
===================================================================
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 49b5269..f80099b 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -2512,8 +2512,8 @@ float ray_point_factor_v3_ex(
{
float p_relative[3];
sub_v3_v3v3(p_relative, p, ray_origin);
- const float dot = dot_v3v3(ray_direction, ray_direction);
- return (fabsf(dot) > epsilon) ? (dot_v3v3(ray_direction, p_relative) / dot) : fallback;
+ const float dot = len_squared_v3(ray_direction);
+ return (dot > epsilon) ? (dot_v3v3(ray_direction, p_relative) / dot) : fallback;
}
float ray_point_factor_v3(
@@ -2541,8 +2541,8 @@ float line_point_factor_v3_ex(
return (dot_v3v3(u, h) / dot_v3v3(u, u));
#else
/* better check for zero */
- dot = dot_v3v3(u, u);
- return (fabsf(dot) > epsilon) ? (dot_v3v3(u, h) / dot) : fallback;
+ dot = len_squared_v3(u);
+ return (dot > epsilon) ? (dot_v3v3(u, h) / dot) : fallback;
#endif
}
float line_point_factor_v3(
@@ -2563,8 +2563,8 @@ float line_point_factor_v2_ex(
return (dot_v2v2(u, h) / dot_v2v2(u, u));
#else
/* better check for zero */
- dot = dot_v2v2(u, u);
- return (fabsf(dot) > epsilon) ? (dot_v2v2(u, h) / dot) : fallback;
+ dot = len_squared_v2(u);
+ return (dot > epsilon) ? (dot_v2v2(u, h) / dot) : fallback;
#endif
}
More information about the Bf-blender-cvs
mailing list