From 28539bed960763b4c57608960d14680a6509cbc3 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 31 Mar 2024 20:40:59 +0200 Subject: [PATCH] better rage::vector3 class (#165) --- rage/vector.hpp | 218 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 184 insertions(+), 34 deletions(-) diff --git a/rage/vector.hpp b/rage/vector.hpp index c83f9e5..ced7d56 100644 --- a/rage/vector.hpp +++ b/rage/vector.hpp @@ -2,81 +2,231 @@ namespace rage { - template + template union vector2 { T data[2]; - struct { T x, y; }; + struct + { + T x, y; + }; - vector2(T x, T y) : - x(x), - y(y) + vector2(T x, T y) : x(x), + y(y) { } - vector2() : - x(), - y() + vector2() : x(), + y() { } }; - template + template union vector3 { T data[3]; - struct { T x, y, z; }; + struct + { + T x, y, z; + }; - vector3(T x, T y, T z) : - x(x), - y(y), - z(z) + vector3(T x, T y, T z) noexcept : x(x), + y(y), + z(z) { } - vector3() : - x(), - y(), - z() + vector3() noexcept : x(), + y(), + z() { } + + vector3 operator+(const vector3 &rhs) const + { + return vector3(x + rhs.x, y + rhs.y, z + rhs.z); + } + + vector3 operator-(const vector3 &rhs) const + { + return vector3(x - rhs.x, y - rhs.y, z - rhs.z); + } + + vector3 operator*(const vector3 &rhs) const + { + return vector3(x * rhs.x, y * rhs.y, z * rhs.z); + } + + vector3 operator/(const vector3 &rhs) const + { + return vector3(x / rhs.x, y / rhs.y, z / rhs.z); + } + + vector3 operator+(const float &rhs) const + { + return vector3(x + rhs, y + rhs, z + rhs); + } + + vector3 operator-(const float &rhs) const + { + return vector3(x - rhs, y - rhs, z - rhs); + } + + vector3 operator*(const float &rhs) const + { + return vector3(x * rhs, y * rhs, z * rhs); + } + + vector3 operator/(const float &rhs) const + { + return vector3(x / rhs, y / rhs, z / rhs); + } + + bool operator==(const vector3 &rhs) const + { + return x == rhs.x && y == rhs.y && z == rhs.z; + } + + vector3 &operator+=(const vector3 &rhs) + { + return *this = *this + rhs; + } + + vector3 &operator-=(const vector3 &rhs) + { + return *this = *this - rhs; + } + + vector3 &operator*=(const vector3 &rhs) + { + return *this = *this * rhs; + } + + vector3 &operator/=(const vector3 &rhs) + { + return *this = *this / rhs; + } + + vector3 &operator+=(const float &rhs) + { + return *this = *this + rhs; + } + + vector3 &operator-=(const float &rhs) + { + return *this = *this - rhs; + } + + vector3 &operator*=(const float &rhs) + { + return *this = *this * rhs; + } + + vector3 &operator/=(const float &rhs) + { + return *this = *this / rhs; + } + + T length() const + { + return sqrt(x * x + y * y + z * z); + } + + T magnitude() const + { + return length(); + } + + // This doesn't modify the vector inline. + vector3 normalize() const + { + T len = length(); + if (len) + { + return *this * (1 / len); + } + + return *this; + } + + // This doesn't modify the vector inline. + vector3 multiply(const vector3 rhs) const + { + return vector3(x * rhs.x, y * rhs.y, z * rhs.z); + } + + // This doesn't modify the vector inline. + vector3 invert() const + { + return *this * -1; + } + + // This doesn't modify the vector inline. + vector3 cross_product(const vector3 &rhs) const + { + return vector3(y * rhs.z - z * rhs.y, z * rhs.x - x * rhs.z, x * rhs.y - y * rhs.x); + } + + float dot_product(const vector3 &rhs) const + { + return x * rhs.x + y * rhs.y + z * rhs.z; + } + + float distance(const vector3 &rhs) const + { + return (*this - rhs).length(); + } }; - template + template union vector4 { T data[4]; - struct { T x, y, z, w; }; + struct + { + T x, y, z, w; + }; - vector4(T x, T y, T z, T w) : - x(x), - y(y), - z(z), - w(w) + vector4(T x, T y, T z, T w) : x(x), + y(y), + z(z), + w(w) { } - vector4() : - x(), - y(), - z(), - w() + vector4() : x(), + y(), + z(), + w() { } }; - template + template union matrix34 { T data[3][4]; - struct { struct { T x, y, z, w; } rows[3]; }; + struct + { + struct + { + T x, y, z, w; + } rows[3]; + }; }; - template + template union matrix44 { T data[4][4]; - struct { struct { T x, y, z, w; } rows[4]; }; + struct + { + struct + { + T x, y, z, w; + } rows[4]; + }; }; typedef vector2 fvector2;