libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-28 20:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: star control, removed todos and improved some comments

Browse Source
This commit is contained in:
David Fioramonti 2017-09-07 04:27:50 -07:00
parent 4bdea384c3
commit d3a0a487be
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/titanic/star_control/star_camera.cpp
View File

@ -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.

2
engines/titanic/star_control/star_camera.h
View File

@ -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:
/**

2
engines/titanic/star_control/viewport.cpp
View File

@ -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();