aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control/fvector.cpp
diff options
context:
space:
mode:
authorDavid Fioramonti2017-09-01 21:41:13 -0700
committerDavid Fioramonti2017-09-02 06:41:07 -0700
commitd55406b6426d82c49afb00973f8b7da377bb0849 (patch)
tree6548de9dbfa6a28c36f6f932d5cc8fb4356614ff /engines/titanic/star_control/fvector.cpp
parent1160b88d0670b63cd65bce5742222f4012cc340a (diff)
downloadscummvm-rg350-d55406b6426d82c49afb00973f8b7da377bb0849.tar.gz
scummvm-rg350-d55406b6426d82c49afb00973f8b7da377bb0849.tar.bz2
scummvm-rg350-d55406b6426d82c49afb00973f8b7da377bb0849.zip
TITANIC: Remove DVector and DAffine files from build and folder
Diffstat (limited to 'engines/titanic/star_control/fvector.cpp')
-rw-r--r--engines/titanic/star_control/fvector.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index b8cf61ffc4..a6c8b2c42b 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -21,8 +21,6 @@
*/
#include "titanic/star_control/fvector.h"
-//#include "titanic/star_control/dvector.h"
-//#include "titanic/star_control/daffine.h"
#include "titanic/star_control/fpose.h"
//#include "common/algorithm.h"
//#include "common/textconsole.h"
@@ -131,7 +129,6 @@ FPose FVector::getFrameTransform(const FVector &v) {
FVector vector1 = getAnglesAsVect();
matrix1.setRotationMatrix(X_AXIS, vector1._y * Rad2Deg);
matrix2.setRotationMatrix(Y_AXIS, vector1._z * Rad2Deg);
- //matrix3 = matrix1.compose(matrix2);
fposeProd(matrix1,matrix2,matrix3);
matrix4 = matrix3.inverseTransform();
@@ -139,20 +136,11 @@ FPose FVector::getFrameTransform(const FVector &v) {
matrix1.setRotationMatrix(X_AXIS, vector1._y * Rad2Deg);
matrix2.setRotationMatrix(Y_AXIS, vector1._z * Rad2Deg);
fposeProd(matrix1,matrix2,matrix3);
- //matrix3 = matrix1.compose(matrix2);
fposeProd(matrix4,matrix3,matrix1);
- return matrix1; //matrix4.compose(matrix3);
+ return matrix1;
}
-/*DAffine FVector::formRotXY() const {
- FVector v1 = getAnglesAsVect();
- DAffine m1, m2;
- m1.setRotationMatrix(X_AXIS, v1._y * Rad2Deg);
- m2.setRotationMatrix(Y_AXIS, v1._z * Rad2Deg);
- return m1.compose(m2);
-}*/
-
FPose FVector::formRotXY() const {
FVector v1 = getAnglesAsVect();
FPose m1, m2;