BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

math: remove contains_nan and is_finite

Browse Source
This commit is contained in:
Matvey Cherevko
2019-12-17 00:46:48 +07:00
parent e6578a4265
commit 36f516ab1c
49 changed files with 7 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
untests/sources/untests_math/_math.cpp
View File

@@ -313,28 +313,6 @@ TEST_CASE("math") {
REQUIRE(math::next_power_of_2(u32(8)) == u32(8));
REQUIRE(math::next_power_of_2(u32(9)) == u32(16));
}
{
REQUIRE(math::is_finite(0));
REQUIRE(math::is_finite(0u));
REQUIRE(math::is_finite(0.f));
REQUIRE(math::is_finite(1.f));
REQUIRE(math::is_finite(-1.f));
REQUIRE(math::is_finite(0.0));
REQUIRE(math::is_finite(1.0));
REQUIRE(math::is_finite(-1.0));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f32>::quiet_NaN()));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f32>::signaling_NaN()));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f32>::infinity()));
REQUIRE_FALSE(math::is_finite(-std::numeric_limits<f32>::infinity()));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f64>::quiet_NaN()));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f64>::signaling_NaN()));
REQUIRE_FALSE(math::is_finite(std::numeric_limits<f64>::infinity()));
REQUIRE_FALSE(math::is_finite(-std::numeric_limits<f64>::infinity()));
}
{
REQUIRE(math::abs(2) == 2);
REQUIRE(math::abs(3u) == 3u);

5
untests/sources/untests_math/aabb.cpp
View File

@@ -156,11 +156,6 @@ TEST_CASE("aabb") {
REQUIRE(math::overlaps(b3i(0,0,0,10,10,10), b3i(-9,0,0,10,10,10)));
REQUIRE(math::overlaps(b3i(0,0,0,10,10,10), b3i(0,-9,0,10,10,10)));
REQUIRE(math::overlaps(b3i(0,0,0,10,10,10), b3i(-9,-9,0,10,10,10)));
REQUIRE_FALSE(math::contains_nan(b3i(1,2,3,4,5,6)));
REQUIRE_FALSE(math::contains_nan(b3f(1.f,2.f,3.f,4.f,5.f,6.f)));
REQUIRE(math::contains_nan(b3f(1.f,2.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(b3f(std::numeric_limits<f32>::infinity(), 1.f,2.f)));
}
{
REQUIRE(math::normalized_to_point(b3f(10.f, 20.f, 30.f), v3f(0.f, 0.f, 0.f)) == v3f(0.f, 0.f, 0.f));

5
untests/sources/untests_math/rect.cpp
View File

@@ -172,11 +172,6 @@ TEST_CASE("rect") {
REQUIRE(math::overlaps(b2i(0,0,10,10), b2i(-9,0,10,10)));
REQUIRE(math::overlaps(b2i(0,0,10,10), b2i(0,-9,10,10)));
REQUIRE(math::overlaps(b2i(0,0,10,10), b2i(-9,-9,10,10)));
REQUIRE_FALSE(math::contains_nan(b2i(1,2,3,4)));
REQUIRE_FALSE(math::contains_nan(b2f(1.f,2.f,3.f,4.f)));
REQUIRE(math::contains_nan(b2f(1.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(b2f(std::numeric_limits<f32>::infinity(), 1.f)));
}
{
REQUIRE(math::normalized_to_point(b2f(10.f, 20.f), v2f(0.f, 0.f)) == v2f(0.f, 0.f));

4
untests/sources/untests_math/trs2.cpp
View File

@@ -108,9 +108,5 @@ TEST_CASE("trs2") {
math::make_translation_trs2(v2i{1,2}),
math::make_translation_trs2(v2i{1,4}),
1));
const f32 inf = std::numeric_limits<f32>::infinity();
REQUIRE(math::contains_nan(math::make_scale_trs2(v2f{inf, 0.f})));
REQUIRE_FALSE(math::contains_nan(math::make_scale_trs2(v2f{0.f, 0.f})));
}
}

4
untests/sources/untests_math/trs3.cpp
View File

@@ -107,9 +107,5 @@ TEST_CASE("trs3") {
math::make_translation_trs3(v3i{1,2,5}),
math::make_translation_trs3(v3i{1,4,5}),
1));
const f32 inf = std::numeric_limits<f32>::infinity();
REQUIRE(math::contains_nan(math::make_scale_trs3(v3f{1.f, inf, 0.f})));
REQUIRE_FALSE(math::contains_nan(math::make_scale_trs3(v3f{1.f, 0.f, 0.f})));
}
}

6
untests/sources/untests_math/vec2.cpp
View File

@@ -267,10 +267,4 @@ TEST_CASE("vec2") {
REQUIRE(math::inverse_lerp(v2f(1,2), v2f(10,20), v2f(5.5f,11)) == v2f(0.5f));
REQUIRE(math::inverse_lerp(v2f(1,2), v2f(10,20), v2f(5.5f,38)) == v2f(0.5f,2.f));
}
{
REQUIRE_FALSE(math::contains_nan(v2i(0,1)));
REQUIRE_FALSE(math::contains_nan(v2f(0.f,1.f)));
REQUIRE(math::contains_nan(v2f(0.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(v2f(std::numeric_limits<f32>::infinity(),1.f)));
}
}

7
untests/sources/untests_math/vec3.cpp
View File

@@ -290,11 +290,4 @@ TEST_CASE("vec3") {
REQUIRE(math::inverse_lerp(v3f(1,2,1), v3f(10,20,10), v3f(5.5f,11,5.5f)) == v3f(0.5f));
REQUIRE(math::inverse_lerp(v3f(1,2,1), v3f(10,20,10), v3f(5.5f,38,5.5f)) == v3f(0.5f,2.f,0.5f));
}
{
REQUIRE_FALSE(math::contains_nan(v3i(0,1,2)));
REQUIRE_FALSE(math::contains_nan(v3f(0.f,1.f,2.f)));
REQUIRE(math::contains_nan(v3f(0.f,1.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(v3f(std::numeric_limits<f32>::infinity(),1.f,2.f)));
REQUIRE(math::contains_nan(v3f(1.f,std::numeric_limits<f32>::infinity(),2.f)));
}
}

8
untests/sources/untests_math/vec4.cpp
View File

@@ -307,12 +307,4 @@ TEST_CASE("vec4") {
REQUIRE(math::inverse_lerp(v4f(1,2,1,2), v4f(10,20,10,20), v4f(5.5f,11,5.5f,11)) == v4f(0.5f));
REQUIRE(math::inverse_lerp(v4f(1,2,1,2), v4f(10,20,10,20), v4f(5.5f,38,5.5f,38)) == v4f(0.5f,2.f,0.5f,2.f));
}
{
REQUIRE_FALSE(math::contains_nan(v4i(0,1,2,3)));
REQUIRE_FALSE(math::contains_nan(v4f(0.f,1.f,2.f,3.f)));
REQUIRE(math::contains_nan(v4f(0.f,1.f,2.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(v4f(0.f,1.f,std::numeric_limits<f32>::quiet_NaN(),2.f)));
REQUIRE(math::contains_nan(v4f(std::numeric_limits<f32>::infinity(),1.f,2.f,3.f)));
REQUIRE(math::contains_nan(v4f(1.f,std::numeric_limits<f32>::infinity(),2.f,3.f)));
}
}

10
untests/sources/untests_utils/color.cpp
View File

@@ -120,16 +120,6 @@ TEST_CASE("color") {
REQUIRE(math::clamped(v0, color(6,5,4,3), color(9,9,9,9)) == color(6,5,5,6));
REQUIRE(math::clamped(v0, color(7,6,5,4), color(9,9,9,9)) == color(7,6,5,6));
}
{
{
REQUIRE_FALSE(math::contains_nan(color(0,1,2,3)));
REQUIRE_FALSE(math::contains_nan(color(0.f,1.f,2.f,3.f)));
REQUIRE(math::contains_nan(color(0.f,1.f,2.f,std::numeric_limits<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(color(0.f,1.f,std::numeric_limits<f32>::quiet_NaN(),2.f)));
REQUIRE(math::contains_nan(color(std::numeric_limits<f32>::infinity(),1.f,2.f,3.f)));
REQUIRE(math::contains_nan(color(1.f,std::numeric_limits<f32>::infinity(),2.f,3.f)));
}
}
{
REQUIRE(colors::pack_color(color(color32(1,2,3,4))) == 0x04010203);
REQUIRE(colors::pack_color(color(color32(0x12,0x34,0x56,0x78))) == 0x78123456);