diff options
author | Himanshi Kalra <calra> | 2021-08-23 22:19:36 +0300 |
---|---|---|
committer | Himanshi Kalra <himanshikalra98@gmail.com> | 2021-08-23 22:20:03 +0300 |
commit | 875c2ea5b5ee8425c3bc969dbaba3fab3ecbaab4 (patch) | |
tree | 94d45e8fb3d508e77aa177d253c39186b9863e30 /source/blender/blenlib | |
parent | be1891e895c012b36ca574a90b5d90fc1433152e (diff) |
Using relative threshold for floats in mesh comparison
Changes the threshold comparison from absolute to relative.
Removes threshold for MLoopCol comparison.
Adds a compare relative threshold function.
Reviewed By: JacquesLucke
Differential Revision: https://developer.blender.org/D12273
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index dbdd28766a5..9b54f780296 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -172,6 +172,9 @@ MINLINE size_t clamp_z(size_t value, size_t min, size_t max); MINLINE int compare_ff(float a, float b, const float max_diff); MINLINE int compare_ff_relative(float a, float b, const float max_diff, const int max_ulps); +MINLINE bool compare_threshold_relative(const float value1, + const float value2, + const float thresh); MINLINE float signf(float f); MINLINE int signum_i_ex(float a, float eps); diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index 983fd3b6543..49f9faf1704 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -656,6 +656,18 @@ MINLINE int compare_ff_relative(float a, float b, const float max_diff, const in return ((ua.i < 0) != (ub.i < 0)) ? 0 : (abs(ua.i - ub.i) <= max_ulps) ? 1 : 0; } +MINLINE bool compare_threshold_relative(const float value1, const float value2, const float thresh) +{ + const float abs_diff = fabsf(value1 - value2); + /* Avoid letting the threshold get too small just because the values happen to be close to zero. + */ + if (fabsf(value2) < 1) { + return abs_diff > thresh; + } + /* Using relative threshold in general. */ + return abs_diff > thresh * fabsf(value2); +} + MINLINE float signf(float f) { return (f < 0.0f) ? -1.0f : 1.0f; |