diff options
author | aap <aap@papnet.eu> | 2019-06-29 17:17:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-29 17:17:53 +0200 |
commit | aec122e89034ec745d191cdfe6c563a4a73ee752 (patch) | |
tree | c88bcc591a8ac97cf5b0023b7899ada32ae06f7c /src/math | |
parent | fix (diff) | |
parent | fix (diff) | |
download | re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar.gz re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar.bz2 re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar.lz re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar.xz re3-aec122e89034ec745d191cdfe6c563a4a73ee752.tar.zst re3-aec122e89034ec745d191cdfe6c563a4a73ee752.zip |
Diffstat (limited to 'src/math')
-rw-r--r-- | src/math/Matrix.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/math/Matrix.h b/src/math/Matrix.h index e2e5394e..63cb2753 100644 --- a/src/math/Matrix.h +++ b/src/math/Matrix.h @@ -20,6 +20,11 @@ public: m_attachment = nil; Attach(matrix, owner); } + CMatrix(float scale){ + m_attachment = nil; + m_hasRwMatrix = false; + SetScale(scale); + } ~CMatrix(void){ if(m_hasRwMatrix && m_attachment) RwMatrixDestroy(m_attachment); @@ -57,6 +62,21 @@ public: if(m_attachment) UpdateRW(); } + CMatrix& operator+=(CMatrix const &rhs){ + m_matrix.right.x += rhs.m_matrix.right.x; + m_matrix.up.x += rhs.m_matrix.up.x; + m_matrix.at.x += rhs.m_matrix.at.x; + m_matrix.right.y += rhs.m_matrix.right.y; + m_matrix.up.y += rhs.m_matrix.up.y; + m_matrix.at.y += rhs.m_matrix.at.y; + m_matrix.right.z += rhs.m_matrix.right.z; + m_matrix.up.z += rhs.m_matrix.up.z; + m_matrix.at.z += rhs.m_matrix.at.z; + m_matrix.pos.x += rhs.m_matrix.pos.x; + m_matrix.pos.y += rhs.m_matrix.pos.y; + m_matrix.pos.z += rhs.m_matrix.pos.z; + return *this; + } CVector *GetPosition(void){ return (CVector*)&m_matrix.pos; } CVector *GetRight(void) { return (CVector*)&m_matrix.right; } |