diff options
author | Sergeanur <s.anureev@yandex.ua> | 2019-10-17 01:22:39 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2019-10-17 01:39:01 +0200 |
commit | 89879341235437f057e731e1bcdab05d4e341e9b (patch) | |
tree | 5ed6ea84a3ee8b4a971b0786401f664346074a55 /src/math/Matrix.h | |
parent | Merge pull request #244 from Nick007J/master (diff) | |
download | re3-89879341235437f057e731e1bcdab05d4e341e9b.tar re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.gz re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.bz2 re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.lz re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.xz re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.zst re3-89879341235437f057e731e1bcdab05d4e341e9b.zip |
Diffstat (limited to 'src/math/Matrix.h')
-rw-r--r-- | src/math/Matrix.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/math/Matrix.h b/src/math/Matrix.h index b4a866a0..96f56a0f 100644 --- a/src/math/Matrix.h +++ b/src/math/Matrix.h @@ -127,20 +127,14 @@ public: } void Scale(float scale) { - // GTA treats this as 4x4 floats - m_matrix.right.x *= scale; - m_matrix.right.y *= scale; - m_matrix.right.z *= scale; - m_matrix.up.x *= scale; - m_matrix.up.y *= scale; - m_matrix.up.z *= scale; - m_matrix.at.x *= scale; - m_matrix.at.y *= scale; - m_matrix.at.z *= scale; - m_matrix.pos.x *= scale; - m_matrix.pos.y *= scale; - m_matrix.pos.z *= scale; - m_matrix.flags = 0; + float *pFloatMatrix = (float*)&m_matrix; + for (int i = 0; i < 3; i++) +#ifdef FIX_BUGS // BUGFIX from VC + for (int j = 0; j < 3; j++) +#else + for (int j = 0; j < 4; j++) +#endif + pFloatMatrix[i * 4 + j] *= scale; } |