AxioDL/zeus
2
0
Fork 0
mirror of https://github.com/AxioDL/zeus.git synced 2025-06-12 09:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC constructor fixes

Browse Source
This commit is contained in:
Jack Andersen 2016-02-16 17:37:43 -10:00
parent f7fb4b0ecc
commit fc122384bd
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/CTransform.hpp
View File

@ -29,7 +29,7 @@ public:
inline CTransform operator*(const CTransform& rhs) const inline CTransform operator*(const CTransform& rhs) const
{return CTransform(m_basis * rhs.m_basis, m_origin + (m_basis * rhs.m_origin));} {return CTransform(m_basis * rhs.m_basis, m_origin + (m_basis * rhs.m_origin));}
inline CTransform inverse() const inline CTransform inverse() const
{ {
CMatrix3f inv = m_basis.inverted(); CMatrix3f inv = m_basis.inverted();
@ -71,27 +71,27 @@ public:
{ {
float sinT = sinf(theta); float sinT = sinf(theta);
float cosT = cosf(theta); float cosT = cosf(theta);
return CTransform(CMatrix3f({1.f, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(atVec4f{1.f, 0.f, 0.f, 0.f},
{0.f, cosT, sinT, 0.f}, atVec4f{0.f, cosT, sinT, 0.f},
{0.f, -sinT, cosT, 0.f})); atVec4f{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({cosT, 0.f, -sinT, 0.f}, return CTransform(CMatrix3f(atVec4f{cosT, 0.f, -sinT, 0.f},
{0.f, 1.f, 0.f, 0.f}, atVec4f{0.f, 1.f, 0.f, 0.f},
{sinT, 0.f, cosT, 0.f})); atVec4f{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({cosT, sinT, 0.f, 0.f}, return CTransform(CMatrix3f(atVec4f{cosT, sinT, 0.f, 0.f},
{-sinT, cosT, 0.f, 0.f}, atVec4f{-sinT, cosT, 0.f, 0.f},
{0.f, 0.f, 1.f, 0.f})); atVec4f{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({factor.x, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(atVec4f{factor.x, 0.f, 0.f, 0.f},
{0.f, factor.y, 0.f, 0.f}, atVec4f{0.f, factor.y, 0.f, 0.f},
{0.f, 0.f, factor.z, 0.f})); atVec4f{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({x, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(atVec4f{x, 0.f, 0.f, 0.f},
{0.f, y, 0.f, 0.f}, atVec4f{0.f, y, 0.f, 0.f},
{0.f, 0.f, z, 0.f})); atVec4f{0.f, 0.f, z, 0.f}));
} }
static inline CTransform Scale(float factor) static inline CTransform Scale(float factor)
{ {
return CTransform(CMatrix3f({factor, 0.f, 0.f, 0.f}, return CTransform(CMatrix3f(atVec4f{factor, 0.f, 0.f, 0.f},
{0.f, factor, 0.f, 0.f}, atVec4f{0.f, factor, 0.f, 0.f},
{0.f, 0.f, factor, 0.f})); atVec4f{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; }
@ -185,7 +185,7 @@ public:
inline CMatrix3f buildMatrix3f() { return m_basis; } inline CMatrix3f buildMatrix3f() { return m_basis; }
inline CVector3f operator*(const CVector3f& other) const {return m_origin + m_basis * other;} inline CVector3f operator*(const CVector3f& other) const {return m_origin + m_basis * other;}
inline CMatrix4f toMatrix4f() const inline CMatrix4f toMatrix4f() const
{ {
CMatrix4f ret(m_basis[0], m_basis[1], m_basis[2], m_origin); CMatrix4f ret(m_basis[0], m_basis[1], m_basis[2], m_origin);