From aef8b01f15ca26b93010264189380e6edc7c167e Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 8 Sep 2023 09:06:26 +0200 Subject: [PATCH] Math/Box: Rename FromExtends to FromExtents --- include/Nazara/Math/BoundingVolume.inl | 4 ++-- include/Nazara/Math/Box.hpp | 2 +- include/Nazara/Math/Box.inl | 4 ++-- include/Nazara/Math/Frustum.inl | 2 +- src/Nazara/Utility/AlgorithmUtility.cpp | 10 +++++----- src/Nazara/Utility/Formats/MD5AnimParser.cpp | 2 +- tests/UnitTests/Engine/Math/BoxTest.cpp | 2 +- tests/UnitTests/Engine/Math/SphereTest.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/Nazara/Math/BoundingVolume.inl b/include/Nazara/Math/BoundingVolume.inl index 5b4f3c015..814f60aca 100644 --- a/include/Nazara/Math/BoundingVolume.inl +++ b/include/Nazara/Math/BoundingVolume.inl @@ -217,7 +217,7 @@ namespace Nz { obb.Update(transformMatrix); - aabb = Box::FromExtends(obb(0), obb(1)); + aabb = Box::FromExtents(obb(0), obb(1)); for (unsigned int i = 2; i < 8; ++i) aabb.ExtendTo(obb(i)); } @@ -232,7 +232,7 @@ namespace Nz { obb.Update(translation); - aabb = Box::FromExtends(obb(0), obb(1)); + aabb = Box::FromExtents(obb(0), obb(1)); for (unsigned int i = 2; i < 8; ++i) aabb.ExtendTo(obb(i)); } diff --git a/include/Nazara/Math/Box.hpp b/include/Nazara/Math/Box.hpp index 7d6a0dce7..f331d9ea7 100644 --- a/include/Nazara/Math/Box.hpp +++ b/include/Nazara/Math/Box.hpp @@ -84,7 +84,7 @@ namespace Nz constexpr bool operator!=(const Box& box) const; static constexpr Box ApproxEqual(const Box& lhs, const Box& rhs, T maxDifference = std::numeric_limits::epsilon()); - static constexpr Box FromExtends(const Vector3& vec1, const Vector3& vec2); + static constexpr Box FromExtents(const Vector3& vec1, const Vector3& vec2); static constexpr Box Lerp(const Box& from, const Box& to, T interpolation); static constexpr Box Invalid(); static constexpr Box Zero(); diff --git a/include/Nazara/Math/Box.inl b/include/Nazara/Math/Box.inl index aa11b69e8..2bf9a09b6 100644 --- a/include/Nazara/Math/Box.inl +++ b/include/Nazara/Math/Box.inl @@ -610,7 +610,7 @@ namespace Nz std::abs(matrix(0,1)) * halfSize.x + std::abs(matrix(1,1)) * halfSize.y + std::abs(matrix(2,1)) * halfSize.z, std::abs(matrix(0,2)) * halfSize.x + std::abs(matrix(1,2)) * halfSize.y + std::abs(matrix(2,2)) * halfSize.z); - return operator=(Boxf::FromExtends(center - halfSize, center + halfSize)); + return operator=(Boxf::FromExtents(center - halfSize, center + halfSize)); } /*! @@ -692,7 +692,7 @@ namespace Nz } template - constexpr Box Box::FromExtends(const Vector3& vec1, const Vector3& vec2) + constexpr Box Box::FromExtents(const Vector3& vec1, const Vector3& vec2) { Box box; box.x = std::min(vec1.x, vec2.x); diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 56ecfa36f..7bcd2024c 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -257,7 +257,7 @@ namespace Nz min.Minimize(corners[static_cast(i)]); } - return Box::FromExtends(min, max); + return Box::FromExtents(min, max); } /*! diff --git a/src/Nazara/Utility/AlgorithmUtility.cpp b/src/Nazara/Utility/AlgorithmUtility.cpp index 8a7249c5a..a94a0ded0 100644 --- a/src/Nazara/Utility/AlgorithmUtility.cpp +++ b/src/Nazara/Utility/AlgorithmUtility.cpp @@ -134,7 +134,7 @@ namespace Nz if (aabb) { Vector3f halfSize = radius * m_matrix.GetScale() * 0.5f; - *aabb = Boxf::FromExtends(-halfSize, halfSize); + *aabb = Boxf::FromExtents(-halfSize, halfSize); } } @@ -850,7 +850,7 @@ namespace Nz if (aabb) { - *aabb = Boxf::FromExtends(-halfLengths, halfLengths); + *aabb = Boxf::FromExtents(-halfLengths, halfLengths); aabb->Transform(matrix, false); } } @@ -915,7 +915,7 @@ namespace Nz if (aabb) { Vector3f halfSize = size * matrix.GetScale() * 0.5f; - *aabb = Boxf::FromExtends(-halfSize, halfSize); + *aabb = Boxf::FromExtents(-halfSize, halfSize); } for (unsigned int i = 0; i < vertexCount; ++i) @@ -995,7 +995,7 @@ namespace Nz } if (aabb) - *aabb = Boxf::FromExtends(matrix.Transform(Vector3f(-halfSizeX, 0.f, -halfSizeY), 0.f), matrix.Transform(Vector3f(halfSizeX, 0.f, halfSizeY), 0.f)); + *aabb = Boxf::FromExtents(matrix.Transform(Vector3f(-halfSizeX, 0.f, -halfSizeY), 0.f), matrix.Transform(Vector3f(halfSizeX, 0.f, halfSizeY), 0.f)); } void GenerateUvSphere(float radius, unsigned int sliceCount, unsigned int stackCount, const Matrix4f& matrix, const Rectf& textureCoords, VertexPointers vertexPointers, IndexIterator indices, Boxf* aabb, UInt32 indexOffset) @@ -1048,7 +1048,7 @@ namespace Nz if (aabb) { Vector3f halfSize = radius * matrix.GetScale(); - *aabb = Boxf::FromExtends(-halfSize, halfSize); + *aabb = Boxf::FromExtents(-halfSize, halfSize); } } diff --git a/src/Nazara/Utility/Formats/MD5AnimParser.cpp b/src/Nazara/Utility/Formats/MD5AnimParser.cpp index e60b516db..c3fcda613 100644 --- a/src/Nazara/Utility/Formats/MD5AnimParser.cpp +++ b/src/Nazara/Utility/Formats/MD5AnimParser.cpp @@ -328,7 +328,7 @@ namespace Nz return false; } - m_frames[i].bounds = Boxf::FromExtends(min, max); + m_frames[i].bounds = Boxf::FromExtents(min, max); } if (!Advance()) diff --git a/tests/UnitTests/Engine/Math/BoxTest.cpp b/tests/UnitTests/Engine/Math/BoxTest.cpp index ede8a6cdf..98c94c287 100644 --- a/tests/UnitTests/Engine/Math/BoxTest.cpp +++ b/tests/UnitTests/Engine/Math/BoxTest.cpp @@ -161,7 +161,7 @@ SCENARIO("Box", "[MATH][BOX]") CHECK(secondWrongBox.Contains(0.f, 0.f, 0.f)); secondWrongBox = Nz::Boxf::Lerp(Nz::Boxf::Zero(), secondWrongBox, 0.f); // Zeroed - secondWrongBox.ExtendTo(Nz::Boxf::FromExtends(Nz::Vector3f(0.1f, 0.1f, 0.1f), Nz::Vector3f(0.9f, 0.9f, 0.9f))); + secondWrongBox.ExtendTo(Nz::Boxf::FromExtents(Nz::Vector3f(0.1f, 0.1f, 0.1f), Nz::Vector3f(0.9f, 0.9f, 0.9f))); secondWrongBox.Translate(Nz::Vector3f(0.05f, 0.05f, 0.05f)); // Box 0.15 to 0.95 CHECK(firstWrongBox.Contains(secondWrongBox)); diff --git a/tests/UnitTests/Engine/Math/SphereTest.cpp b/tests/UnitTests/Engine/Math/SphereTest.cpp index 260176e4d..bccde7d5d 100644 --- a/tests/UnitTests/Engine/Math/SphereTest.cpp +++ b/tests/UnitTests/Engine/Math/SphereTest.cpp @@ -51,7 +51,7 @@ SCENARIO("Sphere", "[MATH][SPHERE]") WHEN("We get sphere from box unit and center") { - Nz::Boxf centerUnitBox = Nz::Boxf::FromExtends(Nz::Vector3f::Unit() * -0.5f, Nz::Vector3f::Unit() * 0.5f); + Nz::Boxf centerUnitBox = Nz::Boxf::FromExtents(Nz::Vector3f::Unit() * -0.5f, Nz::Vector3f::Unit() * 0.5f); THEN("This is equal to sphere center and radius 0.75") {