AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add RowMajor matrix reader

This commit is contained in:
Jack Andersen 2016-04-18 14:17:19 -10:00
parent 954978454b
commit 0c968842ae
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/zeus/CTransform.hpp
View File

@ -20,6 +20,16 @@ public:
#if ZE_ATHENA_TYPES #if ZE_ATHENA_TYPES
CTransform(const atVec4f* mtx) CTransform(const atVec4f* mtx)
: m_basis(mtx[0], mtx[1], mtx[2]), m_origin(mtx[0].vec[3], mtx[1].vec[3], mtx[2].vec[3]) {} : m_basis(mtx[0], mtx[1], mtx[2]), m_origin(mtx[0].vec[3], mtx[1].vec[3], mtx[2].vec[3]) {}
void read34RowMajor(athena::io::IStreamReader& r)
{
atVec4f r0 = r.readVec4fBig();
atVec4f r1 = r.readVec4fBig();
atVec4f r2 = r.readVec4fBig();
m_basis = CMatrix3f(r0, r1, r2);
m_basis.transpose();
m_origin = CVector3f(r0.vec[3], r1.vec[3], r2.vec[3]);
}
#endif #endif
static inline CTransform Identity() static inline CTransform Identity()
@ -178,7 +188,7 @@ public:
return ret; return ret;
} }
inline CTransform getRotation() { CTransform ret = *this; ret.m_origin.zeroOut(); return ret; } inline CTransform getRotation() const { CTransform ret = *this; ret.m_origin.zeroOut(); return ret; }
void setRotation(const CMatrix3f& mat) { m_basis = mat; } void setRotation(const CMatrix3f& mat) { m_basis = mat; }
void setRotation(const CTransform& xfrm) { setRotation(xfrm.m_basis); } void setRotation(const CTransform& xfrm) { setRotation(xfrm.m_basis); }