From adbd81d3937a1363af312202c7e4b5ec0bf3458d Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 21 Nov 2024 17:04:37 +0100 Subject: Made Vector2 templated --- src/crepe/api/Vector2.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/crepe/api/Vector2.h') diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h index 2fb6136..0e41936 100644 --- a/src/crepe/api/Vector2.h +++ b/src/crepe/api/Vector2.h @@ -3,11 +3,12 @@ namespace crepe { //! 2D vector +template struct Vector2 { //! X component of the vector - double x = 0; + T x = 0; //! Y component of the vector - double y = 0; + T y = 0; //! Subtracts another vector from this vector and returns the result. Vector2 operator-(const Vector2 & other) const; @@ -38,3 +39,5 @@ struct Vector2 { }; } // namespace crepe + +#include "Vector2.hpp" -- cgit v1.2.3 From c3b558b6b622c16badf2f325b5422f3b042009b4 Mon Sep 17 00:00:00 2001 From: max-001 Date: Thu, 21 Nov 2024 17:32:04 +0100 Subject: Extended Vector2 --- src/crepe/api/Vector2.h | 38 +++++++++++++++++-- src/crepe/api/Vector2.hpp | 94 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 117 insertions(+), 15 deletions(-) (limited to 'src/crepe/api/Vector2.h') diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h index 0e41936..b682d28 100644 --- a/src/crepe/api/Vector2.h +++ b/src/crepe/api/Vector2.h @@ -13,20 +13,50 @@ struct Vector2 { //! Subtracts another vector from this vector and returns the result. Vector2 operator-(const Vector2 & other) const; + //! Subtracts a scalar value from both components of this vector and returns the result. + Vector2 operator-(T scalar) const; + //! Adds another vector to this vector and returns the result. Vector2 operator+(const Vector2 & other) const; + //! Adds a scalar value to both components of this vector and returns the result. + Vector2 operator+(T scalar) const; + + //! Multiplies this vector by another vector element-wise and returns the result. + Vector2 operator*(const Vector2 & other) const; + //! Multiplies this vector by a scalar and returns the result. - Vector2 operator*(double scalar) const; + Vector2 operator*(T scalar) const; - //! Multiplies this vector by another vector element-wise and updates this vector. - Vector2 & operator*=(const Vector2 & other); + //! Divides this vector by another vector element-wise and returns the result. + Vector2 operator/(const Vector2 & other) const; + + //! Divides this vector by a scalar and returns the result. + Vector2 operator/(T scalar) const; //! Adds another vector to this vector and updates this vector. Vector2 & operator+=(const Vector2 & other); //! Adds a scalar value to both components of this vector and updates this vector. - Vector2 & operator+=(double other); + Vector2 & operator+=(T other); + + //! Subtracts another vector from this vector and updates this vector. + Vector2 & operator-=(const Vector2 & other); + + //! Subtracts a scalar value from both components of this vector and updates this vector. + Vector2 & operator-=(T other); + + //! Multiplies this vector by another vector element-wise and updates this vector. + Vector2 & operator*=(const Vector2 & other); + + //! Multiplies this vector by a scalar and updates this vector. + Vector2 & operator*=(T other); + + //! Divides this vector by another vector element-wise and updates this vector. + Vector2 & operator/=(const Vector2 & other); + + //! Divides this vector by a scalar and updates this vector. + Vector2 & operator/=(T other); //! Returns the negation of this vector. Vector2 operator-() const; diff --git a/src/crepe/api/Vector2.hpp b/src/crepe/api/Vector2.hpp index e0ac3d4..46553f9 100644 --- a/src/crepe/api/Vector2.hpp +++ b/src/crepe/api/Vector2.hpp @@ -3,19 +3,43 @@ namespace crepe { template -Vector2 Vector2::operator-(const Vector2 & other) const { return {x - other.x, y - other.y}; } +Vector2 Vector2::operator-(const Vector2 & other) const { + return {x - other.x, y - other.y}; +} template -Vector2 Vector2::operator+(const Vector2 & other) const { return {x + other.x, y + other.y}; } +Vector2 Vector2::operator-(T scalar) const { + return {x - scalar, y - scalar}; +} template -Vector2 Vector2::operator*(double scalar) const { return {x * scalar, y * scalar}; } +Vector2 Vector2::operator+(const Vector2 & other) const { + return {x + other.x, y + other.y}; +} template -Vector2 & Vector2::operator*=(const Vector2 & other) { - x *= other.x; - y *= other.y; - return *this; +Vector2 Vector2::operator+(T scalar) const { + return {x + scalar, y + scalar}; +} + +template +Vector2 Vector2::operator*(const Vector2 & other) const { + return {x * other.x, y * other.y}; +} + +template +Vector2 Vector2::operator*(T scalar) const { + return {x * scalar, y * scalar}; +} + +template +Vector2 Vector2::operator/(const Vector2 & other) const { + return {x / other.x, y / other.y}; +} + +template +Vector2 Vector2::operator/(T scalar) const { + return {x / scalar, y / scalar}; } template @@ -26,19 +50,67 @@ Vector2 & Vector2::operator+=(const Vector2 & other) { } template -Vector2 & Vector2::operator+=(double other) { +Vector2 & Vector2::operator+=(T other) { x += other; y += other; return *this; } template -Vector2 Vector2::operator-() const { return {-x, -y}; } +Vector2 & Vector2::operator-=(const Vector2 & other) { + x -= other.x; + y -= other.y; + return *this; +} template -bool Vector2::operator==(const Vector2 & other) const { return x == other.x && y == other.y; } +Vector2 & Vector2::operator-=(T other) { + x -= other; + y -= other; + return *this; +} template -bool Vector2::operator!=(const Vector2 & other) const { return !(*this == other); } +Vector2 & Vector2::operator*=(const Vector2 & other) { + x *= other.x; + y *= other.y; + return *this; +} + +template +Vector2 & Vector2::operator*=(T other) { + x *= other; + y *= other; + return *this; +} + +template +Vector2 & Vector2::operator/=(const Vector2 & other) { + x /= other.x; + y /= other.y; + return *this; +} + +template +Vector2 & Vector2::operator/=(T other) { + x /= other; + y /= other; + return *this; +} + +template +Vector2 Vector2::operator-() const { + return {-x, -y}; +} + +template +bool Vector2::operator==(const Vector2 & other) const { + return x == other.x && y == other.y; +} + +template +bool Vector2::operator!=(const Vector2 & other) const { + return !(*this == other); +} } // namespace crepe -- cgit v1.2.3 From a7e39f06b034b6f174997a0f62d93d47fbd64ad9 Mon Sep 17 00:00:00 2001 From: max-001 Date: Fri, 22 Nov 2024 08:52:00 +0100 Subject: Added to arguments --- src/crepe/api/Vector2.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/crepe/api/Vector2.h') diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h index b682d28..c278c87 100644 --- a/src/crepe/api/Vector2.h +++ b/src/crepe/api/Vector2.h @@ -11,49 +11,49 @@ struct Vector2 { T y = 0; //! Subtracts another vector from this vector and returns the result. - Vector2 operator-(const Vector2 & other) const; + Vector2 operator-(const Vector2 & other) const; //! Subtracts a scalar value from both components of this vector and returns the result. Vector2 operator-(T scalar) const; //! Adds another vector to this vector and returns the result. - Vector2 operator+(const Vector2 & other) const; + Vector2 operator+(const Vector2 & other) const; //! Adds a scalar value to both components of this vector and returns the result. Vector2 operator+(T scalar) const; //! Multiplies this vector by another vector element-wise and returns the result. - Vector2 operator*(const Vector2 & other) const; + Vector2 operator*(const Vector2 & other) const; //! Multiplies this vector by a scalar and returns the result. Vector2 operator*(T scalar) const; //! Divides this vector by another vector element-wise and returns the result. - Vector2 operator/(const Vector2 & other) const; + Vector2 operator/(const Vector2 & other) const; //! Divides this vector by a scalar and returns the result. Vector2 operator/(T scalar) const; //! Adds another vector to this vector and updates this vector. - Vector2 & operator+=(const Vector2 & other); + Vector2 & operator+=(const Vector2 & other); //! Adds a scalar value to both components of this vector and updates this vector. Vector2 & operator+=(T other); //! Subtracts another vector from this vector and updates this vector. - Vector2 & operator-=(const Vector2 & other); + Vector2 & operator-=(const Vector2 & other); //! Subtracts a scalar value from both components of this vector and updates this vector. Vector2 & operator-=(T other); //! Multiplies this vector by another vector element-wise and updates this vector. - Vector2 & operator*=(const Vector2 & other); + Vector2 & operator*=(const Vector2 & other); //! Multiplies this vector by a scalar and updates this vector. Vector2 & operator*=(T other); //! Divides this vector by another vector element-wise and updates this vector. - Vector2 & operator/=(const Vector2 & other); + Vector2 & operator/=(const Vector2 & other); //! Divides this vector by a scalar and updates this vector. Vector2 & operator/=(T other); @@ -62,10 +62,10 @@ struct Vector2 { Vector2 operator-() const; //! Checks if this vector is equal to another vector. - bool operator==(const Vector2 & other) const; + bool operator==(const Vector2 & other) const; //! Checks if this vector is not equal to another vector. - bool operator!=(const Vector2 & other) const; + bool operator!=(const Vector2 & other) const; }; } // namespace crepe -- cgit v1.2.3