aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Fioramonti2017-09-07 04:27:50 -0700
committerDavid Fioramonti2017-09-07 06:33:05 -0700
commitd3a0a487be01f14e8a81f2d82fd4d78f203607e2 (patch)
treee38f2efa287ac3fdffad2121e7a89074bc11880c
parent4bdea384c30586a861ccbc102039258faafe3d90 (diff)
downloadscummvm-rg350-d3a0a487be01f14e8a81f2d82fd4d78f203607e2.tar.gz
scummvm-rg350-d3a0a487be01f14e8a81f2d82fd4d78f203607e2.tar.bz2
scummvm-rg350-d3a0a487be01f14e8a81f2d82fd4d78f203607e2.zip
TITANIC: star control, removed todos and improved some comments
-rw-r--r--engines/titanic/star_control/star_camera.cpp9
-rw-r--r--engines/titanic/star_control/star_camera.h2
-rw-r--r--engines/titanic/star_control/viewport.cpp2
3 files changed, 8 insertions, 5 deletions
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 4edc05bbf7..bcfc9ea232 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -391,7 +391,8 @@ void CStarCamera::setViewportAngle(const FPoint &angles) {
break;
}
- // TODO: should three stars locked do anything in this function? Error?
+ // All three stars are locked on in this case so the camera does not move
+ // in response to the users mouse movements
case THREE_LOCKED:
break;
}
@@ -505,7 +506,9 @@ bool CStarCamera::lockMarker1(FVector v1, FVector firstStarPosition, FVector v3)
FMatrix matrix = _viewport.getOrientation();
const FVector &pos = _viewport._position;
- _mover->transitionBetweenOrientations(v3, tempV, pos, matrix); // TODO: pos does not get used in this function
+ _mover->transitionBetweenOrientations(v3, tempV, pos, matrix); // TODO: pos does not get used in this function,
+ // i.e., _mover has CUnmarkedCameraMover handle which means
+ // CUnmarkedCameraMover::transitionBetweenOrientations gets called
CStarVector *sv = new CStarVector(this, firstStarPosition);
_mover->setVector(sv);
@@ -613,7 +616,7 @@ bool CStarCamera::lockMarker3(CViewport *viewport, const FVector &thirdStarPosit
FMatrix newOr = viewport->getOrientation();
FMatrix oldOr = _viewport.getOrientation();
FVector newPos = viewport->_position;
- FVector oldPos = _viewport._position;
+ //FVector oldPos = _viewport._position;
// WORKAROUND: set old position to new position (1st argument), this prevents
// locking issues when locking the 3rd star. Fixes #9961.
diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h
index 3ffb74950a..281abb9d30 100644
--- a/engines/titanic/star_control/star_camera.h
+++ b/engines/titanic/star_control/star_camera.h
@@ -49,7 +49,7 @@ private:
FMatrix _lockedStarsPos; // Each row represents the location of a locked star
CCameraMover *_mover;
CViewport _viewport;
- bool _isMoved; // TODO: determine if this is being used
+ bool _isMoved; // Used in CPetStarfield to determine if a star destination can be set
bool _isInLockingProcess; // The mover/view is homing in on a new star
private:
/**
diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp
index 07a6dcc36c..e368dfa317 100644
--- a/engines/titanic/star_control/viewport.cpp
+++ b/engines/titanic/star_control/viewport.cpp
@@ -260,7 +260,7 @@ FVector CViewport::getRelativePosCentering(int index, const FVector &src) {
return dest;
}
-// TODO: Identical to getRelativePosCentering, was this meant to be different?
+// Similar to getRelativePosCentering, but uses the raw/transpose version of Pose
FVector CViewport::getRelativePosCenteringRaw(int index, const FVector &src) {
FVector dest;
FPose pose = getRawPose();