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

Math/Box: Rename FromExtends to FromExtents

Browse Source
This commit is contained in:
SirLynix
2023-09-08 09:06:26 +02:00
parent 5f8b7b361e
commit aef8b01f15
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Math/BoundingVolume.inl
View File

@@ -217,7 +217,7 @@ namespace Nz
{
obb.Update(transformMatrix);
aabb = Box<T>::FromExtends(obb(0), obb(1));
aabb = Box<T>::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<T>::FromExtends(obb(0), obb(1));
aabb = Box<T>::FromExtents(obb(0), obb(1));
for (unsigned int i = 2; i < 8; ++i)
aabb.ExtendTo(obb(i));
}

2
include/Nazara/Math/Box.hpp
View File

@@ -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<T>::epsilon());
static constexpr Box FromExtends(const Vector3<T>& vec1, const Vector3<T>& vec2);
static constexpr Box FromExtents(const Vector3<T>& vec1, const Vector3<T>& vec2);
static constexpr Box Lerp(const Box& from, const Box& to, T interpolation);
static constexpr Box Invalid();
static constexpr Box Zero();

4
include/Nazara/Math/Box.inl
View File

@@ -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<typename T>
constexpr Box<T> Box<T>::FromExtends(const Vector3<T>& vec1, const Vector3<T>& vec2)
constexpr Box<T> Box<T>::FromExtents(const Vector3<T>& vec1, const Vector3<T>& vec2)
{
Box box;
box.x = std::min(vec1.x, vec2.x);

2
include/Nazara/Math/Frustum.inl
View File

@@ -257,7 +257,7 @@ namespace Nz
min.Minimize(corners[static_cast<BoxCorner>(i)]);
}
return Box<T>::FromExtends(min, max);
return Box<T>::FromExtents(min, max);
}
/*!