mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 17:19:39 +00:00
Code Issues Releases Wiki Activity

Update the facedObject after the camera is updated

Browse source
This commit is contained in:
scrawl 2017-07-19 13:05:51 +02:00
parent ffb6dff6aa
commit a629d48df6
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/engine.cpp
View file

@ -709,6 +709,9 @@ void OMW::Engine::go()
{ {
mViewer->eventTraversal(); mViewer->eventTraversal();
mViewer->updateTraversal(); mViewer->updateTraversal();
mEnvironment.getWorld()->updateWindowManager();
mViewer->renderingTraversals(); mViewer->renderingTraversals();
} }

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

@ -358,6 +358,8 @@ namespace MWBase
virtual void update (float duration, bool paused) = 0; virtual void update (float duration, bool paused) = 0;
virtual void updateWindowManager () = 0;
virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) = 0; virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount) = 0;
///< copy and place an object into the gameworld at the specified cursor position ///< copy and place an object into the gameworld at the specified cursor position
/// @param object /// @param object

6
apps/openmw/mwworld/worldimp.cpp
View file

@ -1624,16 +1624,14 @@ namespace MWWorld
if (!paused) if (!paused)
doPhysics (duration); doPhysics (duration);
updatePlayer(paused);
mPhysics->debugDraw(); mPhysics->debugDraw();
mWorldScene->update (duration, paused); mWorldScene->update (duration, paused);
updateWindowManager ();
updateSoundListener(); updateSoundListener();
updatePlayer(paused);
mSpellPreloadTimer -= duration; mSpellPreloadTimer -= duration;
if (mSpellPreloadTimer <= 0.f) if (mSpellPreloadTimer <= 0.f)
{ {

3
apps/openmw/mwworld/worldimp.hpp
View file

@ -130,7 +130,6 @@ namespace MWWorld
Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos); Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
void updateSoundListener(); void updateSoundListener();
void updateWindowManager ();
void updatePlayer(bool paused); void updatePlayer(bool paused);
void preloadSpells(); void preloadSpells();
@ -461,6 +460,8 @@ namespace MWWorld
virtual void update (float duration, bool paused); virtual void update (float duration, bool paused);
virtual void updateWindowManager ();
virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount); virtual MWWorld::Ptr placeObject (const MWWorld::ConstPtr& object, float cursorX, float cursorY, int amount);
///< copy and place an object into the gameworld at the specified cursor position ///< copy and place an object into the gameworld at the specified cursor position
/// @param object /// @param object