From fa11ae477f3284d7476b883dafcc75e61d3631dd Mon Sep 17 00:00:00 2001 From: David Fioramonti Date: Fri, 1 Sep 2017 18:47:15 -0700 Subject: TITANIC: Duplicate DAffine usage in lockMarker2 with FPose usage --- engines/titanic/star_control/fvector.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engines/titanic/star_control/fvector.cpp') diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp index 4f0fd7db68..5e87ebc7e9 100644 --- a/engines/titanic/star_control/fvector.cpp +++ b/engines/titanic/star_control/fvector.cpp @@ -150,6 +150,16 @@ DAffine FVector::formRotXY() const { return m1.compose(m2); } +FPose FVector::formRotXY2() const { + FVector v1 = getAnglesAsVect(); + FPose m1, m2; + m1.setRotationMatrix(X_AXIS, v1._y * Rad2Deg); + m2.setRotationMatrix(Y_AXIS, v1._z * Rad2Deg); + FPose m3; + fposeProd(m1,m2,m3); + return m3; +} + Common::String FVector::toString() const { return Common::String::format("(%.3f,%.3f,%.3f)", _x, _y, _z); } -- cgit v1.2.3