diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-19 16:09:06 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-19 17:38:10 +0100 |
| commit | e6ef1644418401e5ace5a12537d6bd500db7f0e2 (patch) | |
| tree | de1de5510b1ddcffc3af0b374440fb9cc5cb2c9a /src/math/Vector.cpp | |
| parent | Get rid of RwMatrix in CMatrix (diff) | |
| download | re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar.gz re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar.bz2 re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar.lz re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar.xz re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.tar.zst re3-e6ef1644418401e5ace5a12537d6bd500db7f0e2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/math/Vector.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/math/Vector.cpp b/src/math/Vector.cpp index 3bc395d8..ee76e555 100644 --- a/src/math/Vector.cpp +++ b/src/math/Vector.cpp @@ -23,24 +23,24 @@ CVector Multiply3x3(const CMatrix &mat, const CVector &vec) { // TODO: VU0 code - return CVector(mat.right.x * vec.x + mat.forward.x * vec.y + mat.up.x * vec.z, - mat.right.y * vec.x + mat.forward.y * vec.y + mat.up.y * vec.z, - mat.right.z * vec.x + mat.forward.z * vec.y + mat.up.z * vec.z); + return CVector(mat.rx * vec.x + mat.fx * vec.y + mat.ux * vec.z, + mat.ry * vec.x + mat.fy * vec.y + mat.uy * vec.z, + mat.rz * vec.x + mat.fz * vec.y + mat.uz * vec.z); } CVector Multiply3x3(const CVector &vec, const CMatrix &mat) { - return CVector(mat.right.x * vec.x + mat.right.y * vec.y + mat.right.z * vec.z, - mat.forward.x * vec.x + mat.forward.y * vec.y + mat.forward.z * vec.z, - mat.up.x * vec.x + mat.up.y * vec.y + mat.up.z * vec.z); + return CVector(mat.rx * vec.x + mat.ry * vec.y + mat.rz * vec.z, + mat.fx * vec.x + mat.fy * vec.y + mat.fz * vec.z, + mat.ux * vec.x + mat.uy * vec.y + mat.uz * vec.z); } CVector operator*(const CMatrix &mat, const CVector &vec) { // TODO: VU0 code - return CVector(mat.right.x * vec.x + mat.forward.x * vec.y + mat.up.x * vec.z + mat.pos.x, - mat.right.y * vec.x + mat.forward.y * vec.y + mat.up.y * vec.z + mat.pos.y, - mat.right.z * vec.x + mat.forward.z * vec.y + mat.up.z * vec.z + mat.pos.z); + return CVector(mat.rx * vec.x + mat.fx * vec.y + mat.ux * vec.z + mat.px, + mat.ry * vec.x + mat.fy * vec.y + mat.uy * vec.z + mat.py, + mat.rz * vec.x + mat.fz * vec.y + mat.uz * vec.z + mat.pz); } |