[Scummvm-git-logs] scummvm master -> 8c3132843314afc570320537f63597cc09bd6c58
dreammaster
dreammaster at scummvm.org
Sat Jun 3 23:14:20 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8c31328433 TITANIC: Extra comments and fix an incorrect DMatrix to be FMatrix
Commit: 8c3132843314afc570320537f63597cc09bd6c58
https://github.com/scummvm/scummvm/commit/8c3132843314afc570320537f63597cc09bd6c58
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-03T17:14:02-04:00
Commit Message:
TITANIC: Extra comments and fix an incorrect DMatrix to be FMatrix
Changed paths:
engines/titanic/star_control/star_camera.cpp
engines/titanic/star_control/star_control_sub21.h
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 392c53e..a462256 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -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);
diff --git a/engines/titanic/star_control/star_control_sub21.h b/engines/titanic/star_control/star_control_sub21.h
index ba16aa7..3b804d9 100644
--- a/engines/titanic/star_control/star_control_sub21.h
+++ b/engines/titanic/star_control/star_control_sub21.h
@@ -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);
/**
More information about the Scummvm-git-logs
mailing list