mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 08:15:33 +00:00
Code Issues Releases Wiki Activity

Update the player's Ptr in mwrender when changing cells

Browse source
This commit is contained in:
Chris Robinson 2013-07-17 19:11:03 -07:00
parent 1b4cd787a5
commit c7692acb79
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/camera.cpp
View file

@ -82,7 +82,7 @@ namespace MWRender
mCameraNode->getCreator()->destroySceneNode(mCameraNode); mCameraNode->getCreator()->destroySceneNode(mCameraNode);
} }
mCameraNode = node; mCameraNode = node;
mCamera->detachFromParent(); if(!mCamera->isAttached())
mCameraNode->attachObject(mCamera); mCameraNode->attachObject(mCamera);
} }

8
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -303,6 +303,14 @@ RenderingManager::updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &
} }
} }
void RenderingManager::updatePlayerPtr(const MWWorld::Ptr &ptr)
{
if(mPlayerAnimation)
mPlayerAnimation->updatePtr(ptr);
if(mCamera->getHandle() == ptr.getRefData().getHandle())
mCamera->attachTo(ptr);
}
void RenderingManager::update (float duration, bool paused) void RenderingManager::update (float duration, bool paused)
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();

3
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -127,6 +127,9 @@ public:
/// \param cur Object reference in new cell /// \param cur Object reference in new cell
void updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &cur); void updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &cur);
/// Specifies an updated Ptr object for the player (used on cell change).
void updatePlayerPtr(const MWWorld::Ptr &ptr);
void update (float duration, bool paused); void update (float duration, bool paused);
void setAmbientColour(const Ogre::ColourValue& colour); void setAmbientColour(const Ogre::ColourValue& colour);

1
apps/openmw/mwworld/scene.cpp
View file

@ -167,6 +167,7 @@ namespace MWWorld
world->getPlayer().setCell(cell); world->getPlayer().setCell(cell);
MWWorld::Ptr player = world->getPlayer().getPlayer(); MWWorld::Ptr player = world->getPlayer().getPlayer();
mRendering.updatePlayerPtr(player);
if (adjustPlayerPos) { if (adjustPlayerPos) {
world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]); world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);