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

Improve math module (#396)

Browse Source 
* Improve math module

- Mark almost everything constexpr
- Equality (a == b) is now exact, down to the bit level. If you want approximate equality use the new ApproxEqual method/static method
- Rename Nz::Extend to Nz::Extent
- Removed Make[] and Set[] methods in favor of their static counterpart and operator=
This commit is contained in:
Jérôme Leclercq
2023-06-02 22:30:51 +02:00
committed by GitHub
parent de88873c35
commit 1a55b550fb
64 changed files with 2200 additions and 3758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
include/Nazara/Math/Vector4.hpp
View File

@@ -23,81 +23,71 @@ namespace Nz
class Vector4
{
public:
Vector4() = default;
Vector4(T X, T Y, T Z, T W = 1.0);
Vector4(T X, T Y, const Vector2<T>& vec);
Vector4(T X, const Vector2<T>& vec, T W);
Vector4(T X, const Vector3<T>& vec);
explicit Vector4(T scale);
Vector4(const Vector2<T>& vec, T Z = 0.0, T W = 1.0);
Vector4(const Vector3<T>& vec, T W = 1.0);
template<typename U> explicit Vector4(const Vector4<U>& vec);
Vector4(const Vector4& vec) = default;
constexpr Vector4() = default;
constexpr Vector4(T X, T Y, T Z, T W = 1.0);
constexpr Vector4(T X, T Y, const Vector2<T>& vec);
constexpr Vector4(T X, const Vector2<T>& vec, T W);
constexpr Vector4(T X, const Vector3<T>& vec);
constexpr explicit Vector4(T scale);
constexpr Vector4(const Vector2<T>& vec, T Z = 0.0, T W = 1.0);
constexpr Vector4(const Vector3<T>& vec, T W = 1.0);
template<typename U> constexpr explicit Vector4(const Vector4<U>& vec);
constexpr Vector4(const Vector4&) = default;
constexpr Vector4(Vector4&&) = default;
~Vector4() = default;
T AbsDotProduct(const Vector4& vec) const;
constexpr bool ApproxEqual(const Vector4& vec, T maxDifference = std::numeric_limits<T>::epsilon()) const;
T DotProduct(const Vector4& vec) const;
constexpr T DotProduct(const Vector4& vec) const;
Vector4 GetNormal(T* length = nullptr) const;
Vector4& MakeUnitX();
Vector4& MakeUnitY();
Vector4& MakeUnitZ();
Vector4& MakeZero();
Vector4& Maximize(const Vector4& vec);
Vector4& Minimize(const Vector4& vec);
constexpr Vector4& Maximize(const Vector4& vec);
constexpr Vector4& Minimize(const Vector4& vec);
Vector4& Normalize(T* length = nullptr);
Vector4& Set(T X, T Y, T Z, T W = 1.0);
Vector4& Set(T X, T Y, const Vector2<T>& vec);
Vector4& Set(T X, const Vector2<T>& vec, T W);
Vector4& Set(T X, const Vector3<T>& vec);
Vector4& Set(T scale);
Vector4& Set(const T* vec);
Vector4& Set(const Vector2<T>& vec, T Z = 0.0, T W = 1.0);
Vector4& Set(const Vector3<T>& vec, T W = 1.0);
template<typename U> Vector4& Set(const Vector4<U>& vec);
std::string ToString() const;
T& operator[](std::size_t i);
T operator[](std::size_t i) const;
constexpr Vector4& operator=(const Vector4&) = default;
constexpr Vector4& operator=(Vector4&&) = default;
const Vector4& operator+() const;
Vector4 operator-() const;
constexpr T& operator[](std::size_t i);
constexpr const T& operator[](std::size_t i) const;
Vector4 operator+(const Vector4& vec) const;
Vector4 operator-(const Vector4& vec) const;
Vector4 operator*(const Vector4& vec) const;
Vector4 operator*(T scale) const;
Vector4 operator/(const Vector4& vec) const;
Vector4 operator/(T scale) const;
Vector4& operator=(const Vector4& other) = default;
constexpr const Vector4& operator+() const;
constexpr Vector4 operator-() const;
Vector4& operator+=(const Vector4& vec);
Vector4& operator-=(const Vector4& vec);
Vector4& operator*=(const Vector4& vec);
Vector4& operator*=(T scale);
Vector4& operator/=(const Vector4& vec);
Vector4& operator/=(T scale);
constexpr Vector4 operator+(const Vector4& vec) const;
constexpr Vector4 operator-(const Vector4& vec) const;
constexpr Vector4 operator*(const Vector4& vec) const;
constexpr Vector4 operator*(T scale) const;
constexpr Vector4 operator/(const Vector4& vec) const;
constexpr Vector4 operator/(T scale) const;
bool operator==(const Vector4& vec) const;
bool operator!=(const Vector4& vec) const;
bool operator<(const Vector4& vec) const;
bool operator<=(const Vector4& vec) const;
bool operator>(const Vector4& vec) const;
bool operator>=(const Vector4& vec) const;
constexpr Vector4& operator+=(const Vector4& vec);
constexpr Vector4& operator-=(const Vector4& vec);
constexpr Vector4& operator*=(const Vector4& vec);
constexpr Vector4& operator*=(T scale);
constexpr Vector4& operator/=(const Vector4& vec);
constexpr Vector4& operator/=(T scale);
static T DotProduct(const Vector4& vec1, const Vector4& vec2);
static Vector4 Lerp(const Vector4& from, const Vector4& to, T interpolation);
constexpr bool operator==(const Vector4& vec) const;
constexpr bool operator!=(const Vector4& vec) const;
constexpr bool operator<(const Vector4& vec) const;
constexpr bool operator<=(const Vector4& vec) const;
constexpr bool operator>(const Vector4& vec) const;
constexpr bool operator>=(const Vector4& vec) const;
static constexpr bool ApproxEqual(const Vector4& lhs, const Vector4& rhs, T maxDifference = std::numeric_limits<T>::epsilon());
static constexpr T DotProduct(const Vector4& vec1, const Vector4& vec2);
static constexpr Vector4 Lerp(const Vector4& from, const Vector4& to, T interpolation);
static Vector4 Normalize(const Vector4& vec);
static Vector4 UnitX();
static Vector4 UnitY();
static Vector4 UnitZ();
static Vector4 Zero();
static constexpr Vector4 UnitX();
static constexpr Vector4 UnitY();
static constexpr Vector4 UnitZ();
static constexpr Vector4 Zero();
T x, y, z, w;
};
@@ -116,8 +106,8 @@ namespace Nz
template<typename T> std::ostream& operator<<(std::ostream& out, const Vector4<T>& vec);
template<typename T> Vector4<T> operator*(T scale, const Vector4<T>& vec);
template<typename T> Vector4<T> operator/(T scale, const Vector4<T>& vec);
template<typename T> constexpr Vector4<T> operator*(T scale, const Vector4<T>& vec);
template<typename T> constexpr Vector4<T> operator/(T scale, const Vector4<T>& vec);
}
namespace std