AxioDL/zeus
2
0
Fork 0
mirror of https://github.com/AxioDL/zeus.git synced 2025-06-27 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add TVectorUnion constructor for static init

Browse Source
This commit is contained in:
Phillip Stephens 2016-02-23 20:48:42 -08:00
parent 4b920754e9
commit cd28979d0a
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/CMatrix3f.hpp
View File

@ -62,7 +62,17 @@ public:
#endif #endif
CMatrix3f(const CVector3f& axis, float angle); CMatrix3f(const CVector3f& axis, float angle);
CMatrix3f(const CQuaternion& quat); CMatrix3f(const CQuaternion& quat);
CMatrix3f(const TVectorUnion& r0, const TVectorUnion& r1, const TVectorUnion& r2)
{
#if __SSE__
vec[0].mVec128 = r0.mVec128; vec[1].mVec128 = r1.mVec128; vec[2].mVec128 = r2.mVec128;
#else
vec[0].x = r0.vec[0]; vec[0].y = r0.vec[1]; vec[0].z = r0.vec[2];
vec[1].x = r1.vec[0]; vec[1].y = r1.vec[1]; vec[1].z = r1.vec[2];
vec[2].x = r2.vec[0]; vec[2].y = r2.vec[1]; vec[2].z = r2.vec[2];
#endif
}
inline CMatrix3f& operator=(const CMatrix3f& other) inline CMatrix3f& operator=(const CMatrix3f& other)
{ {
vec[0] = other.vec[0]; vec[0] = other.vec[0];

36
include/CTransform.hpp
View File

@ -71,27 +71,27 @@ public:
{ {
float sinT = sinf(theta); float sinT = sinf(theta);
float cosT = cosf(theta); float cosT = cosf(theta);
return CTransform(CMatrix3f(CVector4f{1.f, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(TVectorUnion{1.f, 0.f, 0.f, 0.f},
CVector4f{0.f, cosT, sinT, 0.f}, TVectorUnion{0.f, cosT, sinT, 0.f},
CVector4f{0.f, -sinT, cosT, 0.f})); TVectorUnion{0.f, -sinT, cosT, 0.f}));
} }
static inline CTransform RotateY(float theta) static inline CTransform RotateY(float theta)
{ {
float sinT = sinf(theta); float sinT = sinf(theta);
float cosT = cosf(theta); float cosT = cosf(theta);
return CTransform(CMatrix3f(CVector4f{cosT, 0.f, -sinT, 0.f}, return CTransform(CMatrix3f(TVectorUnion{cosT, 0.f, -sinT, 0.f},
CVector4f{0.f, 1.f, 0.f, 0.f}, TVectorUnion{0.f, 1.f, 0.f, 0.f},
CVector4f{sinT, 0.f, cosT, 0.f})); TVectorUnion{sinT, 0.f, cosT, 0.f}));
} }
static inline CTransform RotateZ(float theta) static inline CTransform RotateZ(float theta)
{ {
float sinT = sinf(theta); float sinT = sinf(theta);
float cosT = cosf(theta); float cosT = cosf(theta);
return CTransform(CMatrix3f(CVector4f{cosT, sinT, 0.f, 0.f}, return CTransform(CMatrix3f(TVectorUnion{cosT, sinT, 0.f, 0.f},
CVector4f{-sinT, cosT, 0.f, 0.f}, TVectorUnion{-sinT, cosT, 0.f, 0.f},
CVector4f{0.f, 0.f, 1.f, 0.f})); TVectorUnion{0.f, 0.f, 1.f, 0.f}));
} }
inline void rotateLocalX(float theta) inline void rotateLocalX(float theta)
@ -152,23 +152,23 @@ public:
static inline CTransform Scale(const CVector3f& factor) static inline CTransform Scale(const CVector3f& factor)
{ {
return CTransform(CMatrix3f(CVector4f{factor.x, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(TVectorUnion{factor.x, 0.f, 0.f, 0.f},
CVector4f{0.f, factor.y, 0.f, 0.f}, TVectorUnion{0.f, factor.y, 0.f, 0.f},
CVector4f{0.f, 0.f, factor.z, 0.f})); TVectorUnion{0.f, 0.f, factor.z, 0.f}));
} }
static inline CTransform Scale(float x, float y, float z) static inline CTransform Scale(float x, float y, float z)
{ {
return CTransform(CMatrix3f(CVector4f{x, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(TVectorUnion{x, 0.f, 0.f, 0.f},
CVector4f{0.f, y, 0.f, 0.f}, TVectorUnion{0.f, y, 0.f, 0.f},
CVector4f{0.f, 0.f, z, 0.f})); TVectorUnion{0.f, 0.f, z, 0.f}));
} }
static inline CTransform Scale(float factor) static inline CTransform Scale(float factor)
{ {
return CTransform(CMatrix3f(CVector4f{factor, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(TVectorUnion{factor, 0.f, 0.f, 0.f},
CVector4f{0.f, factor, 0.f, 0.f}, TVectorUnion{0.f, factor, 0.f, 0.f},
CVector4f{0.f, 0.f, factor, 0.f})); TVectorUnion{0.f, 0.f, factor, 0.f}));
} }
inline void multiplyIgnoreTranslation(const CTransform& xfrm) { m_basis = m_basis*xfrm.m_basis; } inline void multiplyIgnoreTranslation(const CTransform& xfrm) { m_basis = m_basis*xfrm.m_basis; }