mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 02:15:32 +00:00
Code Issues Releases Wiki Activity

re-routed player movement through MWWorld::World

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-21 12:31:04 +02:00
parent fe3b6230fc
commit 0d20719158
4 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/CMakeLists.txt
View file

@ -14,6 +14,7 @@ set(GAMEREND
mwrender/cellimp.cpp mwrender/cellimp.cpp
mwrender/interior.cpp mwrender/interior.cpp
mwrender/exterior.cpp mwrender/exterior.cpp
mwrender/playerpos.cpp
mwrender/sky.cpp) mwrender/sky.cpp)
set(GAMEREND_HEADER set(GAMEREND_HEADER
mwrender/cell.hpp mwrender/cell.hpp

24
apps/openmw/mwrender/playerpos.hpp
View file

@ -8,6 +8,11 @@
#include "../mwworld/refdata.hpp" #include "../mwworld/refdata.hpp"
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
namespace MWWorld
{
class World;
}
namespace MWRender namespace MWRender
{ {
// This class keeps track of the player position. It takes care of // This class keeps track of the player position. It takes care of
@ -18,29 +23,18 @@ namespace MWRender
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> mPlayer; ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> mPlayer;
MWWorld::Ptr::CellStore *mCellStore; MWWorld::Ptr::CellStore *mCellStore;
Ogre::Camera *camera; Ogre::Camera *camera;
MWWorld::World& mWorld;
public: public:
PlayerPos(Ogre::Camera *cam, const ESM::NPC *player) : PlayerPos(Ogre::Camera *cam, const ESM::NPC *player, MWWorld::World& world) :
mCellStore (0), camera(cam) mCellStore (0), camera(cam), mWorld (world)
{ {
mPlayer.base = player; mPlayer.base = player;
mPlayer.ref.pos.pos[0] = mPlayer.ref.pos.pos[1] = mPlayer.ref.pos.pos[2] = 0; mPlayer.ref.pos.pos[0] = mPlayer.ref.pos.pos[1] = mPlayer.ref.pos.pos[2] = 0;
} }
// Set the player position. Uses Morrowind coordinates. // Set the player position. Uses Morrowind coordinates.
void setPos(float _x, float _y, float _z, bool updateCamera = false) void setPos(float _x, float _y, float _z, bool updateCamera = false);
{
mPlayer.ref.pos.pos[0] = _x;
mPlayer.ref.pos.pos[1] = _y;
mPlayer.ref.pos.pos[2] = _z;
if (updateCamera)
camera->setPosition (Ogre::Vector3 (
mPlayer.ref.pos.pos[0],
mPlayer.ref.pos.pos[2],
-mPlayer.ref.pos.pos[1]));
// TODO: Update sound listener
}
void setCell (MWWorld::Ptr::CellStore *cellStore) void setCell (MWWorld::Ptr::CellStore *cellStore)
{ {

12
apps/openmw/mwworld/world.cpp
View file

@ -287,7 +287,7 @@ namespace MWWorld
mEsm.open (masterPath.file_string()); mEsm.open (masterPath.file_string());
mStore.load (mEsm); mStore.load (mEsm);
mPlayerPos = new MWRender::PlayerPos (mScene.getCamera(), mStore.npcs.find ("player")); mPlayerPos = new MWRender::PlayerPos (mScene.getCamera(), mStore.npcs.find ("player"), *this);
// global variables // global variables
mGlobalVariables = new Globals (mStore); mGlobalVariables = new Globals (mStore);
@ -685,4 +685,14 @@ namespace MWWorld
} }
} }
} }
void World::moveObject (Ptr ptr, float x, float y, float z)
{
ptr.getCellRef().pos.pos[0] = x;
ptr.getCellRef().pos.pos[1] = y;
ptr.getCellRef().pos.pos[2] = z;
// TODO cell change for non-player ref
// TODO cell change for player ref
}
} }

2
apps/openmw/mwworld/world.hpp
View file

@ -145,6 +145,8 @@ namespace MWWorld
///< Return handle of the object the player is looking at ///< Return handle of the object the player is looking at
void deleteObject (Ptr ptr); void deleteObject (Ptr ptr);
void moveObject (Ptr ptr, float x, float y, float z);
}; };
} }