libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 12:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Extra comments and fix an incorrect DMatrix to be FMatrix

Browse Source
This commit is contained in:
Paul Gilbert 2017-06-03 17:14:02 -04:00
parent a6735310bc
commit 8c31328433
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,11 +228,13 @@ void CStarCamera::setViewportAngle(const FPoint &angles) {
return;
if (_matrixRow == -1) {
// No locked markers
FPose subX(X_AXIS, angles._y);
FPose subY(Y_AXIS, angles._x);
FPose sub(subX, subY);
proc22(sub);
} else if (_matrixRow == 0) {
// 1 marker is locked in
FVector row1 = _matrix._row1;
FPose subX(X_AXIS, angles._y);
FPose subY(Y_AXIS, angles._x);
@ -316,6 +318,7 @@ void CStarCamera::setViewportAngle(const FPoint &angles) {
_viewport.setOrientation(m1);
_viewport.setPosition(tempV1);
} else if (_matrixRow == 1) {
// 2 markers locked in
FVector tempV2;
DMatrix m1, m2, sub;
DVector mrow1, mrow2, mrow3;
@ -504,7 +507,7 @@ void CStarCamera::fn2(FVector v1, FVector v2, FVector v3) {
v3.normalize();
tempV.normalize();
DMatrix matrix = _viewport.getOrientation();
FMatrix matrix = _viewport.getOrientation();
const FVector &pos = _viewport._position;
_mover->proc10(v3, tempV, pos, matrix);

4
engines/titanic/star_control/star_control_sub21.h
View File

@ -35,7 +35,11 @@ public:
CStarControlSub21(const CNavigationInfo *src);
virtual ~CStarControlSub21() {}
/**
* Start a movement to a given specified destination
*/
virtual void moveTo(const FVector &srcV, const FVector &destV, const FMatrix &orientation);
virtual void proc10(const FVector &v1, const FVector &v2, const FVector &v3, const FMatrix &m);
/**