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

Rename EnumMap to EnumArray after nazarautils update

Browse Source
This commit is contained in:
SirLynix
2023-05-30 13:49:19 +02:00
parent cff918f6a3
commit 2886a2e0c0
27 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
#include <Nazara/Math/Plane.hpp>
#include <Nazara/Math/Sphere.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <NazaraUtils/EnumMap.hpp>
#include <NazaraUtils/EnumArray.hpp>
#include <array>
#include <string>
@@ -28,7 +28,7 @@ namespace Nz
{
public:
Frustum() = default;
explicit Frustum(const EnumMap<FrustumPlane, Plane<T>>& planes);
explicit Frustum(const EnumArray<FrustumPlane, Plane<T>>& planes);
template<typename U> explicit Frustum(const Frustum<U>& frustum);
Frustum(const Frustum& frustum) = default;
~Frustum() = default;
@@ -64,7 +64,7 @@ namespace Nz
friend bool Unserialize(SerializationContext& context, Frustum<U>* frustum, TypeTag<Frustum<U>>);
private:
EnumMap<FrustumPlane, Plane<T>> m_planes;
EnumArray<FrustumPlane, Plane<T>> m_planes;
};
using Frustumd = Frustum<double>;

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

@@ -8,7 +8,7 @@
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Math/Algorithm.hpp>
#include <NazaraUtils/EnumMap.hpp>
#include <NazaraUtils/EnumArray.hpp>
#include <cstring>
#include <sstream>
#include <Nazara/Core/Debug.hpp>
@@ -31,7 +31,7 @@ namespace Nz
* \param planes Frustum of type U to convert to type T
*/
template<typename T>
Frustum<T>::Frustum(const EnumMap<FrustumPlane, Plane<T>>& planes) :
Frustum<T>::Frustum(const EnumArray<FrustumPlane, Plane<T>>& planes) :
m_planes(planes)
{
}
@@ -419,7 +419,7 @@ namespace Nz
Vector3<T> fc = eye + f * zFar;
// Computing the frustum
EnumMap<BoxCorner, Vector3<T>> corners;
EnumArray<BoxCorner, Vector3<T>> corners;
corners[BoxCorner::FarLeftBottom] = fc - u * farH - s * farW;
corners[BoxCorner::FarLeftTop] = fc + u * farH - s * farW;
corners[BoxCorner::FarRightTop] = fc + u * farH + s * farW;
@@ -432,7 +432,7 @@ namespace Nz
// Construction of frustum's planes
EnumMap<FrustumPlane, Plane<T>> planes;
EnumArray<FrustumPlane, Plane<T>> planes;
planes[FrustumPlane::Bottom] = Plane(corners[BoxCorner::NearLeftBottom], corners[BoxCorner::NearRightBottom], corners[BoxCorner::FarRightBottom]);
planes[FrustumPlane::Far] = Plane(corners[BoxCorner::FarRightTop], corners[BoxCorner::FarLeftTop], corners[BoxCorner::FarLeftBottom]);
planes[FrustumPlane::Left] = Plane(corners[BoxCorner::NearLeftTop], corners[BoxCorner::NearLeftBottom], corners[BoxCorner::FarLeftBottom]);
@@ -456,7 +456,7 @@ namespace Nz
T plane[4];
T invLength;
EnumMap<FrustumPlane, Plane<T>> planes;
EnumArray<FrustumPlane, Plane<T>> planes;
// Extract the numbers for the RIGHT plane
plane[0] = viewProjMatrix[3] - viewProjMatrix[0];

4
include/Nazara/Math/OrientedBox.hpp
View File

@@ -11,7 +11,7 @@
#include <Nazara/Math/Enums.hpp>
#include <Nazara/Math/Matrix4.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <NazaraUtils/EnumMap.hpp>
#include <NazaraUtils/EnumArray.hpp>
#include <string>
namespace Nz
@@ -54,7 +54,7 @@ namespace Nz
Box<T> localBox;
private:
EnumMap<BoxCorner, Vector3<T>> m_corners;
EnumArray<BoxCorner, Vector3<T>> m_corners;
};
using OrientedBoxd = OrientedBox<double>;