blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix: Debug build error with vector type division 

The idea is to keep `is_any_zero` in the `blender::math` namespace,
so instead of trying to be clever, just move it there and expand the
function where it was used in the class.
This commit is contained in:
Hans Goudey 2022-02-17 12:36:41 -06:00
parent b6fe1b0c65
commit 48432c1c92
3 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenlib/BLI_math_vec_types.hh
View File

@ -64,16 +64,6 @@ template<typename T> uint64_t vector_hash(const T &vec)
return result;
}
template<typename T, int Size> inline bool is_any_zero(const vec_struct_base<T, Size> &a)
{
for (int i = 0; i < Size; i++) {
if (a[i] == T(0)) {
return true;
}
}
return false;
}
} // namespace math
template<typename T, int Size> struct vec_base : public vec_struct_base<T, Size> {
@ -353,7 +343,9 @@ template<typename T, int Size> struct vec_base : public vec_struct_base<T, Size>
friend vec_base operator/(const vec_base &a, const vec_base &b)
{
BLI_assert(!math::is_any_zero(b));
for (int i = 0; i < Size; i++) {
BLI_assert(b[i] != T(0));
}
BLI_VEC_OP_IMPL(ret, i, ret[i] = a[i] / b[i]);
}
@ -365,7 +357,9 @@ template<typename T, int Size> struct vec_base : public vec_struct_base<T, Size>
friend vec_base operator/(T a, const vec_base &b)
{
BLI_assert(!math::is_any_zero(b));
for (int i = 0; i < Size; i++) {
BLI_assert(b[i] != T(0));
}
BLI_VEC_OP_IMPL(ret, i, ret[i] = a / b[i]);
}
@ -509,7 +503,9 @@ template<typename T, int Size> struct vec_base : public vec_struct_base<T, Size>
BLI_INT_OP(T) friend vec_base operator%(const vec_base &a, const vec_base &b)
{
BLI_assert(!math::is_any_zero(b));
for (int i = 0; i < Size; i++) {
BLI_assert(b[i] != T(0));
}
BLI_VEC_OP_IMPL(ret, i, ret[i] = a[i] % b[i]);
}

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

@ -39,6 +39,16 @@ template<typename T, int Size> inline bool is_zero(const vec_base<T, Size> &a)
return true;
}
template<typename T, int Size> inline bool is_any_zero(const vec_base<T, Size> &a)
{
for (int i = 0; i < Size; i++) {
if (a[i] == T(0)) {
return true;
}
}
return false;
}
template<typename T, int Size> inline vec_base<T, Size> abs(const vec_base<T, Size> &a)
{
vec_base<T, Size> result;

25
source/blender/blenlib/tests/BLI_math_vec_types_test.cc
View File

@ -146,4 +146,29 @@ TEST(math_vec_types, VectorTypeConversion)
EXPECT_EQ(d[1], -1.0);
}
TEST(math_vec_types, Divide)
{
float2 a(1.0f, 2.0f);
float2 b(0.5f, 2.0f);
float2 result = a / b;
EXPECT_FLOAT_EQ(result.x, 2.0f);
EXPECT_FLOAT_EQ(result.y, 1.0f);
}
TEST(math_vec_types, DivideFloatByVector)
{
float a = 2.0f;
float2 b(0.5f, 2.0f);
float2 result = a / b;
EXPECT_FLOAT_EQ(result.x, 4.0f);
EXPECT_FLOAT_EQ(result.y, 1.0f);
}
TEST(math_vec_types, DivideFloatByVectorSmall)
{
float2 result = 2.0f / float2(2.0f);
EXPECT_FLOAT_EQ(result.x, 1.0f);
EXPECT_FLOAT_EQ(result.y, 1.0f);
}
} // namespace blender::tests