blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix: BLI math clamp doesn't work 

Return type was wrong, output of std::clamp wasn't used.
This commit is contained in:
Hans Goudey 2022-03-02 17:09:17 -05:00
parent ecba8c1243
commit 2600806c2e
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/BLI_math_vector.hh
View File

@ -79,13 +79,13 @@ inline vec_base<T, Size> max(const vec_base<T, Size> &a, const vec_base<T, Size>
}
template<typename T, int Size>
inline T clamp(const vec_base<T, Size> &a,
const vec_base<T, Size> &min,
const vec_base<T, Size> &max)
inline vec_base<T, Size> clamp(const vec_base<T, Size> &a,
const vec_base<T, Size> &min,
const vec_base<T, Size> &max)
{
vec_base<T, Size> result = a;
for (int i = 0; i < Size; i++) {
std::clamp(result[i], min[i], max[i]);
result[i] = std::clamp(result[i], min[i], max[i]);
}
return result;
}
@ -95,7 +95,7 @@ inline vec_base<T, Size> clamp(const vec_base<T, Size> &a, const T &min, const T
{
vec_base<T, Size> result = a;
for (int i = 0; i < Size; i++) {
std::clamp(result[i], min, max);
result[i] = std::clamp(result[i], min, max);
}
return result;
}

23
source/blender/blenlib/tests/BLI_math_vector_test.cc
View File

@ -4,6 +4,10 @@
#include "BLI_math.h"
#include "BLI_math_vector.hh"
namespace blender::tests {
TEST(math_vector, ClampVecWithFloats)
{
const float min = 0.0f;
@ -63,3 +67,22 @@ TEST(math_vector, test_invert_v3_safe)
EXPECT_FLOAT_EQ(inverted_unsafe[1], v3_without_zeroes[1]);
EXPECT_FLOAT_EQ(inverted_unsafe[2], v3_without_zeroes[2]);
}
TEST(math_vector, Clamp)
{
const int3 value(0, 100, -100);
const int3 min(5, 40, -95);
const int3 max(7, 45, 5);
const int3 result = math::clamp(value, min, max);
EXPECT_EQ(result.x, 5);
EXPECT_EQ(result.y, 45);
EXPECT_EQ(result.z, -95);
const int3 result_2 = math::clamp(value, -50, 50);
EXPECT_EQ(result_2.x, 0);
EXPECT_EQ(result_2.y, 50);
EXPECT_EQ(result_2.z, -50);
}
} // namespace blender::tests