aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control/fvector.cpp
diff options
context:
space:
mode:
authorDavid Fioramonti2017-09-01 18:47:15 -0700
committerDavid Fioramonti2017-09-02 06:40:41 -0700
commitfa11ae477f3284d7476b883dafcc75e61d3631dd (patch)
tree0ca4dbea1eac66b6a75936c02b842740730652d6 /engines/titanic/star_control/fvector.cpp
parent8ab7ececbaa78a34ace07dade864b24d91669e20 (diff)
downloadscummvm-rg350-fa11ae477f3284d7476b883dafcc75e61d3631dd.tar.gz
scummvm-rg350-fa11ae477f3284d7476b883dafcc75e61d3631dd.tar.bz2
scummvm-rg350-fa11ae477f3284d7476b883dafcc75e61d3631dd.zip
TITANIC: Duplicate DAffine usage in lockMarker2 with FPose usage
Diffstat (limited to 'engines/titanic/star_control/fvector.cpp')
-rw-r--r--engines/titanic/star_control/fvector.cpp10
1 files changed, 10 insertions, 0 deletions
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);
}