Merge pull request #140 from MonsterDruide1/vector2-dot-cross

math/seadVector2: Implement dot, cross, squaredLength
open-ead · Jun 19, 2024 · d6a6f42 · d6a6f42
2 parents 99d6733 + 4965eec
commit d6a6f42
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/include/math/seadVector.h b/include/math/seadVector.h
@@ -59,7 +59,11 @@ struct Vector2 : public Policies<T>::Vec2Base
     void set(const Vector2& other);
     void set(T x_, T y_);
 
+    T dot(const Vector2& other) const;
+    T cross(const Vector2& other) const;
     T length() const;
+    T squaredLength() const;
+
     bool isZero() const { return *this == zero; }
 
     static const Vector2 zero;

diff --git a/include/math/seadVector.hpp b/include/math/seadVector.hpp
@@ -63,12 +63,30 @@ inline void Vector2<T>::set(T x_, T y_)
     Vector2CalcCommon<T>::set(*this, x_, y_);
 }
 
+template <typename T>
+inline T Vector2<T>::dot(const Vector2<T>& t) const
+{
+    return Vector2CalcCommon<T>::dot(*this, t);
+}
+
+template <typename T>
+inline T Vector2<T>::cross(const Vector2<T>& t) const
+{
+    return Vector2CalcCommon<T>::cross(*this, t);
+}
+
 template <typename T>
 inline T Vector2<T>::length() const
 {
     return Vector2CalcCommon<T>::length(*this);
 }
 
+template <typename T>
+inline T Vector2<T>::squaredLength() const
+{
+    return Vector2CalcCommon<T>::squaredLength(*this);
+}
+
 template <typename T>
 inline Vector3<T>::Vector3(T x_, T y_, T z_)
 {

diff --git a/include/math/seadVectorCalcCommon.h b/include/math/seadVectorCalcCommon.h
@@ -17,6 +17,8 @@ class Vector2CalcCommon
     static void set(Base& o, const Base& v);
     static void set(Base& v, T x, T y);
 
+    static T dot(const Base& a, const Base& b);
+    static T cross(const Base& a, const Base& b);
     static T squaredLength(const Base& v);
     static T length(const Base& v);
 };

diff --git a/include/math/seadVectorCalcCommon.hpp b/include/math/seadVectorCalcCommon.hpp
@@ -39,6 +39,18 @@ inline void Vector2CalcCommon<T>::set(Base& v, T x, T y)
     v.y = y;
 }
 
+template <typename T>
+inline T Vector2CalcCommon<T>::dot(const Base& a, const Base& b)
+{
+    return a.x * b.x + a.y * b.y;
+}
+
+template <typename T>
+inline T Vector2CalcCommon<T>::cross(const Base& a, const Base& b)
+{
+    return a.x * b.y - a.y * b.x;
+}
+
 template <typename T>
 inline T Vector2CalcCommon<T>::squaredLength(const Base& v)
 {