AxioDL/zeus
2
0
Fork 0
mirror of https://github.com/AxioDL/zeus.git synced 2025-12-20 02:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Make a proper Matrix4 implementation (WIP)

Browse Source 
* Add CVector4f
* Add CRectangle (for 2D AABBs)
This commit is contained in:
Phillip Stephens
2015-05-06 00:05:06 -07:00
parent 08a6903fe4
commit 271df619e5
18 changed files with 672 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
CProjection.hpp
View File

@@ -2,118 +2,12 @@
#define CPROJECTION_HPP
#include "Global.hpp"
#include "CMatrix4f.hpp"
#include <stdexcept>
#define _USE_MATH_DEFINES 1
#include <math.h>
union TMatrix4f
{
float m[4][4];
#if __SSE__
__m128 mVec128[4];
#endif
inline TMatrix4f transposed()
{
TMatrix4f ret;
#if __SSE__
__m128 T0 = _mm_unpacklo_ps(mVec128[0], mVec128[1]);
__m128 T2 = _mm_unpacklo_ps(mVec128[2], mVec128[3]);
__m128 T1 = _mm_unpackhi_ps(mVec128[0], mVec128[1]);
__m128 T3 = _mm_unpackhi_ps(mVec128[2], mVec128[3]);
ret.mVec128[0] = _mm_movelh_ps(T0, T2);
ret.mVec128[1] = _mm_movehl_ps(T2, T0);
ret.mVec128[2] = _mm_movelh_ps(T1, T3);
ret.mVec128[3] = _mm_movehl_ps(T3, T1);
#else
ret.m[0][0] = m[0][0];
ret.m[1][0] = m[0][1];
ret.m[2][0] = m[0][2];
ret.m[3][0] = m[0][3];
ret.m[0][1] = m[1][0];
ret.m[1][1] = m[1][1];
ret.m[2][1] = m[1][2];
ret.m[3][1] = m[1][3];
ret.m[0][2] = m[2][0];
ret.m[1][2] = m[2][1];
ret.m[2][2] = m[2][2];
ret.m[3][2] = m[2][3];
ret.m[0][3] = m[3][0];
ret.m[1][3] = m[3][1];
ret.m[2][3] = m[3][2];
ret.m[3][3] = m[3][3];
#endif
return ret;
}
inline TMatrix4f& operator=(const TMatrix4f& other)
{
#if __SSE__
mVec128[0] = other.mVec128[0];
mVec128[1] = other.mVec128[1];
mVec128[2] = other.mVec128[2];
mVec128[3] = other.mVec128[3];
#else
m[0][0] = other.m[0][0];
m[0][1] = other.m[0][1];
m[0][2] = other.m[0][2];
m[0][3] = other.m[0][3];
m[1][0] = other.m[1][0];
m[1][1] = other.m[1][1];
m[1][2] = other.m[1][2];
m[1][3] = other.m[1][3];
m[2][0] = other.m[2][0];
m[2][1] = other.m[2][1];
m[2][2] = other.m[2][2];
m[2][3] = other.m[2][3];
m[3][0] = other.m[3][0];
m[3][1] = other.m[3][1];
m[3][2] = other.m[3][2];
m[3][3] = other.m[3][3];
#endif
return *this;
}
};
static inline TMatrix4f operator*(const TMatrix4f& lhs, const TMatrix4f& rhs)
{
TMatrix4f ret;
#if __SSE__
unsigned i;
for (i=0 ; i<4 ; ++i) {
ret.mVec128[i] =
_mm_add_ps(_mm_add_ps(_mm_add_ps(
_mm_mul_ps(lhs.mVec128[0], _mm_shuffle_ps(rhs.mVec128[i], rhs.mVec128[i], _MM_SHUFFLE(0, 0, 0, 0))),
_mm_mul_ps(lhs.mVec128[1], _mm_shuffle_ps(rhs.mVec128[i], rhs.mVec128[i], _MM_SHUFFLE(1, 1, 1, 1)))),
_mm_mul_ps(lhs.mVec128[2], _mm_shuffle_ps(rhs.mVec128[i], rhs.mVec128[i], _MM_SHUFFLE(2, 2, 2, 2)))),
_mm_mul_ps(lhs.mVec128[3], _mm_shuffle_ps(rhs.mVec128[i], rhs.mVec128[i], _MM_SHUFFLE(3, 3, 3, 3))));
}
#else
ret.m[0][0] = lhs.m[0][0]*rhs.m[0][0] + lhs.m[1][0]*rhs.m[0][1] + lhs.m[2][0]*rhs.m[0][2] + lhs.m[3][0]*rhs.m[0][3];
ret.m[1][0] = lhs.m[0][0]*rhs.m[1][0] + lhs.m[1][0]*rhs.m[1][1] + lhs.m[2][0]*rhs.m[1][2] + lhs.m[3][0]*rhs.m[1][3];
ret.m[2][0] = lhs.m[0][0]*rhs.m[2][0] + lhs.m[1][0]*rhs.m[2][1] + lhs.m[2][0]*rhs.m[2][2] + lhs.m[3][0]*rhs.m[2][3];
ret.m[3][0] = lhs.m[0][0]*rhs.m[3][0] + lhs.m[1][0]*rhs.m[3][1] + lhs.m[2][0]*rhs.m[3][2] + lhs.m[3][0]*rhs.m[3][3];
ret.m[0][1] = lhs.m[0][1]*rhs.m[0][0] + lhs.m[1][1]*rhs.m[0][1] + lhs.m[2][1]*rhs.m[0][2] + lhs.m[3][1]*rhs.m[0][3];
ret.m[1][1] = lhs.m[0][1]*rhs.m[1][0] + lhs.m[1][1]*rhs.m[1][1] + lhs.m[2][1]*rhs.m[1][2] + lhs.m[3][1]*rhs.m[1][3];
ret.m[2][1] = lhs.m[0][1]*rhs.m[2][0] + lhs.m[1][1]*rhs.m[2][1] + lhs.m[2][1]*rhs.m[2][2] + lhs.m[3][1]*rhs.m[2][3];
ret.m[3][1] = lhs.m[0][1]*rhs.m[3][0] + lhs.m[1][1]*rhs.m[3][1] + lhs.m[2][1]*rhs.m[3][2] + lhs.m[3][1]*rhs.m[3][3];
ret.m[0][2] = lhs.m[0][2]*rhs.m[0][0] + lhs.m[1][2]*rhs.m[0][1] + lhs.m[2][2]*rhs.m[0][2] + lhs.m[3][2]*rhs.m[0][3];
ret.m[1][2] = lhs.m[0][2]*rhs.m[1][0] + lhs.m[1][2]*rhs.m[1][1] + lhs.m[2][2]*rhs.m[1][2] + lhs.m[3][2]*rhs.m[1][3];
ret.m[2][2] = lhs.m[0][2]*rhs.m[2][0] + lhs.m[1][2]*rhs.m[2][1] + lhs.m[2][2]*rhs.m[2][2] + lhs.m[3][2]*rhs.m[2][3];
ret.m[3][2] = lhs.m[0][2]*rhs.m[3][0] + lhs.m[1][2]*rhs.m[3][1] + lhs.m[2][2]*rhs.m[3][2] + lhs.m[3][2]*rhs.m[3][3];
ret.m[0][3] = lhs.m[0][3]*rhs.m[0][0] + lhs.m[1][3]*rhs.m[0][1] + lhs.m[2][3]*rhs.m[0][2] + lhs.m[3][3]*rhs.m[0][3];
ret.m[1][3] = lhs.m[0][3]*rhs.m[1][0] + lhs.m[1][3]*rhs.m[1][1] + lhs.m[2][3]*rhs.m[1][2] + lhs.m[3][3]*rhs.m[1][3];
ret.m[2][3] = lhs.m[0][3]*rhs.m[2][0] + lhs.m[1][3]*rhs.m[2][1] + lhs.m[2][3]*rhs.m[2][2] + lhs.m[3][3]*rhs.m[2][3];
ret.m[3][3] = lhs.m[0][3]*rhs.m[3][0] + lhs.m[1][3]*rhs.m[3][1] + lhs.m[2][3]*rhs.m[2][2] + lhs.m[3][3]*rhs.m[3][3];
#endif
return ret;
}
extern const TMatrix4f kIdentityMtx4;
enum EProjType
{
PROJ_NONE = 0,
@@ -145,7 +39,7 @@ public:
{
m_projType = PROJ_ORTHO;
m_ortho = SProjOrtho();
m_mtx = kIdentityMtx4;
m_mtx = CMatrix4f::skIdentityMatrix4f;
}
CProjection(const CProjection& other) {*this = other;}
CProjection(const SProjOrtho& ortho) {setOrtho(ortho);}
@@ -181,7 +75,7 @@ public:
return m_persp;
}
inline const TMatrix4f& getCachedMatrix() const {return m_mtx;}
inline const CMatrix4f& getCachedMatrix() const {return m_mtx;}
protected:
@@ -207,7 +101,7 @@ protected:
};
/* Cached projection matrix */
TMatrix4f m_mtx;
CMatrix4f m_mtx;
};