* Add CVector2f

CVector2f.cpp

@@ -0,0 +1,52 @@
+#include "CVector2f.hpp"
+#include <memory.h>
+#include <cmath>
+#include <assert.h>
+#include "Math.hpp"
+
+const CVector2f CVector2f::skOne = CVector2f(1.0);
+const CVector2f CVector2f::skNegOne = CVector2f(-1.0);
+const CVector2f CVector2f::skZero;
+
+float CVector2f::getAngleDiff(const CVector2f& a, const CVector2f& b)
+{
+    float mag1 = a.length();
+    float mag2 = b.length();
+
+    if (!mag1 || !mag2)
+        return 0;
+
+    float theta = acosf(a.dot(b) / (mag1 * mag2));
+    return theta;
+}
+
+CVector2f CVector2f::slerp(const CVector2f& a, const CVector2f& b, float t)
+{
+    if (t <= 0.0f)
+        return a;
+    if (t >= 1.0f)
+        return b;
+
+    CVector2f ret;
+
+    float mag = sqrtf(a.dot(a) * b.dot(b));
+
+    float prod = a.dot(b) / mag;
+
+    if (fabsf(prod) < 1.0)
+    {
+        const double sign = (prod < 0.0) ? -1.0 : 1.0;
+
+        const double theta = acos(sign * prod);
+        const double s1 = sin (sign * t * theta);
+        const double d = 1.0 / sin(theta);
+        const double s0 = sin((1.0 - t) * theta);
+
+        ret.x = (float)(a.x * s0 + b.x * s1) * d;
+        ret.y = (float)(a.y * s0 + b.y * s1) * d;
+
+        return ret;
+    }
+    return a;
+}
+

CVector2f.hpp

