diff options
Diffstat (limited to 'engines/titanic/star_control/star_camera.cpp')
| -rw-r--r-- | engines/titanic/star_control/star_camera.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp index f8f61554ac..f1723856fc 100644 --- a/engines/titanic/star_control/star_camera.cpp +++ b/engines/titanic/star_control/star_camera.cpp @@ -289,7 +289,7 @@ void CStarCamera::setViewportAngle(const FPoint &angles) { tempV1 = _matrix._row2 - _matrix._row1; diffV = tempV1; - m1 = diffV.RotXY(); + m1 = diffV.rotXY(); m1 = m1.compose(subX); subX = m1.inverseTransform(); subX = subX.compose(subY); @@ -321,15 +321,15 @@ void CStarCamera::setViewportAngle(const FPoint &angles) { tempV7._x = m3._row3._x * 1000000.0 + tempV3._x; mrow3 = tempV8 = tempV7; - tempV3 = tempV3.DAffMatrixProdVec(subX); - mrow1 = mrow1.DAffMatrixProdVec(subX); - mrow2 = mrow2.DAffMatrixProdVec(subX); - mrow3 = mrow3.DAffMatrixProdVec(subX); + tempV3 = tempV3.dAffMatrixProdVec(subX); + mrow1 = mrow1.dAffMatrixProdVec(subX); + mrow2 = mrow2.dAffMatrixProdVec(subX); + mrow3 = mrow3.dAffMatrixProdVec(subX); - tempV3 = tempV3.DAffMatrixProdVec(m1); - mrow1 = mrow1.DAffMatrixProdVec(m1); - mrow2 = mrow2.DAffMatrixProdVec(m1); - mrow3 = mrow3.DAffMatrixProdVec(m1); + tempV3 = tempV3.dAffMatrixProdVec(m1); + mrow1 = mrow1.dAffMatrixProdVec(m1); + mrow2 = mrow2.dAffMatrixProdVec(m1); + mrow3 = mrow3.dAffMatrixProdVec(m1); mrow1 -= tempV3; mrow2 -= tempV3; @@ -459,7 +459,7 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) { DAffine m2(X_AXIS, _matrix._row1); DVector tempV1 = v - _matrix._row1; - DAffine m1 = tempV1.RotXY(); + DAffine m1 = tempV1.rotXY(); m1 = m1.compose(m2); m2 = m1.inverseTransform(); @@ -497,11 +497,11 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) { tempV3._z = m5._row3._z * 1000000.0 + m4._col1._z; m4._col4 = tempV3; - tempV2 = tempV2.DAffMatrixProdVec(m2); - m4._col1 = m4._col1.DAffMatrixProdVec(m2); - m4._col3 = m4._col3.DAffMatrixProdVec(m2); - m4._col2 = m4._col2.DAffMatrixProdVec(m2); - m4._col4 = m4._col4.DAffMatrixProdVec(m2); + tempV2 = tempV2.dAffMatrixProdVec(m2); + m4._col1 = m4._col1.dAffMatrixProdVec(m2); + m4._col3 = m4._col3.dAffMatrixProdVec(m2); + m4._col2 = m4._col2.dAffMatrixProdVec(m2); + m4._col4 = m4._col4.dAffMatrixProdVec(m2); // Find the angle that gives the minimum distance DVector tempPos; @@ -509,7 +509,7 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) { int minDegree = 0; for (int degree = 0; degree < 360; ++degree) { tempPos = m4._col1; - tempPos.RotVectAxisY((double)degree); + tempPos.rotVectAxisY((double)degree); double distance = tempV2.getDistance(tempPos); if (distance < minDistance) { @@ -518,14 +518,14 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) { } } - m4._col1.RotVectAxisY((double)minDegree); - m4._col2.RotVectAxisY((double)minDegree); - m4._col3.RotVectAxisY((double)minDegree); - m4._col4.RotVectAxisY((double)minDegree); - m4._col1 = m4._col1.DAffMatrixProdVec(m1); - m4._col2 = m4._col2.DAffMatrixProdVec(m1); - m4._col3 = m4._col3.DAffMatrixProdVec(m1); - m4._col4 = m4._col4.DAffMatrixProdVec(m1); + m4._col1.rotVectAxisY((double)minDegree); + m4._col2.rotVectAxisY((double)minDegree); + m4._col3.rotVectAxisY((double)minDegree); + m4._col4.rotVectAxisY((double)minDegree); + m4._col1 = m4._col1.dAffMatrixProdVec(m1); + m4._col2 = m4._col2.dAffMatrixProdVec(m1); + m4._col3 = m4._col3.dAffMatrixProdVec(m1); + m4._col4 = m4._col4.dAffMatrixProdVec(m1); m4._col3 -= m4._col1; m4._col2 -= m4._col1; |