mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 20:53:50 +00:00
Code Issues Releases Wiki Activity

player class cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2011-03-13 22:37:54 +01:00
parent eb93ef68f1
commit f1bfca7c7c
2 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwworld/player.cpp
View file

@ -9,7 +9,7 @@
namespace MWWorld namespace MWWorld
{ {
Player::Player (MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world) : Player::Player (MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world) :
mCellStore (0), mRenderer (renderer), mWorld (world), mClass (0), mCollisionMode (true), mCellStore (0), mRenderer (renderer), mWorld (world), mClass (0),
mAutoMove (false), mForwardBackward (0) mAutoMove (false), mForwardBackward (0)
{ {
mPlayer.base = player; mPlayer.base = player;
@ -37,27 +37,6 @@ namespace MWWorld
-mPlayer.ref.pos.pos[1])); -mPlayer.ref.pos.pos[1]));
} }
void Player::moveRel (float &relX, float &relY, float &relZ)
{
// Move camera relative to its own direction
mRenderer->getCamera()->moveRelative (Ogre::Vector3(relX,0,relZ));
// Up/down movement is always done relative the world axis.
mRenderer->getCamera()->move (Ogre::Vector3(0,relY,0));
// Get new camera position, converting back to MW coords.
Ogre::Vector3 pos = mRenderer->getCamera()->getPosition();
relX = pos[0];
relY = -pos[2];
relZ = pos[1];
// TODO: Collision detection must be used to find the REAL new
// position, if mCollisionMode==true
// Set the position
setPos(relX, relY, relZ);
}
void Player::setClass (const ESM::Class& class_) void Player::setClass (const ESM::Class& class_)
{ {
ESM::Class *new_class = new ESM::Class (class_); ESM::Class *new_class = new ESM::Class (class_);

10
apps/openmw/mwworld/player.hpp
View file

@ -29,7 +29,6 @@ namespace MWWorld
std::string mRace; std::string mRace;
std::string mBirthsign; std::string mBirthsign;
ESM::Class *mClass; ESM::Class *mClass;
bool mCollisionMode;
bool mAutoMove; bool mAutoMove;
int mForwardBackward; int mForwardBackward;
@ -47,10 +46,6 @@ namespace MWWorld
mCellStore = cellStore; mCellStore = cellStore;
} }
/// Move the player relative to her own position and
/// orientation. After the call, the new position is returned.
void moveRel (float &relX, float &relY, float &relZ);
MWWorld::Ptr getPlayer() MWWorld::Ptr getPlayer()
{ {
MWWorld::Ptr ptr (&mPlayer, mCellStore); MWWorld::Ptr ptr (&mPlayer, mCellStore);
@ -106,11 +101,6 @@ namespace MWWorld
return *mClass; return *mClass;
} }
void toggleCollisionMode()
{
mCollisionMode = !mCollisionMode;
}
bool getAutoMove() bool getAutoMove()
{ {
return mAutoMove; return mAutoMove;