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

Core/PrimitiveList: Rework and inline the class

This commit is contained in:
SirLynix 2023-11-26 21:27:24 +01:00
parent e8eebc1dfc
commit 72182327dd
3 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
include/Nazara/Core/PrimitiveList.hpp
View File

@ -13,42 +13,40 @@
namespace Nz namespace Nz
{ {
///TODO: Inline this class PrimitiveList
class NAZARA_CORE_API PrimitiveList
{ {
public: public:
PrimitiveList() = default; PrimitiveList() = default;
PrimitiveList(const PrimitiveList&) = default; inline PrimitiveList(const Primitive& primitive);
PrimitiveList(PrimitiveList&&) noexcept = default; inline PrimitiveList(std::initializer_list<Primitive> primitives);
~PrimitiveList() = default;
void AddBox(const Vector3f& lengths, const Vector3ui& subdivision = Vector3ui(0U), const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void Add(const Primitive& primitive);
void AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddBox(const Vector3f& lengths, const Vector3ui& subdivision = Vector3ui(0U), const Matrix4f& transformMatrix = Matrix4f::Identity());
void AddCone(float length, float radius, unsigned int subdivision = 4, const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
void AddCone(float length, float radius, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddCone(float length, float radius, unsigned int subdivision = 4, const Matrix4f& transformMatrix = Matrix4f::Identity());
void AddCubicSphere(float size, unsigned int subdivision = 4, const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void AddCone(float length, float radius, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
void AddCubicSphere(float size, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddCubicSphere(float size, unsigned int subdivision = 4, const Matrix4f& transformMatrix = Matrix4f::Identity());
void AddIcoSphere(float size, unsigned int recursionLevel = 3, const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void AddCubicSphere(float size, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
void AddIcoSphere(float size, unsigned int recursionLevel, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddIcoSphere(float size, unsigned int recursionLevel = 3, const Matrix4f& transformMatrix = Matrix4f::Identity());
void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void AddIcoSphere(float size, unsigned int recursionLevel, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Planef& planeInfo); inline void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Matrix4f& transformMatrix = Matrix4f::Identity());
void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Planef& planeInfo);
void AddUVSphere(float size, unsigned int sliceCount = 4, unsigned int stackCount = 4, const Matrix4f& transformMatrix = Matrix4f::Identity()); inline void AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
void AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity()); inline void AddUVSphere(float size, unsigned int sliceCount = 4, unsigned int stackCount = 4, const Matrix4f& transformMatrix = Matrix4f::Identity());
inline void AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Vector3f& position, const Quaternionf& rotation = Quaternionf::Identity());
Primitive& GetPrimitive(std::size_t i); inline Primitive& GetPrimitive(std::size_t i);
const Primitive& GetPrimitive(std::size_t i) const; inline const Primitive& GetPrimitive(std::size_t i) const;
std::size_t GetSize() const; inline std::size_t GetSize() const;
PrimitiveList& operator=(const PrimitiveList&) = default; inline Primitive& operator[](std::size_t i);
PrimitiveList& operator=(PrimitiveList&&) noexcept = default; inline const Primitive& operator[](std::size_t i) const;
Primitive& operator()(unsigned int i);
const Primitive& operator()(unsigned int i) const;
private: private:
std::vector<Primitive> m_primitives; std::vector<Primitive> m_primitives;
}; };
} }
#include <Nazara/Core/PrimitiveList.inl>
#endif // NAZARA_CORE_PRIMITIVELIST_HPP #endif // NAZARA_CORE_PRIMITIVELIST_HPP

69
src/Nazara/Core/PrimitiveList.cpp → include/Nazara/Core/PrimitiveList.inl
View File

@ -14,6 +14,21 @@ namespace Nz
* \brief Core class that represents a list of geometric primitives * \brief Core class that represents a list of geometric primitives
*/ */
inline PrimitiveList::PrimitiveList(const Primitive& primitive)
{
Add(primitive);
}
inline PrimitiveList::PrimitiveList(std::initializer_list<Primitive> primitives)
{
m_primitives.assign(primitives);
}
inline void PrimitiveList::Add(const Primitive& primitive)
{
m_primitives.push_back(primitive);
}
/*! /*!
* \brief Adds a box centered * \brief Adds a box centered
* *
@ -21,8 +36,7 @@ namespace Nz
* \param subdivision Number of subdivision for the axis * \param subdivision Number of subdivision for the axis
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Matrix4f& transformMatrix)
void PrimitiveList::AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::Box(lengths, subdivision, transformMatrix)); m_primitives.push_back(Primitive::Box(lengths, subdivision, transformMatrix));
} }
@ -35,8 +49,7 @@ namespace Nz
* \param position Position of the box * \param position Position of the box
* \param rotation Rotation of the box * \param rotation Rotation of the box
*/ */
inline void PrimitiveList::AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddBox(const Vector3f& lengths, const Vector3ui& subdivision, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::Box(lengths, subdivision, position, rotation)); m_primitives.push_back(Primitive::Box(lengths, subdivision, position, rotation));
} }
@ -49,8 +62,7 @@ namespace Nz
* \param subdivision Number of sides for the circle * \param subdivision Number of sides for the circle
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddCone(float length, float radius, unsigned int subdivision, const Matrix4f& transformMatrix)
void PrimitiveList::AddCone(float length, float radius, unsigned int subdivision, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::Cone(length, radius, subdivision, transformMatrix)); m_primitives.push_back(Primitive::Cone(length, radius, subdivision, transformMatrix));
} }
@ -64,8 +76,7 @@ namespace Nz
* \param position Position of the cone * \param position Position of the cone
* \param rotation Rotation of the cone * \param rotation Rotation of the cone
*/ */
inline void PrimitiveList::AddCone(float length, float radius, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddCone(float length, float radius, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::Cone(length, radius, subdivision, position, rotation)); m_primitives.push_back(Primitive::Cone(length, radius, subdivision, position, rotation));
} }
@ -77,8 +88,7 @@ namespace Nz
* \param subdivision Number of subdivision for the box * \param subdivision Number of subdivision for the box
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddCubicSphere(float size, unsigned int subdivision, const Matrix4f& transformMatrix)
void PrimitiveList::AddCubicSphere(float size, unsigned int subdivision, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::CubicSphere(size, subdivision, transformMatrix)); m_primitives.push_back(Primitive::CubicSphere(size, subdivision, transformMatrix));
} }
@ -91,8 +101,7 @@ namespace Nz
* \param position Position of the cubic sphere * \param position Position of the cubic sphere
* \param rotation Rotation of the cubic sphere * \param rotation Rotation of the cubic sphere
*/ */
inline void PrimitiveList::AddCubicSphere(float size, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddCubicSphere(float size, unsigned int subdivision, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::CubicSphere(size, subdivision, position, rotation)); m_primitives.push_back(Primitive::CubicSphere(size, subdivision, position, rotation));
} }
@ -104,8 +113,7 @@ namespace Nz
* \param recursionLevel Number of recursion for the icosphere * \param recursionLevel Number of recursion for the icosphere
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddIcoSphere(float size, unsigned int recursionLevel, const Matrix4f& transformMatrix)
void PrimitiveList::AddIcoSphere(float size, unsigned int recursionLevel, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::IcoSphere(size, recursionLevel, transformMatrix)); m_primitives.push_back(Primitive::IcoSphere(size, recursionLevel, transformMatrix));
} }
@ -118,8 +126,7 @@ namespace Nz
* \param position Position of the icosphere * \param position Position of the icosphere
* \param rotation Rotation of the icosphere * \param rotation Rotation of the icosphere
*/ */
inline void PrimitiveList::AddIcoSphere(float size, unsigned int recursionLevel, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddIcoSphere(float size, unsigned int recursionLevel, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::IcoSphere(size, recursionLevel, position, rotation)); m_primitives.push_back(Primitive::IcoSphere(size, recursionLevel, position, rotation));
} }
@ -131,8 +138,7 @@ namespace Nz
* \param subdivision Number of subdivision for the axis * \param subdivision Number of subdivision for the axis
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Matrix4f& transformMatrix)
void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::Plane(size, subdivision, transformMatrix)); m_primitives.push_back(Primitive::Plane(size, subdivision, transformMatrix));
} }
@ -144,8 +150,7 @@ namespace Nz
* \param subdivision Number of subdivision for the axis * \param subdivision Number of subdivision for the axis
* \param planeInfo Information for the plane * \param planeInfo Information for the plane
*/ */
inline void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Planef& planeInfo)
void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Planef& planeInfo)
{ {
m_primitives.push_back(Primitive::Plane(size, subdivision, planeInfo)); m_primitives.push_back(Primitive::Plane(size, subdivision, planeInfo));
} }
@ -158,8 +163,7 @@ namespace Nz
* \param position Position of the plane * \param position Position of the plane
* \param rotation Rotation of the plane * \param rotation Rotation of the plane
*/ */
inline void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddPlane(const Vector2f& size, const Vector2ui& subdivision, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::Plane(size, subdivision, position, rotation)); m_primitives.push_back(Primitive::Plane(size, subdivision, position, rotation));
} }
@ -172,8 +176,7 @@ namespace Nz
* \param stackCount Number of stacks * \param stackCount Number of stacks
* \param transformMatrix Matrix to apply * \param transformMatrix Matrix to apply
*/ */
inline void PrimitiveList::AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Matrix4f& transformMatrix)
void PrimitiveList::AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Matrix4f& transformMatrix)
{ {
m_primitives.push_back(Primitive::UVSphere(size, sliceCount, stackCount, transformMatrix)); m_primitives.push_back(Primitive::UVSphere(size, sliceCount, stackCount, transformMatrix));
} }
@ -187,8 +190,7 @@ namespace Nz
* \param position Position of the box * \param position Position of the box
* \param rotation Rotation of the box * \param rotation Rotation of the box
*/ */
inline void PrimitiveList::AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Vector3f& position, const Quaternionf& rotation)
void PrimitiveList::AddUVSphere(float size, unsigned int sliceCount, unsigned int stackCount, const Vector3f& position, const Quaternionf& rotation)
{ {
m_primitives.push_back(Primitive::UVSphere(size, sliceCount, stackCount, position, rotation)); m_primitives.push_back(Primitive::UVSphere(size, sliceCount, stackCount, position, rotation));
} }
@ -201,8 +203,7 @@ namespace Nz
* *
* \remark Produces a NazaraAssert if index is greather than the size * \remark Produces a NazaraAssert if index is greather than the size
*/ */
inline Primitive& PrimitiveList::GetPrimitive(std::size_t i)
Primitive& PrimitiveList::GetPrimitive(std::size_t i)
{ {
NazaraAssert(i < m_primitives.size(), "Primitive index out of range"); NazaraAssert(i < m_primitives.size(), "Primitive index out of range");
@ -217,8 +218,7 @@ namespace Nz
* *
* \remark Produces a NazaraAssert if index is greather than the size * \remark Produces a NazaraAssert if index is greather than the size
*/ */
inline const Primitive& PrimitiveList::GetPrimitive(std::size_t i) const
const Primitive& PrimitiveList::GetPrimitive(std::size_t i) const
{ {
NazaraAssert(i < m_primitives.size(), "Primitive index out of range"); NazaraAssert(i < m_primitives.size(), "Primitive index out of range");
@ -229,8 +229,7 @@ namespace Nz
* \brief Gets the number of primitives * \brief Gets the number of primitives
* \return Number of primitives * \return Number of primitives
*/ */
inline std::size_t PrimitiveList::GetSize() const
std::size_t PrimitiveList::GetSize() const
{ {
return m_primitives.size(); return m_primitives.size();
} }
@ -243,8 +242,7 @@ namespace Nz
* *
* \remark Produces a NazaraAssert if index is greather than the size * \remark Produces a NazaraAssert if index is greather than the size
*/ */
inline Primitive& PrimitiveList::operator[](std::size_t i)
Primitive& PrimitiveList::operator()(unsigned int i)
{ {
return GetPrimitive(i); return GetPrimitive(i);
} }
@ -257,8 +255,7 @@ namespace Nz
* *
* \remark Produces a NazaraAssert if index is greather than the size * \remark Produces a NazaraAssert if index is greather than the size
*/ */
inline const Primitive& PrimitiveList::operator[](std::size_t i) const
const Primitive& PrimitiveList::operator()(unsigned int i) const
{ {
return GetPrimitive(i); return GetPrimitive(i);
} }

10
tests/UnitTests/Engine/Core/PrimitiveListTest.cpp
View File

@ -25,19 +25,19 @@ SCENARIO("PrimitiveList", "[CORE][PRIMITIVELIST]")
THEN("The first one is the cubic sphere") THEN("The first one is the cubic sphere")
{ {
REQUIRE(primitiveList(0).type == Nz::PrimitiveType::Sphere); REQUIRE(primitiveList[0].type == Nz::PrimitiveType::Sphere);
REQUIRE(primitiveList(0).sphere.type == Nz::SphereType::Cubic); REQUIRE(primitiveList[0].sphere.type == Nz::SphereType::Cubic);
} }
THEN("The second one is the box") THEN("The second one is the box")
{ {
REQUIRE(primitiveList(1).type == Nz::PrimitiveType::Box); REQUIRE(primitiveList[1].type == Nz::PrimitiveType::Box);
} }
THEN("The third one is the ico sphere") THEN("The third one is the ico sphere")
{ {
REQUIRE(primitiveList(2).type == Nz::PrimitiveType::Sphere); REQUIRE(primitiveList[2].type == Nz::PrimitiveType::Sphere);
REQUIRE(primitiveList(2).sphere.type == Nz::SphereType::Ico); REQUIRE(primitiveList[2].sphere.type == Nz::SphereType::Ico);
} }
} }
} }