sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
SirLynix 2023-07-30 19:46:01 +02:00
parent a7eba496fb
commit e2808192aa
12 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/msys2-build.yml vendored
View File

@ -102,6 +102,7 @@ jobs:
# Run unit tests # Run unit tests
- name: Run unit tests - name: Run unit tests
if: matrix.mode != 'releasedbg
run: xmake run UnitTests run: xmake run UnitTests
# Setup installation configuration # Setup installation configuration

3
examples/DeferredShading/main.cpp
View File

@ -234,9 +234,6 @@ int main(int argc, char* argv[])
for (std::size_t i = 0; i < planeModel.GetSubMeshCount(); ++i) for (std::size_t i = 0; i < planeModel.GetSubMeshCount(); ++i)
planeModel.SetMaterial(i, planeMat); planeModel.SetMaterial(i, planeMat);
Nz::PredefinedInstanceData instanceUboOffsets = Nz::PredefinedInstanceData::GetOffsets();
Nz::PredefinedViewerData viewerUboOffsets = Nz::PredefinedViewerData::GetOffsets();
Nz::Vector2ui windowSize = window.GetSize(); Nz::Vector2ui windowSize = window.GetSize();
Nz::ViewerInstance viewerInstance; Nz::ViewerInstance viewerInstance;

8
include/Nazara/Core/Modules.inl
View File

