diff options
Diffstat (limited to 'engines/titanic/star_control/camera_auto_mover.cpp')
| -rw-r--r-- | engines/titanic/star_control/camera_auto_mover.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp index 201cd9440a..9fe5e15e7e 100644 --- a/engines/titanic/star_control/camera_auto_mover.cpp +++ b/engines/titanic/star_control/camera_auto_mover.cpp @@ -41,7 +41,8 @@ CCameraAutoMover::CCameraAutoMover() : _srcPos(0.0, 1000000.0, 0.0) { _transitionPercentInc = 0.0; } -void CCameraAutoMover::proc2(const FVector &oldPos, const FVector &newPos, +// TODO: same as setPath also orientations are not used +void CCameraAutoMover::setPath2(const FVector &oldPos, const FVector &newPos, const FMatrix &oldOrientation, const FMatrix &newOrientation) { _srcPos = oldPos; _destPos = newPos; @@ -59,7 +60,8 @@ void CCameraAutoMover::proc2(const FVector &oldPos, const FVector &newPos, _field4C = 0; } -void CCameraAutoMover::proc3(const FMatrix &srcOrient, const FMatrix &destOrient) { +// TODO: same as proc2 also orientations are not used +void CCameraAutoMover::setOrientations(const FMatrix &srcOrient, const FMatrix &destOrient) { _srcPos.clear(); _destPos.clear(); _transitionPercent = 1.0; @@ -68,6 +70,7 @@ void CCameraAutoMover::proc3(const FMatrix &srcOrient, const FMatrix &destOrient _field34 = false; } +// TODO: same as setPath2 also orientations are not used void CCameraAutoMover::setPath(const FVector &srcV, const FVector &destV, const FMatrix &orientation) { _srcPos = srcV; _destPos = destV; @@ -93,8 +96,8 @@ void CCameraAutoMover::setPath(const FVector &srcV, const FVector &destV, const void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) { // Usually val1 and val2 are small where as distance can be large _field44 = val1; - _field4C = val1 + 2 * nMoverTransitions; // For _nMoverTransitions = 32 this second value was 64, - // should it always be x2 _nMoverTransitions? + _field4C = val1 + 2 * (nMoverTransitions - 1); // For _nMoverTransitions = 32 this second value was 62, + // should it always be x2 (_nMoverTransitions - 1)? _field38 = distance / (double)(val1 + val2 * 2); _field40 = nMoverTransitions-1; _field48 = nMoverTransitions-1; @@ -113,4 +116,4 @@ void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) { } } -} // End of namespace Titanic +} // End of namespace Titanic
\ No newline at end of file |