diff --git a/include/omath/Mat.hpp b/include/omath/Mat.hpp index 2b99de5..7b05f42 100644 --- a/include/omath/Mat.hpp +++ b/include/omath/Mat.hpp @@ -25,18 +25,18 @@ namespace omath template requires std::is_arithmetic_v - class OMATH_API Mat final + class Mat final { public: - constexpr Mat() + OMATH_API constexpr Mat() { Clear(); } - constexpr static MatStoreType GetStoreOrdering() + OMATH_API constexpr static MatStoreType GetStoreOrdering() { return StoreType; } - constexpr Mat(const std::initializer_list>& rows) + OMATH_API constexpr Mat(const std::initializer_list>& rows) { if (rows.size() != Rows) throw std::invalid_argument("Initializer list rows size does not match template parameter Rows"); @@ -56,40 +56,40 @@ namespace omath } } - constexpr explicit Mat(const Type* rawData) + OMATH_API constexpr explicit Mat(const Type* rawData) { std::copy_n(rawData, Rows * Columns, m_data.begin()); } - constexpr Mat(const Mat& other) noexcept + OMATH_API constexpr Mat(const Mat& other) noexcept { m_data = other.m_data; } - constexpr Mat(Mat&& other) noexcept + OMATH_API constexpr Mat(Mat&& other) noexcept { m_data = std::move(other.m_data); } [[nodiscard]] - static constexpr size_t RowCount() noexcept + OMATH_API static constexpr size_t RowCount() noexcept { return Rows; } [[nodiscard]] - static constexpr size_t ColumnsCount() noexcept + OMATH_API static constexpr size_t ColumnsCount() noexcept { return Columns; } [[nodiscard]] - static consteval MatSize Size() noexcept + OMATH_API static consteval MatSize Size() noexcept { return {Rows, Columns}; } - [[nodiscard]] constexpr const Type& At(const size_t rowIndex, const size_t columnIndex) const + [[nodiscard]] OMATH_API constexpr const Type& At(const size_t rowIndex, const size_t columnIndex) const { if (rowIndex >= Rows || columnIndex >= Columns) throw std::out_of_range("Index out of range"); @@ -107,13 +107,13 @@ namespace omath } } - [[nodiscard]] constexpr Type& At(const size_t rowIndex, const size_t columnIndex) + [[nodiscard]] OMATH_API constexpr Type& At(const size_t rowIndex, const size_t columnIndex) { return const_cast(std::as_const(*this).At(rowIndex, columnIndex)); } [[nodiscard]] - constexpr Type Sum() const noexcept + OMATH_API constexpr Type Sum() const noexcept { Type sum = 0; for (size_t i = 0; i < Rows; ++i) @@ -123,12 +123,12 @@ namespace omath return sum; } - constexpr void Clear() noexcept + OMATH_API constexpr void Clear() noexcept { Set(0); } - constexpr void Set(const Type& value) noexcept + OMATH_API constexpr void Set(const Type& value) noexcept { std::ranges::fill(m_data, value); } @@ -136,7 +136,7 @@ namespace omath // Operator overloading for multiplication with another Mat template constexpr Mat - operator*(const Mat& other) const + OMATH_API operator*(const Mat& other) const { Mat result; @@ -151,7 +151,7 @@ namespace omath return result; } - constexpr Mat& operator*=(const Type& f) noexcept + OMATH_API constexpr Mat& operator*=(const Type& f) noexcept { for (size_t i = 0; i < Rows; ++i) for (size_t j = 0; j < Columns; ++j) @@ -161,19 +161,19 @@ namespace omath template constexpr Mat - operator*=(const Mat& other) + OMATH_API operator*=(const Mat& other) { return *this = *this * other; } - constexpr Mat operator*(const Type& f) const noexcept + OMATH_API constexpr Mat operator*(const Type& f) const noexcept { Mat result(*this); result *= f; return result; } - constexpr Mat& operator/=(const Type& f) noexcept + OMATH_API constexpr Mat& operator/=(const Type& f) noexcept { for (size_t i = 0; i < Rows; ++i) for (size_t j = 0; j < Columns; ++j) @@ -181,14 +181,14 @@ namespace omath return *this; } - constexpr Mat operator/(const Type& f) const noexcept + OMATH_API constexpr Mat operator/(const Type& f) const noexcept { Mat result(*this); result /= f; return result; } - constexpr Mat& operator=(const Mat& other) noexcept + OMATH_API constexpr Mat& operator=(const Mat& other) noexcept { if (this == &other) return *this; @@ -198,7 +198,7 @@ namespace omath return *this; } - constexpr Mat& operator=(Mat&& other) noexcept + OMATH_API constexpr Mat& operator=(Mat&& other) noexcept { if (this == &other) return *this; @@ -211,7 +211,7 @@ namespace omath } [[nodiscard]] - constexpr Mat Transposed() const noexcept + OMATH_API constexpr Mat Transposed() const noexcept { Mat transposed; for (size_t i = 0; i < Rows; ++i) @@ -222,7 +222,7 @@ namespace omath } [[nodiscard]] - constexpr Type Determinant() const + OMATH_API constexpr Type Determinant() const { static_assert(Rows == Columns, "Determinant is only defined for square matrices."); @@ -244,7 +244,7 @@ namespace omath } [[nodiscard]] - constexpr Mat Minor(const size_t row, const size_t column) const + OMATH_API constexpr Mat Minor(const size_t row, const size_t column) const { Mat result; for (size_t i = 0, m = 0; i < Rows; ++i) @@ -264,19 +264,19 @@ namespace omath } [[nodiscard]] - constexpr const std::array& RawArray() const + OMATH_API constexpr const std::array& RawArray() const { return m_data; } [[nodiscard]] - constexpr std::array& RawArray() + OMATH_API constexpr std::array& RawArray() { return const_cast>(std::as_const(*this).RawArray()); } [[nodiscard]] - std::string ToString() const noexcept + OMATH_API std::string ToString() const noexcept { std::ostringstream oss; for (size_t i = 0; i < Rows; ++i) @@ -293,20 +293,20 @@ namespace omath } [[nodiscard]] - bool operator==(const Mat& mat) const + OMATH_API bool operator==(const Mat& mat) const { return m_data == mat.m_data; } [[nodiscard]] - bool operator!=(const Mat& mat) const + OMATH_API bool operator!=(const Mat& mat) const { return !operator==(mat); } // Static methods that return fixed-size matrices [[nodiscard]] - constexpr static Mat<4, 4> ToScreenMat(const Type& screenWidth, const Type& screenHeight) noexcept + OMATH_API constexpr static Mat<4, 4> ToScreenMat(const Type& screenWidth, const Type& screenHeight) noexcept { return { {screenWidth / 2, 0, 0, 0}, @@ -336,7 +336,7 @@ namespace omath template [[nodiscard]] - constexpr Mat<4, 4, Type, St> MatTranslation(const Vector3& diff) noexcept + OMATH_API constexpr Mat<4, 4, Type, St> MatTranslation(const Vector3& diff) noexcept { return { @@ -349,7 +349,7 @@ namespace omath template [[nodiscard]] - Mat<4, 4, Type, St> MatRotationAxisX(const Angle& angle) noexcept + OMATH_API Mat<4, 4, Type, St> MatRotationAxisX(const Angle& angle) noexcept { return { @@ -362,7 +362,7 @@ namespace omath template [[nodiscard]] - Mat<4, 4, Type, St> MatRotationAxisY(const Angle& angle) noexcept + OMATH_API Mat<4, 4, Type, St> MatRotationAxisY(const Angle& angle) noexcept { return { @@ -375,7 +375,7 @@ namespace omath template [[nodiscard]] - Mat<4, 4, Type, St> MatRotationAxisZ(const Angle& angle) noexcept + OMATH_API Mat<4, 4, Type, St> MatRotationAxisZ(const Angle& angle) noexcept { return { @@ -403,7 +403,7 @@ namespace omath template [[nodiscard]] - Mat<4, 4, Type, St> MatRotation(const ViewAngles& angles) noexcept + OMATH_API Mat<4, 4, Type, St> MatRotation(const ViewAngles& angles) noexcept { return MatRotationAxisZ(angles.yaw) * MatRotationAxisY(angles.pitch) * MatRotationAxisX(angles.roll); } diff --git a/include/omath/Matrix.hpp b/include/omath/Matrix.hpp index 3cac39b..3ffe5ec 100644 --- a/include/omath/Matrix.hpp +++ b/include/omath/Matrix.hpp @@ -8,94 +8,94 @@ namespace omath { class Vector3; - class OMATH_API Matrix final + class Matrix final { public: - Matrix(); - Matrix(size_t rows, size_t columns); + OMATH_API Matrix(); + OMATH_API Matrix(size_t rows, size_t columns); - Matrix(const std::initializer_list>& rows); + OMATH_API Matrix(const std::initializer_list>& rows); [[nodiscard]] - static Matrix ToScreenMatrix(float screenWidth, float screenHeight); + OMATH_API static Matrix ToScreenMatrix(float screenWidth, float screenHeight); [[nodiscard]] - static Matrix TranslationMatrix(const Vector3& diff); + OMATH_API static Matrix TranslationMatrix(const Vector3& diff); [[nodiscard]] - static Matrix OrientationMatrix(const Vector3& forward, const Vector3& right, const Vector3& up); + OMATH_API static Matrix OrientationMatrix(const Vector3& forward, const Vector3& right, const Vector3& up); [[nodiscard]] - static Matrix ProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far); + OMATH_API static Matrix ProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far); - Matrix(const Matrix& other); + OMATH_API Matrix(const Matrix& other); - Matrix(size_t rows, size_t columns, const float* pRaw); + OMATH_API Matrix(size_t rows, size_t columns, const float* pRaw); - Matrix(Matrix&& other) noexcept; + OMATH_API Matrix(Matrix&& other) noexcept; [[nodiscard]] - size_t RowCount() const noexcept; + OMATH_API size_t RowCount() const noexcept; [[nodiscard]] - size_t ColumnsCount() const noexcept; + OMATH_API size_t ColumnsCount() const noexcept; [[nodiscard]] - std::pair Size() const noexcept; + OMATH_API std::pair Size() const noexcept; [[nodiscard]] - float& At(size_t iRow, size_t iCol); + OMATH_API float& At(size_t iRow, size_t iCol); [[nodiscard]] - float Sum(); + OMATH_API float Sum(); - void SetDataFromRaw(const float* pRawMatrix); + OMATH_API void SetDataFromRaw(const float* pRawMatrix); [[nodiscard]] - Matrix Transpose() const; + OMATH_API Matrix Transpose() const; - void Set(float val); + OMATH_API void Set(float val); [[nodiscard]] - const float& At(size_t iRow, size_t iCol) const; + OMATH_API const float& At(size_t iRow, size_t iCol) const; - Matrix operator*(const Matrix& other) const; + OMATH_API Matrix operator*(const Matrix& other) const; - Matrix& operator*=(const Matrix& other); + OMATH_API Matrix& operator*=(const Matrix& other); - Matrix operator*(float f) const; + OMATH_API Matrix operator*(float f) const; - Matrix& operator*=(float f); + OMATH_API Matrix& operator*=(float f); - Matrix& operator/=(float f); + OMATH_API Matrix& operator/=(float f); - void Clear(); + OMATH_API void Clear(); [[nodiscard]] - Matrix Strip(size_t row, size_t column) const; + OMATH_API Matrix Strip(size_t row, size_t column) const; [[nodiscard]] - float Minor(size_t i, size_t j) const; + OMATH_API float Minor(size_t i, size_t j) const; [[nodiscard]] - float AlgComplement(size_t i, size_t j) const; + OMATH_API float AlgComplement(size_t i, size_t j) const; [[nodiscard]] - float Determinant() const; + OMATH_API float Determinant() const; [[nodiscard]] - const float* Raw() const; + OMATH_API const float* Raw() const; - Matrix& operator=(const Matrix& other); + OMATH_API Matrix& operator=(const Matrix& other); - Matrix& operator=(Matrix&& other) noexcept; + OMATH_API Matrix& operator=(Matrix&& other) noexcept; - Matrix operator/(float f) const; + OMATH_API Matrix operator/(float f) const; [[nodiscard]] - std::string ToString() const; + OMATH_API std::string ToString() const; - ~Matrix(); + OMATH_API ~Matrix(); private: size_t m_rows; diff --git a/include/omath/pathfinding/NavigationMesh.hpp b/include/omath/pathfinding/NavigationMesh.hpp index 39cc2ea..8ab5c24 100644 --- a/include/omath/pathfinding/NavigationMesh.hpp +++ b/include/omath/pathfinding/NavigationMesh.hpp @@ -18,21 +18,21 @@ namespace omath::pathfinding }; - class OMATH_API NavigationMesh final + class NavigationMesh final { public: [[nodiscard]] - std::expected GetClosestVertex(const Vector3& point) const; + OMATH_API std::expected GetClosestVertex(const Vector3& point) const; [[nodiscard]] - const std::vector& GetNeighbors(const Vector3& vertex) const; + OMATH_API const std::vector& GetNeighbors(const Vector3& vertex) const; [[nodiscard]] - bool Empty() const; + OMATH_API bool Empty() const; [[nodiscard]] std::vector Serialize() const; - void Deserialize(const std::vector& raw); + OMATH_API void Deserialize(const std::vector& raw); std::unordered_map> m_verTextMap; };