@ -16,7 +16,7 @@ namespace Nz
struct ModuleConfigHasOverride<T, std::void_t<decltype(std::declval<T>().Override(std::declval<const CommandLineParameters&>()))>> : std::true_type {}; struct ModuleConfigHasOverride<T, std::void_t<decltype(std::declval<T>().Override(std::declval<const CommandLineParameters&>()))>> : std::true_type {};
template<typename T> template<typename T>
auto OverrideModuleConfig(T&& module, const CommandLineParameters& params) decltype(auto) OverrideModuleConfig(T&& module, const CommandLineParameters& params)
{ {
if constexpr (!std::is_const_v<T> && ModuleConfigHasOverride<T>::value) if constexpr (!std::is_const_v<T> && ModuleConfigHasOverride<T>::value)
module.Override(params); module.Override(params);
@ -28,7 +28,7 @@ namespace Nz
struct Pick struct Pick
{ {
template<typename First, typename... Args> template<typename First, typename... Args>
static auto Get(First&& first, Args&&... args) static decltype(auto) Get(First&& first, Args&&... args)
{ {
if constexpr (std::is_same_v<T, std::decay_t<First>>) if constexpr (std::is_same_v<T, std::decay_t<First>>)
return std::forward<First>(first); return std::forward<First>(first);
@ -40,7 +40,7 @@ namespace Nz
} }
template<typename First, typename... Args> template<typename First, typename... Args>
static auto Get(const CommandLineParameters& parameters, First&& first, Args&&... args) static decltype(auto) Get(const CommandLineParameters& parameters, First&& first, Args&&... args)
{ {
if constexpr (std::is_same_v<T, std::decay_t<First>>) if constexpr (std::is_same_v<T, std::decay_t<First>>)
return OverrideModuleConfig<First>(first, parameters); return OverrideModuleConfig<First>(first, parameters);
@ -51,7 +51,7 @@ namespace Nz
} }
} }
static auto Get() static T Get()
{ {
return T{}; return T{};
} }

6
include/Nazara/Math/Sphere.hpp
View File

@ -31,9 +31,9 @@ namespace Nz
constexpr bool ApproxEqual(const Sphere& sphere, T maxDifference = std::numeric_limits<T>::epsilon()) const; constexpr bool ApproxEqual(const Sphere& sphere, T maxDifference = std::numeric_limits<T>::epsilon()) const;
constexpr bool Contains(T X, T Y, T Z) const; constexpr bool Contains(T X, T Y, T Z, T epsilon = std::numeric_limits<T>::epsilon()) const;
constexpr bool Contains(const Box<T>& box) const; constexpr bool Contains(const Box<T>& box, T epsilon = std::numeric_limits<T>::epsilon()) const;
constexpr bool Contains(const Vector3<T>& point) const; constexpr bool Contains(const Vector3<T>& point, T epsilon = std::numeric_limits<T>::epsilon()) const;
T Distance(T X, T Y, T Z) const; T Distance(T X, T Y, T Z) const;
T Distance(const Vector3<T>& point) const; T Distance(const Vector3<T>& point) const;

12
include/Nazara/Math/Sphere.inl
View File

@ -95,9 +95,9 @@ namespace Nz
* \see Contains * \see Contains
*/ */
template<typename T> template<typename T>
constexpr bool Sphere<T>::Contains(T X, T Y, T Z) const constexpr bool Sphere<T>::Contains(T X, T Y, T Z, T epsilon) const
{ {
return Contains(Vector3<T>(X, Y, Z)); return Contains(Vector3<T>(X, Y, Z), epsilon);
} }
/*! /*!
@ -109,9 +109,9 @@ namespace Nz
* \see Contains * \see Contains
*/ */
template<typename T> template<typename T>
constexpr bool Sphere<T>::Contains(const Box<T>& box) const constexpr bool Sphere<T>::Contains(const Box<T>& box, T epsilon) const
{ {
if (Contains(box.GetMinimum()) && Contains(box.GetMaximum())) if (Contains(box.GetMinimum(), epsilon) && Contains(box.GetMaximum(), epsilon))
return true; return true;
return false; return false;
@ -124,9 +124,9 @@ namespace Nz
* \param point Position of the point * \param point Position of the point
*/ */
template<typename T> template<typename T>
constexpr bool Sphere<T>::Contains(const Vector3<T>& point) const constexpr bool Sphere<T>::Contains(const Vector3<T>& point, T epsilon) const
{ {
return GetPosition().SquaredDistance(point) <= radius * radius; return (GetPosition().SquaredDistance(point) - radius * radius) <= epsilon;
} }
/*! /*!

4
tests/ComputeParticlesTest/main.cpp
View File

@ -258,11 +258,7 @@ int main()
Nz::SparsePtr<Nz::Vector2f> particleVelPtr(particleBasePtr + particleVelOffset, particleSize); Nz::SparsePtr<Nz::Vector2f> particleVelPtr(particleBasePtr + particleVelOffset, particleSize);
for (std::size_t i = 0; i < particleCount; ++i) for (std::size_t i = 0; i < particleCount; ++i)
{
auto&& [pos, color] = logoParticles[i];
particleVelPtr[i] = Nz::Vector2f(velDis(rand), velDis(rand)); particleVelPtr[i] = Nz::Vector2f(velDis(rand), velDis(rand));
}
particleBuffer->Unmap(); particleBuffer->Unmap();
}); });

2
tests/UnitTests/Engine/Math/Matrix4Test.cpp
View File

@ -208,7 +208,7 @@ SCENARIO("Matrix4", "[MATH][MATRIX4]")
THEN("We should retrieve it") THEN("We should retrieve it")
{ {
CHECK(identity.GetScale() == scale); CHECK(identity.GetScale().ApproxEqual(scale));
CHECK(identity.GetSquaredScale() == squaredScale); CHECK(identity.GetSquaredScale() == squaredScale);
} }

4
tests/UnitTests/Engine/Math/PlaneTest.cpp
View File

@ -68,7 +68,7 @@ SCENARIO("Plane", "[MATH][PLANE]")
THEN("It must be equal to XZ distance 1") THEN("It must be equal to XZ distance 1")
{ {
REQUIRE(xy == Nz::Planef(Nz::Vector3f::UnitY(), -1.f)); REQUIRE(xy.ApproxEqual(Nz::Planef(Nz::Vector3f::UnitY(), -1.f)));
} }
} }
@ -77,7 +77,7 @@ SCENARIO("Plane", "[MATH][PLANE]")
Nz::Planef xy(Nz::Vector3f(0.f, 1.f, 0.f), Nz::Vector3f(1.f, 1.f, 1.f), Nz::Vector3f(-1.f, 1.f, 0.f)); Nz::Planef xy(Nz::Vector3f(0.f, 1.f, 0.f), Nz::Vector3f(1.f, 1.f, 1.f), Nz::Vector3f(-1.f, 1.f, 0.f));
THEN("It must be equal to XZ distance 1") THEN("It must be equal to XZ distance 1")
{ {
REQUIRE(xy == Nz::Planef(-Nz::Vector3f::UnitY(), 1.f)); REQUIRE(xy.ApproxEqual(Nz::Planef(-Nz::Vector3f::UnitY(), 1.f)));
} }
} }
} }

4
tests/UnitTests/Engine/Math/QuaternionTest.cpp
View File

@ -14,7 +14,7 @@ SCENARIO("Quaternion", "[MATH][QUATERNION]")
THEN("They are the same and the proprieties of quaternions are respected") THEN("They are the same and the proprieties of quaternions are respected")
{ {
REQUIRE(firstQuaternion.ApproxEqual(secondQuaternion)); REQUIRE(firstQuaternion.ApproxEqual(secondQuaternion));
REQUIRE(firstQuaternion.ComputeW() == secondQuaternion.Normalize()); REQUIRE(firstQuaternion.ComputeW().ApproxEqual(secondQuaternion.Normalize()));
REQUIRE(firstQuaternion.Conjugate() == secondQuaternion.Inverse()); REQUIRE(firstQuaternion.Conjugate() == secondQuaternion.Inverse());
REQUIRE(firstQuaternion.DotProduct(secondQuaternion) == Catch::Approx(1.f)); REQUIRE(firstQuaternion.DotProduct(secondQuaternion) == Catch::Approx(1.f));
} }
@ -200,7 +200,7 @@ SCENARIO("Quaternion", "[MATH][QUATERNION]")
Nz::Vector3f origin(1.f, 0.f, 1.f); Nz::Vector3f origin(1.f, 0.f, 1.f);
Nz::Vector3f extremity(-1.f, 0.f, 1.f); Nz::Vector3f extremity(-1.f, 0.f, 1.f);
Nz::Quaternionf rotation = Nz::Quaternionf::RotationBetween(origin, extremity); Nz::Quaternionf rotation = Nz::Quaternionf::RotationBetween(origin, extremity);
REQUIRE((rotation * origin).ApproxEqual(extremity)); REQUIRE((rotation * origin).ApproxEqual(extremity, 0.0001f));
} }
} }
} }

2
tests/UnitTests/Engine/Math/RayTest.cpp
View File

@ -75,7 +75,7 @@ SCENARIO("Ray", "[MATH][RAY]")
Nz::BoundingVolumef infiniteVolume(Nz::Extent::Infinite); Nz::BoundingVolumef infiniteVolume(Nz::Extent::Infinite);
CHECK(ray.Intersect(infiniteVolume, &tmpClosest, &tmpFurthest)); CHECK(ray.Intersect(infiniteVolume, &tmpClosest, &tmpFurthest));
CHECK(tmpClosest == Catch::Approx(0.f)); CHECK(tmpClosest == Catch::Approx(0.f));
CHECK(tmpFurthest == std::numeric_limits<float>::infinity()); CHECK(std::isinf(tmpFurthest));
} }
THEN("For the triangle collision's") THEN("For the triangle collision's")

2
tests/UnitTests/Engine/Math/Vector2Test.cpp
View File

@ -56,7 +56,7 @@ SCENARIO("Vector2", "[MATH][VECTOR2]")
THEN("For normal cases should be normal") THEN("For normal cases should be normal")
{ {
Nz::Vector2f normalized = firstUnit.GetNormal(&ratio); Nz::Vector2f normalized = firstUnit.GetNormal(&ratio);
REQUIRE(normalized == (Nz::Vector2f::Unit() / std::sqrt(2.f))); REQUIRE(normalized.ApproxEqual(Nz::Vector2f::Unit() / std::sqrt(2.f)));
REQUIRE(ratio == Catch::Approx(std::sqrt(2.f))); REQUIRE(ratio == Catch::Approx(std::sqrt(2.f)));
} }

2
tests/UnitTests/Engine/Math/Vector3Test.cpp
View File

@ -28,7 +28,7 @@ SCENARIO("Vector3", "[MATH][VECTOR3]")
REQUIRE(firstUnit.AbsDotProduct(tmp) == Catch::Approx(2.f)); REQUIRE(firstUnit.AbsDotProduct(tmp) == Catch::Approx(2.f));
REQUIRE(firstUnit.DotProduct(tmp) == Catch::Approx(0.f)); REQUIRE(firstUnit.DotProduct(tmp) == Catch::Approx(0.f));
REQUIRE(firstUnit.AngleBetween(tmp).ApproxEqual(Nz::DegreeAnglef(90.f))); REQUIRE(firstUnit.AngleBetween(tmp).ApproxEqual(Nz::DegreeAnglef(90.f)));
REQUIRE(firstUnit.AngleBetween(-firstUnit).ApproxEqual(Nz::DegreeAnglef(180.f))); REQUIRE(firstUnit.AngleBetween(-firstUnit).ApproxEqual(Nz::DegreeAnglef(180.f), 0.001f));
} }
} }