libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 20:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Further cleanup of FMatrix refactorings

Browse Source
This commit is contained in:
Paul Gilbert 2017-08-15 21:26:17 -04:00
parent 736407d7da
commit 867a37618b
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engines/titanic/star_control/fmatrix.cpp
View File

@ -25,20 +25,21 @@
namespace Titanic {
//Non-member functions
// Non-member functions
void matProd(const FMatrix &a, const FMatrix &m, FMatrix &C) {
C._row1._x = a._row1._y * m._row2._x + a._row1._z * m._row3._x + a._row1._x * m._row1._x;
C._row1._y = a._row1._x * m._row1._y + m._row2._y * a._row1._y + m._row3._y * a._row1._z;
C._row1._z = a._row1._x * m._row1._z + a._row1._y * m._row2._z + a._row1._z * m._row3._z;
C._row2._x = m._row1._x * a._row2._x + m._row3._x * a._row2._z + m._row2._x * a._row2._y;
C._row2._y = m._row3._y * a._row2._z + m._row1._y * a._row2._x + m._row2._y * a._row2._y;
C._row2._z = a._row2._z * m._row3._z + a._row2._x * m._row1._z + a._row2._y * m._row2._z;
C._row3._x = m._row1._x * a._row3._x + a._row3._z * m._row3._x + a._row3._y * m._row2._x;
C._row3._y = a._row3._y * m._row2._y + a._row3._z * m._row3._y + a._row3._x * m._row1._y;
C._row3._z = a._row3._x * m._row1._z + a._row3._y * m._row2._z + a._row3._z * m._row3._z;
C._row1._x = a._row1._y * m._row2._x + a._row1._z * m._row3._x + a._row1._x * m._row1._x;
C._row1._y = a._row1._x * m._row1._y + m._row2._y * a._row1._y + m._row3._y * a._row1._z;
C._row1._z = a._row1._x * m._row1._z + a._row1._y * m._row2._z + a._row1._z * m._row3._z;
C._row2._x = m._row1._x * a._row2._x + m._row3._x * a._row2._z + m._row2._x * a._row2._y;
C._row2._y = m._row3._y * a._row2._z + m._row1._y * a._row2._x + m._row2._y * a._row2._y;
C._row2._z = a._row2._z * m._row3._z + a._row2._x * m._row1._z + a._row2._y * m._row2._z;
C._row3._x = m._row1._x * a._row3._x + a._row3._z * m._row3._x + a._row3._y * m._row2._x;
C._row3._y = a._row3._y * m._row2._y + a._row3._z * m._row3._y + a._row3._x * m._row1._y;
C._row3._z = a._row3._x * m._row1._z + a._row3._y * m._row2._z + a._row3._z * m._row3._z;
}
//member functions
// member functions
FMatrix::FMatrix() :
_row1(1.0, 0.0, 0.0), _row2(0.0, 1.0, 0.0), _row3(0.0, 0.0, 1.0) {
@ -108,7 +109,6 @@ void FMatrix::set(const FMatrix &m) {
_row3 = m._row3;
}
void FMatrix::set(const FVector &row1, const FVector &row2, const FVector &row3) {
_row1 = row1;
_row2 = row2;
@ -133,17 +133,17 @@ void FMatrix::set(const FVector &v) {
}
void FMatrix::matRProd(const FMatrix &m) {
FMatrix C = FMatrix();
FMatrix A = FMatrix(_row1,_row2,_row3);
matProd(A,m,C);
this->set(C);
FMatrix C = FMatrix();
FMatrix A = FMatrix(_row1, _row2, _row3);
matProd(A, m, C);
this->set(C);
}
void FMatrix::matLProd(const FMatrix &m) {
FMatrix C = FMatrix();
FMatrix A = FMatrix(_row1,_row2,_row3);
matProd(m,A,C);
this->set(C);
FMatrix C = FMatrix();
FMatrix A = FMatrix(_row1, _row2, _row3);
matProd(m, A, C);
this->set(C);
}
} // End of namespace Titanic

24
engines/titanic/star_control/fmatrix.h
View File

@ -91,16 +91,16 @@ public:
*/
void set(const FVector &v);
/**
* Changes this matrix, A, to be C, where C=Am. Matrix m multiplies this matrix (A) on its Right.
* m is said to premultiply A (the previous this matrix).
*/
/**
* Changes this matrix, A, to be C, where C=Am. Matrix m multiplies this matrix (A) on its Right.
* m is said to premultiply A (the previous this matrix).
*/
void matRProd(const FMatrix &m);
/**
* Changes this matrix, A, to be C, where C=mA. Matrix m multiplies this matrix (A) on its Left.
* m is said to postmultiply A (the previous this matrix).
*/
/**
* Changes this matrix, A, to be C, where C=mA. Matrix m multiplies this matrix (A) on its Left.
* m is said to postmultiply A (the previous this matrix).
*/
void matLProd(const FMatrix &m);
/**
@ -128,10 +128,10 @@ public:
};
/**
* Puts the matrix product between a and m in C, C = am
* Called by MatLProd and MatLProd
* Caller must preallocate output matrix
*/
* Puts the matrix product between a and m in C, C = am
* Called by MatLProd and MatLProd
* Caller must preallocate output matrix
*/
void matProd(const FMatrix &a, const FMatrix &m, FMatrix &C);
} // End of namespace Titanic