From fcfdaa9534c67bc0affee73af80b12ffc82dfd05 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sun, 27 Oct 2019 01:46:48 +0300 Subject: cAudioManager::TranslateEntity cleanup --- src/math/Matrix.h | 10 +++++++++- src/math/math.cpp | 10 ---------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src/math') diff --git a/src/math/Matrix.h b/src/math/Matrix.h index 96f56a0f..da38cb1d 100644 --- a/src/math/Matrix.h +++ b/src/math/Matrix.h @@ -249,7 +249,15 @@ public: CMatrix &Invert(const CMatrix &src, CMatrix &dst); CVector operator*(const CMatrix &mat, const CVector &vec); CMatrix operator*(const CMatrix &m1, const CMatrix &m2); -CVector MultiplyInverse(const CMatrix &mat, const CVector &vec); +inline CVector MultiplyInverse(const CMatrix &mat, const CVector &vec) +{ + CVector v(vec.x - mat.m_matrix.pos.x, vec.y - mat.m_matrix.pos.y, vec.z - mat.m_matrix.pos.z); + return CVector( + mat.m_matrix.right.x * v.x + mat.m_matrix.right.y * v.y + mat.m_matrix.right.z * v.z, + mat.m_matrix.up.x * v.x + mat.m_matrix.up.y * v.y + mat.m_matrix.up.z * v.z, + mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z); +} + const CVector Multiply3x3(const CMatrix &mat, const CVector &vec); const CVector Multiply3x3(const CVector &vec, const CMatrix &mat); diff --git a/src/math/math.cpp b/src/math/math.cpp index 6201cee6..4f74fac9 100644 --- a/src/math/math.cpp +++ b/src/math/math.cpp @@ -126,16 +126,6 @@ operator*(const CMatrix &m1, const CMatrix &m2) return out; } -CVector -MultiplyInverse(const CMatrix &mat, const CVector &vec) -{ - CVector v(vec.x - mat.m_matrix.pos.x, vec.y - mat.m_matrix.pos.y, vec.z - mat.m_matrix.pos.z); - return CVector( - mat.m_matrix.right.x * v.x + mat.m_matrix.right.y * v.y + mat.m_matrix.right.z * v.z, - mat.m_matrix.up.x * v.x + mat.m_matrix.up.y * v.y + mat.m_matrix.up.z * v.z, - mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z); -} - const CVector Multiply3x3(const CMatrix &mat, const CVector &vec) { -- cgit v1.2.3