diff options
author | David Fioramonti | 2017-09-01 19:28:16 -0700 |
---|---|---|
committer | David Fioramonti | 2017-09-02 06:40:41 -0700 |
commit | 910e221861fc0003984ba68e60f4250ba8f7a921 (patch) | |
tree | 7e52764fdf5fa102d72f51f48d8b7cf7fce53fdf /engines/titanic/star_control/matrix_transform.h | |
parent | fa11ae477f3284d7476b883dafcc75e61d3631dd (diff) | |
download | scummvm-rg350-910e221861fc0003984ba68e60f4250ba8f7a921.tar.gz scummvm-rg350-910e221861fc0003984ba68e60f4250ba8f7a921.tar.bz2 scummvm-rg350-910e221861fc0003984ba68e60f4250ba8f7a921.zip |
TITANIC: Replace DAffine with FPose in Transform and Orientation classes
Diffstat (limited to 'engines/titanic/star_control/matrix_transform.h')
-rw-r--r-- | engines/titanic/star_control/matrix_transform.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/titanic/star_control/matrix_transform.h b/engines/titanic/star_control/matrix_transform.h index 92d4fbff22..2043e8de76 100644 --- a/engines/titanic/star_control/matrix_transform.h +++ b/engines/titanic/star_control/matrix_transform.h @@ -23,11 +23,12 @@ #ifndef TITANIC_MATRIX_TRANSFORM_H #define TITANIC_MATRIX_TRANSFORM_H -#include "titanic/star_control/dvector.h" +//#include "titanic/star_control/dvector.h" +#include "titanic/star_control/fvector.h" namespace Titanic { -class Daffine; +class FMatrix; class CMatrixTransform { private: @@ -35,7 +36,8 @@ private: CMatrixTransform resize(double factor) const; public: double _field0; - DVector _vector; + //DVector _vector; + FVector _vector; public: CMatrixTransform() : _field0(1.0) {} @@ -50,7 +52,7 @@ public: void copyFrom(const CMatrixTransform &src); double fn1() const; - void fn4(const DAffine &m); + void fn4(const FMatrix &m); CMatrixTransform fn5(double percent, const CMatrixTransform &src); }; |