mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
David Fioramonti
d69404d5de
There was a setPath() adn setPath2() function took in different arguments and were doing the same thing, but not using the different arguments. I made it into one function that only takes in the arguments it uses. Also it was marked virtual, but all the derived classes, CMarkedAutoMover, and CUnmarkedAutoMover were just doing there own thing and then calling this base class implementation. Therefore, I made it be not virtual and the derived classes can do there own thing and then call this, but since they are doing slightly different things it makes sense to differentiate the names and not have them all be called setPath. I.e., the derived classes also change the orientation so that is included in their function names to reflect that.
64 lines
2.2 KiB
C++
64 lines
2.2 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#include "titanic/star_control/marked_camera_mover.h"
|
|
#include "titanic/star_control/base_stars.h" // includes class CStarVector
|
|
#include "titanic/star_control/error_code.h"
|
|
#include "titanic/star_control/fmatrix.h" // includes class FVector
|
|
// Not currently being used: #include "common/textconsole.h"
|
|
|
|
namespace Titanic {
|
|
|
|
CMarkedCameraMover::CMarkedCameraMover(const CNavigationInfo *src) :
|
|
CCameraMover(src) {
|
|
}
|
|
|
|
void CMarkedCameraMover::transitionBetweenPosOrients(const FVector &oldPos, const FVector &newPos,
|
|
const FMatrix &oldOrientation, const FMatrix &newOrientation) {
|
|
if (isLocked())
|
|
decLockCount();
|
|
|
|
_autoMover.setPathOrients(oldPos, newPos, oldOrientation, newOrientation);
|
|
incLockCount();
|
|
}
|
|
|
|
void CMarkedCameraMover::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) {
|
|
if (_autoMover.isActive()) {
|
|
decLockCount();
|
|
MoverState moveState = _autoMover.move(errorCode, pos, orientation);
|
|
if (moveState == MOVING)
|
|
incLockCount();
|
|
if (moveState == DONE_MOVING) {
|
|
stop();
|
|
if (_starVector)
|
|
_starVector->apply();
|
|
}
|
|
} else if (_speed != 0.0) {
|
|
pos._x += orientation._row3._x * _speed;
|
|
pos._y += orientation._row3._y * _speed;
|
|
pos._z += orientation._row3._z * _speed;
|
|
errorCode.set();
|
|
}
|
|
}
|
|
|
|
} // End of namespace Titanic
|