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

fixes after master merge

Browse Source
This commit is contained in:
Matvey Cherevko
2020-01-13 15:45:52 +07:00
parent a629a34676
commit 19215bf1c5
8 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headers/enduro2d/math/ray2.hpp
View File

@@ -293,14 +293,4 @@ namespace e2d::math
return math::approximately(l.origin, r.origin, precision) return math::approximately(l.origin, r.origin, precision)
&& math::approximately(l.direction, r.direction, precision); && math::approximately(l.direction, r.direction, precision);
} }
//
// contains_nan
//
template < typename T >
bool contains_nan(const ray2<T>& r) noexcept {
return math::contains_nan(r.origin)
|| math::contains_nan(r.direction);
}
} }

10
headers/enduro2d/math/ray3.hpp
View File

@@ -299,14 +299,4 @@ namespace e2d::math
return math::approximately(l.origin, r.origin, precision) return math::approximately(l.origin, r.origin, precision)
&& math::approximately(l.direction, r.direction, precision); && math::approximately(l.direction, r.direction, precision);
} }
//
// contains_nan
//
template < typename T >
bool contains_nan(const ray3<T>& r) noexcept {
return math::contains_nan(r.origin)
|| math::contains_nan(r.direction);
}
} }

4
samples/bin/library/scripts/emmy/math/ray2.lua
View File

@@ -30,9 +30,5 @@ function ray2.unit_y() end
---@return boolean ---@return boolean
function ray2.approximately(l, r) end function ray2.approximately(l, r) end
---@param r ray2
---@return boolean
function ray2.contains_nan(r) end
---@type ray2 ---@type ray2
_G.ray2 = _G.ray2 or ray2 _G.ray2 = _G.ray2 or ray2

4
samples/bin/library/scripts/emmy/math/ray3.lua
View File

@@ -33,9 +33,5 @@ function ray3.unit_z() end
---@return boolean ---@return boolean
function ray3.approximately(l, r) end function ray3.approximately(l, r) end
---@param r ray3
---@return boolean
function ray3.contains_nan(r) end
---@type ray3 ---@type ray3
_G.ray3 = _G.ray3 or ray3 _G.ray3 = _G.ray3 or ray3

4
sources/enduro2d/high/bindings/math_binds/ray2_binds.cpp
View File

@@ -50,9 +50,7 @@ namespace
sol::resolve<ray2<T>(const ray2<T>&, T)>(::operator/), sol::resolve<ray2<T>(const ray2<T>&, T)>(::operator/),
sol::resolve<ray2<T>(const ray2<T>&, const vec2<T>&)>(::operator/)), sol::resolve<ray2<T>(const ray2<T>&, const vec2<T>&)>(::operator/)),
"approximately", [](const ray2<T>& l, const ray2<T>& r){ return math::approximately(l,r); }, "approximately", [](const ray2<T>& l, const ray2<T>& r){ return math::approximately(l,r); });
"contains_nan", sol::resolve<bool(const ray2<T>&)>(&math::contains_nan));
} }
} }

4
sources/enduro2d/high/bindings/math_binds/ray3_binds.cpp
View File

@@ -51,9 +51,7 @@ namespace
sol::resolve<ray3<T>(const ray3<T>&, T)>(::operator/), sol::resolve<ray3<T>(const ray3<T>&, T)>(::operator/),
sol::resolve<ray3<T>(const ray3<T>&, const vec3<T>&)>(::operator/)), sol::resolve<ray3<T>(const ray3<T>&, const vec3<T>&)>(::operator/)),
"approximately", [](const ray3<T>& l, const ray3<T>& r){ return math::approximately(l,r); }, "approximately", [](const ray3<T>& l, const ray3<T>& r){ return math::approximately(l,r); });
"contains_nan", sol::resolve<bool(const ray3<T>&)>(&math::contains_nan));
} }
} }

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

@@ -137,10 +137,4 @@ TEST_CASE("ray2") {
REQUIRE(math::approximately(r2i({1,2},{3,4}), r2i({1,2},{4,5}), 1)); 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::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<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(r2f(std::numeric_limits<f32>::infinity(), 1.f)));
}
} }

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

@@ -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(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::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<f32>::quiet_NaN())));
REQUIRE(math::contains_nan(r3f(std::numeric_limits<f32>::infinity(), 1.f,2.f)));
}
} }