@@ -0,0 +1,291 @@
+#ifndef CVector2f_HPP
+#define CVector2f_HPP
+
+#include "Global.hpp"
+#include <Athena/IStreamReader.hpp>
+#include <math.h>
+#include <assert.h>
+#include "CVector3f.hpp"
+
+
+class ZE_ALIGN(16) CVector2f
+{
+public:
+    ZE_DECLARE_ALIGNED_ALLOCATOR();
+
+    inline CVector2f() {zeroOut();}
+#if __SSE__
+    CVector2f(const __m128& mVec128) : mVec128(mVec128) {v[2] = 0.0f; v[3] = 0.0f;}
+#endif
+    CVector2f(float xyz) {splat(xyz);}
+    CVector2f(float x, float y) {v[0] = x; v[1] = y; v[2] = 0; v[3] = 0.0;}
+    CVector2f(Athena::io::IStreamReader& input)
+    {
+        x = input.readFloat();
+        y = input.readFloat();
+        v[2] = 0.0f;
+        v[3] = 0.0f;
+    }
+
+    inline bool operator ==(const CVector2f& rhs) const
+    {return (x == rhs.x && y == rhs.y);}
+    inline bool operator !=(const CVector2f& rhs) const
+    {return !(x == rhs.x && y == rhs.y);}
+    inline CVector2f operator+(const CVector2f& rhs) const
+    {
+#if __SSE__
+        return CVector2f(_mm_add_ps(mVec128, rhs.mVec128));
+#else
+        return CVector2f(x + rhs.x, y + rhs.y);
+#endif
+    }
+    inline CVector2f operator-(const CVector2f& rhs) const
+    {
+#if __SSE__
+        return CVector2f(_mm_sub_ps(mVec128, rhs.mVec128));
+#else
+        return CVector2f(x - rhs.x, y - rhs.y);
+#endif
+    }
+    inline CVector2f operator-() const
+    {
+#if __SSE__
+        return CVector2f(_mm_sub_ps(_mm_xor_ps(mVec128, mVec128), mVec128));
+#else
+        return CVector2f(-x, -y);
+#endif
+    }
+    inline CVector2f operator*(const CVector2f& rhs) const
+    {
+#if __SSE__
+        return CVector2f(_mm_mul_ps(mVec128, rhs.mVec128));
+#else
+        return CVector2f(x * rhs.x, y * rhs.y);
+#endif
+    }
+    inline CVector2f operator/(const CVector2f& rhs) const
+    {
+#if __SSE__
+        return CVector2f(_mm_div_ps(mVec128, rhs.mVec128));
+#else
+        return CVector2f(x / rhs.x, y / rhs.y);
+#endif
+    }
+    inline CVector2f operator+(float val) const
+    {
+#if __SSE__
+        TVectorUnion splat = {{val, val, 0.0, 0.0}};
+        return CVector2f(_mm_add_ps(mVec128, splat.mVec128));
+#else
+        return CVector2f(x + val, y + val);
+#endif
+    }
+    inline CVector2f operator-(float val) const
+    {
+#if __SSE__
+        TVectorUnion splat = {{val, val, 0.0, 0.0}};
+        return CVector2f(_mm_sub_ps(mVec128, splat.mVec128));
+#else
+        return CVector2f(x - val, y - val);
+#endif
+    }
+    inline CVector2f operator*(float val) const
+    {
+#if __SSE__
+        TVectorUnion splat = {{val, val, 0.0, 0.0}};
+        return CVector2f(_mm_mul_ps(mVec128, splat.mVec128));
+#else
+        return CVector2f(x * val, y * val);
+#endif
+    }
+    inline CVector2f operator/(float val) const
+    {
+#if __SSE__
+        TVectorUnion splat = {{val, val, val, 0.0}};
+        return CVector2f(_mm_div_ps(mVec128, splat.mVec128));
+#else
+        return CVector2f(x / val, y / val);
+#endif
+    }
+    inline const CVector2f& operator +=(const CVector2f& rhs)
+    {
+#if __SSE__
+        mVec128 = _mm_add_ps(mVec128, rhs.mVec128);
+#else
+        x += rhs.x; y += rhs.y;
+#endif
+        return *this;
+    }
+    inline const CVector2f& operator -=(const CVector2f& rhs)
+    {
+#if __SSE__
+        mVec128 = _mm_sub_ps(mVec128, rhs.mVec128);
+#else
+        x -= rhs.x; y -= rhs.y;
+#endif
+        return *this;
+    }
+    inline const CVector2f& operator *=(const CVector2f& rhs)
+    {
+#if __SSE__
+        mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
+#else
+        x *= rhs.x; y *= rhs.y;
+#endif
+        return *this;
+    }
+    inline const CVector2f& operator /=(const CVector2f& rhs)
+    {
+#if __SSE__
+        mVec128 = _mm_div_ps(mVec128, rhs.mVec128);
+#else
+        x /= rhs.x; y /= rhs.y;
+#endif
+        return *this;
+    }
+    inline void normalize()
+    {
+        float mag = length();
+        assert(mag != 0.0);
+        mag = 1.0 / mag;
+        *this *= mag;
+    }
+    inline CVector2f normalized() const
+    {
+        float mag = length();
+        assert(mag != 0.0);
+        mag = 1.0 / mag;
+        return *this * mag;
+    }
+    inline float cross(const CVector2f& rhs) const
+    {
+        return (x * rhs.y) - (y * rhs.x);
+    }
+    inline float dot(const CVector2f& rhs) const
+    {
+#if __SSE4_1__
+        TVectorUnion result;
+        result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x71);
+        return result.v[0];
+#elif __SSE__
+        TVectorUnion result;
+        result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
+        return result.v[0] + result.v[1];
+#else
+        return (x * rhs.x) + (y * rhs.y);
+#endif
+    }
+    inline float lengthSquared() const
+    {
+#if __SSE4_1__
+        TVectorUnion result;
+        result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0x71);
+        return result.v[0];
+#elif __SSE__
+        TVectorUnion result;
+        result.mVec128 = _mm_mul_ps(mVec128, mVec128);
+        return result.v[0] + result.v[1];
+#else
+        return x*x + y*y;
+#endif
+    }
+    inline float length() const
+    {
+        return sqrtf(lengthSquared());
+    }
+
+    inline void zeroOut()
+    {
+#if __SSE__
+        mVec128 = _mm_xor_ps(mVec128, mVec128);
+#else
+        v[0] = 0.0; v[1] = 0.0; v[2] = 0.0; v[3] = 0.0;
+#endif
+    }
+
+    inline void splat(float xyz)
+    {
+#if __SSE__
+        TVectorUnion splat = {{xyz, xyz, 0.0f, 0.0f}};
+        mVec128 = splat.mVec128;
+#else
+        v[0] = xyz; v[1] = xyz; v[2] = 0.0f; v[3] = 0.0f;
+#endif
+    }
+
+    static float getAngleDiff(const CVector2f& a, const CVector2f& b);
+
+    static inline CVector2f lerp(const CVector2f& a, const CVector2f& b, float t)
+    {
+        return (a + (b - a) * t);
+    }
+    static inline CVector2f nlerp(const CVector2f& a, const CVector2f& b, float t)
+    {
+        return lerp(a, b, t).normalized();
+    }
+    static CVector2f slerp(const CVector2f& a, const CVector2f& b, float t);
+
+
+    inline float& operator[](size_t idx) {return (&x)[idx];}
+    inline const float& operator[](size_t idx) const {return (&x)[idx];}
+
+
+    union
+    {
+        struct
+        {
+            float x, y;
+        };
+        float v[4];
+#if __SSE__
+        __m128 mVec128;
+#endif
+    };
+
+    static const CVector2f skOne;
+    static const CVector2f skNegOne;
+    static const CVector2f skZero;
+};
+
+
+static inline CVector2f operator+(float lhs, const CVector2f& rhs)
+{
+#if __SSE__
+    TVectorUnion splat = {{lhs, lhs, 0.0, 0.0}};
+    return CVector2f(_mm_add_ps(splat.mVec128, rhs.mVec128));
+#else
+    return CVector2f(lhs + rhs.x, lhs + rhs.y);
+#endif
+}
+
+static inline CVector2f operator-(float lhs, const CVector2f& rhs)
+{
+#if __SSE__
+    TVectorUnion splat = {{lhs, lhs, 0.0, 0.0}};
+    return CVector2f(_mm_sub_ps(splat.mVec128, rhs.mVec128));
+#else
+    return CVector2f(lhs - rhs.x, lhs - rhs.y);
+#endif
+}
+
+static inline CVector2f operator*(float lhs, const CVector2f& rhs)
+{
+#if __SSE__
+    TVectorUnion splat = {{lhs, lhs, 0.0, 0.0}};
+    return CVector2f(_mm_mul_ps(splat.mVec128, rhs.mVec128));
+#else
+    return CVector2f(lhs * rhs.x, lhs * rhs.y);
+#endif
+}
+
+static inline CVector2f operator/(float lhs, const CVector2f& rhs)
+{
+#if __SSE__
+    TVectorUnion splat = {{lhs, lhs, 0.0, 0.0}};
+    return CVector2f(_mm_div_ps(splat.mVec128, rhs.mVec128));
+#else
+    return CVector2f(lhs / rhs.x, lhs / rhs.y);
+#endif
+}
+
+#endif // CVECTOR2F_HPP

MathLib.hpp

@@ -6,6 +6,7 @@
 #include "CProjection.hpp"
 #include "CTransform.hpp"
 #include "CQuaternion.hpp"
+#include "CVector2f.hpp"
 #include "CVector3d.hpp"
 #include "CVector3f.hpp"
 #include "CPlane.hpp"

MathLib.pri

@@ -6,7 +6,8 @@ SOURCES += \
     $$PWD/CMatrix3f.cpp \
     $$PWD/CProjection.cpp \
     $$PWD/CPlane.cpp \
-    $$PWD/CTransform.cpp
+    $$PWD/CTransform.cpp \
+    $$PWD/CVector2f.cpp
 
 HEADERS += \
     $$PWD/CVector3f.hpp \
@@ -20,6 +21,7 @@ HEADERS += \
     $$PWD/CTransform.hpp \
     $$PWD/CColor.hpp \
     $$PWD/Global.hpp \
-    $$PWD/MathLib.hpp
+    $$PWD/MathLib.hpp \
+    $$PWD/CVector2f.hpp
 
 INCLUDEPATH += $$PWD