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

Add Athena constructor to CMatrix3f

Browse Source
This commit is contained in:
Phillip Stephens
2015-10-25 13:20:12 -07:00
parent 2efe395f50 dbbd3c76ef
commit e1baf3631b
26 changed files with 263 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/CMatrix3f.hpp
View File

@@ -9,7 +9,7 @@
namespace Zeus
{
class CQuaternion;
class ZE_ALIGN(16) CMatrix3f
class alignas(16) CMatrix3f
{
public:
ZE_DECLARE_ALIGNED_ALLOCATOR();
@@ -46,6 +46,18 @@ public:
#if __SSE__
CMatrix3f(const __m128& r0, const __m128& r1, const __m128& r2)
{vec[0].mVec128 = r0; vec[1].mVec128 = r1; vec[2].mVec128 = r2;}
#endif
#if ZE_ATHENA_TYPES
CMatrix3f(const atVec4f& r0, const atVec4f& r1, const atVec4f& 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
}
#endif
CMatrix3f(const CVector3f& axis, float angle);
CMatrix3f(const CQuaternion& quat);
@@ -87,6 +99,15 @@ public:
return vec[i];
}
inline const CMatrix3f orthonormalized()
{
CMatrix3f ret;
ret.vec[0] = vec[0].normalized();
ret.vec[1] = vec[2].normalized();
ret.vec[2] = vec[1].normalized();
return ret;
}
static const CMatrix3f skIdentityMatrix3f;
void transpose();