From 19215bf1c52f1289faf9020bc3a95dfdbc229354 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Mon, 13 Jan 2020 15:45:52 +0700 Subject: [PATCH] fixes after master merge --- headers/enduro2d/math/ray2.hpp | 12 +----------- headers/enduro2d/math/ray3.hpp | 10 ---------- samples/bin/library/scripts/emmy/math/ray2.lua | 4 ---- samples/bin/library/scripts/emmy/math/ray3.lua | 4 ---- .../enduro2d/high/bindings/math_binds/ray2_binds.cpp | 4 +--- .../enduro2d/high/bindings/math_binds/ray3_binds.cpp | 4 +--- untests/sources/untests_math/ray2.cpp | 6 ------ untests/sources/untests_math/ray3.cpp | 6 ------ 8 files changed, 3 insertions(+), 47 deletions(-) diff --git a/headers/enduro2d/math/ray2.hpp b/headers/enduro2d/math/ray2.hpp index 1cc4ab7c..8621887f 100644 --- a/headers/enduro2d/math/ray2.hpp +++ b/headers/enduro2d/math/ray2.hpp @@ -182,7 +182,7 @@ namespace e2d constexpr ray2 make_ray2(T dx, T dy) noexcept { return {dx, dy}; } - + template < typename T > constexpr ray2 make_ray2(T ox, T oy, T dx, T dy) noexcept { return {ox, oy, dx, dy}; @@ -293,14 +293,4 @@ namespace e2d::math return math::approximately(l.origin, r.origin, precision) && math::approximately(l.direction, r.direction, precision); } - - // - // contains_nan - // - - template < typename T > - bool contains_nan(const ray2& r) noexcept { - return math::contains_nan(r.origin) - || math::contains_nan(r.direction); - } } diff --git a/headers/enduro2d/math/ray3.hpp b/headers/enduro2d/math/ray3.hpp index 2684fc3e..85487a09 100644 --- a/headers/enduro2d/math/ray3.hpp +++ b/headers/enduro2d/math/ray3.hpp @@ -299,14 +299,4 @@ namespace e2d::math return math::approximately(l.origin, r.origin, precision) && math::approximately(l.direction, r.direction, precision); } - - // - // contains_nan - // - - template < typename T > - bool contains_nan(const ray3& r) noexcept { - return math::contains_nan(r.origin) - || math::contains_nan(r.direction); - } } diff --git a/samples/bin/library/scripts/emmy/math/ray2.lua b/samples/bin/library/scripts/emmy/math/ray2.lua index 6f197255..15f6b911 100644 --- a/samples/bin/library/scripts/emmy/math/ray2.lua +++ b/samples/bin/library/scripts/emmy/math/ray2.lua @@ -30,9 +30,5 @@ function ray2.unit_y() end ---@return boolean function ray2.approximately(l, r) end ----@param r ray2 ----@return boolean -function ray2.contains_nan(r) end - ---@type ray2 _G.ray2 = _G.ray2 or ray2 diff --git a/samples/bin/library/scripts/emmy/math/ray3.lua b/samples/bin/library/scripts/emmy/math/ray3.lua index b13ddc26..da2cb0bd 100644 --- a/samples/bin/library/scripts/emmy/math/ray3.lua +++ b/samples/bin/library/scripts/emmy/math/ray3.lua @@ -33,9 +33,5 @@ function ray3.unit_z() end ---@return boolean function ray3.approximately(l, r) end ----@param r ray3 ----@return boolean -function ray3.contains_nan(r) end - ---@type ray3 _G.ray3 = _G.ray3 or ray3 diff --git a/sources/enduro2d/high/bindings/math_binds/ray2_binds.cpp b/sources/enduro2d/high/bindings/math_binds/ray2_binds.cpp index c76652cf..955efe56 100644 --- a/sources/enduro2d/high/bindings/math_binds/ray2_binds.cpp +++ b/sources/enduro2d/high/bindings/math_binds/ray2_binds.cpp @@ -50,9 +50,7 @@ namespace sol::resolve(const ray2&, T)>(::operator/), sol::resolve(const ray2&, const vec2&)>(::operator/)), - "approximately", [](const ray2& l, const ray2& r){ return math::approximately(l,r); }, - - "contains_nan", sol::resolve&)>(&math::contains_nan)); + "approximately", [](const ray2& l, const ray2& r){ return math::approximately(l,r); }); } } diff --git a/sources/enduro2d/high/bindings/math_binds/ray3_binds.cpp b/sources/enduro2d/high/bindings/math_binds/ray3_binds.cpp index 1f39e0af..daa818ec 100644 --- a/sources/enduro2d/high/bindings/math_binds/ray3_binds.cpp +++ b/sources/enduro2d/high/bindings/math_binds/ray3_binds.cpp @@ -51,9 +51,7 @@ namespace sol::resolve(const ray3&, T)>(::operator/), sol::resolve(const ray3&, const vec3&)>(::operator/)), - "approximately", [](const ray3& l, const ray3& r){ return math::approximately(l,r); }, - - "contains_nan", sol::resolve&)>(&math::contains_nan)); + "approximately", [](const ray3& l, const ray3& r){ return math::approximately(l,r); }); } } diff --git a/untests/sources/untests_math/ray2.cpp b/untests/sources/untests_math/ray2.cpp index bf0e560a..03548c2d 100644 --- a/untests/sources/untests_math/ray2.cpp +++ b/untests/sources/untests_math/ray2.cpp @@ -137,10 +137,4 @@ TEST_CASE("ray2") { REQUIRE(math::approximately(r2i({1,2},{3,4}), r2i({1,2},{4,5}), 1)); REQUIRE_FALSE(math::approximately(r2i({1,2},{3,4}), r2i({1,2},{4,5}))); } - { - REQUIRE_FALSE(math::contains_nan(r2i({1,2},{3,4}))); - REQUIRE_FALSE(math::contains_nan(r2f({1.f,2.f},{3.f,4.f}))); - REQUIRE(math::contains_nan(r2f(1.f,std::numeric_limits::quiet_NaN()))); - REQUIRE(math::contains_nan(r2f(std::numeric_limits::infinity(), 1.f))); - } } diff --git a/untests/sources/untests_math/ray3.cpp b/untests/sources/untests_math/ray3.cpp index c25a3341..1feb53e9 100644 --- a/untests/sources/untests_math/ray3.cpp +++ b/untests/sources/untests_math/ray3.cpp @@ -146,10 +146,4 @@ TEST_CASE("ray3") { REQUIRE(math::approximately(r3i({1,2,3},{4,1,2}), r3i({1,2,4},{5,1,2}), 1)); REQUIRE_FALSE(math::approximately(r3i({1,2,3},{4,1,2}), r3i({1,2,4},{5,1,2}))); } - { - REQUIRE_FALSE(math::contains_nan(r3i({1,2,3},{3,4,5}))); - REQUIRE_FALSE(math::contains_nan(r3f({1.f,2.f,3.f},{3.f,4.f,5.f}))); - REQUIRE(math::contains_nan(r3f(1.f,2.f,std::numeric_limits::quiet_NaN()))); - REQUIRE(math::contains_nan(r3f(std::numeric_limits::infinity(), 1.f,2.f))); - } }