From efe36ca6e8dc6bccf713cb61f302dfe058cd49c4 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 25 Aug 2023 17:13:39 +0200 Subject: [PATCH] Math/OrientedBox: Make GetCorners return an EnumArray ref --- include/Nazara/Math/Frustum.inl | 2 +- include/Nazara/Math/OrientedBox.hpp | 2 +- include/Nazara/Math/OrientedBox.inl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index fee6ad71b..2020014a8 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -368,7 +368,7 @@ namespace Nz template constexpr IntersectionSide Frustum::Intersect(const OrientedBox& orientedbox) const { - return Intersect(orientedbox.GetCorners(), 8); + return Intersect(orientedbox.GetCorners().data(), 8); } /*! diff --git a/include/Nazara/Math/OrientedBox.hpp b/include/Nazara/Math/OrientedBox.hpp index 2d9ede6c4..cbf15ce2c 100644 --- a/include/Nazara/Math/OrientedBox.hpp +++ b/include/Nazara/Math/OrientedBox.hpp @@ -32,7 +32,7 @@ namespace Nz constexpr bool ApproxEqual(const OrientedBox& obb, T maxDifference = std::numeric_limits::epsilon()) const; constexpr const Vector3& GetCorner(BoxCorner corner) const; - constexpr const Vector3* GetCorners() const; + constexpr const EnumArray>& GetCorners() const; constexpr bool IsValid() const; diff --git a/include/Nazara/Math/OrientedBox.inl b/include/Nazara/Math/OrientedBox.inl index 2433d10cb..d86c5c1a6 100644 --- a/include/Nazara/Math/OrientedBox.inl +++ b/include/Nazara/Math/OrientedBox.inl @@ -75,9 +75,9 @@ namespace Nz } template - constexpr const Vector3* OrientedBox::GetCorners() const + constexpr const EnumArray>& OrientedBox::GetCorners() const { - return &m_corners.front(); + return m_corners; } /*!