teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove redundant update function

Browse source
This commit is contained in:
scrawl 2017-09-23 22:24:22 +02:00
parent e7d2a8a4dc
commit f67dbc8aa0
6 changed files with 18 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/engine.cpp
View file

@ -161,11 +161,6 @@ void OMW::Engine::frame(float frametime)
// update GUI // update GUI
mEnvironment.getWindowManager()->onFrame(frametime); mEnvironment.getWindowManager()->onFrame(frametime);
if (mEnvironment.getStateManager()->getState()!=
MWBase::StateManager::State_NoGame)
{
mEnvironment.getWindowManager()->update();
}
unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber(); unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
osg::Stats* stats = mViewer->getViewerStats(); osg::Stats* stats = mViewer->getViewerStats();

7
apps/openmw/mwbase/windowmanager.hpp
View file

@ -102,13 +102,6 @@ namespace MWBase
virtual ~WindowManager() {} virtual ~WindowManager() {}
/**
* Should be called each frame to update windows/gui elements.
* This could mean updating sizes of gui elements or opening
* new dialogs.
*/
virtual void update() = 0;
/// @note This method will block until the video finishes playing /// @note This method will block until the video finishes playing
/// (and will continually update the window while doing so) /// (and will continually update the window while doing so)
virtual void playVideo(const std::string& name, bool allowSkipping) = 0; virtual void playVideo(const std::string& name, bool allowSkipping) = 0;

31
apps/openmw/mwgui/hud.cpp
View file

@ -371,6 +371,20 @@ namespace MWGui
if (mIsDrowning) if (mIsDrowning)
mDrowningFlashTheta += dt * osg::PI*2; mDrowningFlashTheta += dt * osg::PI*2;
mSpellIcons->updateWidgets(mEffectBox, true);
if (mEnemyActorId != -1 && mEnemyHealth->getVisible())
{
updateEnemyHealthBar();
}
if (mIsDrowning)
{
float intensity = (cos(mDrowningFlashTheta) + 2.0f) / 3.0f;
mDrowningFlash->setAlpha(intensity);
}
} }
void HUD::setSelectedSpell(const std::string& spellId, int successChancePercent) void HUD::setSelectedSpell(const std::string& spellId, int successChancePercent)
@ -602,23 +616,6 @@ namespace MWGui
} }
void HUD::update()
{
mSpellIcons->updateWidgets(mEffectBox, true);
if (mEnemyActorId != -1 && mEnemyHealth->getVisible())
{
updateEnemyHealthBar();
}
if (mIsDrowning)
{
float intensity = (cos(mDrowningFlashTheta) + 2.0f) / 3.0f;
mDrowningFlash->setAlpha(intensity);
}
}
void HUD::setEnemy(const MWWorld::Ptr &enemy) void HUD::setEnemy(const MWWorld::Ptr &enemy)
{ {
mEnemyActorId = enemy.getClass().getCreatureStats(enemy).getActorId(); mEnemyActorId = enemy.getClass().getCreatureStats(enemy).getActorId();

2
apps/openmw/mwgui/hud.hpp
View file

@ -55,8 +55,6 @@ namespace MWGui
MyGUI::Widget* getEffectBox() { return mEffectBox; } MyGUI::Widget* getEffectBox() { return mEffectBox; }
void update();
void setEnemy(const MWWorld::Ptr& enemy); void setEnemy(const MWWorld::Ptr& enemy);
void resetEnemy(); void resetEnemy();

13
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -581,15 +581,6 @@ namespace MWGui
} }
} }
void WindowManager::update()
{
cleanupGarbage();
mHud->update();
updateActivatedQuickKey ();
}
void WindowManager::updateVisible() void WindowManager::updateVisible()
{ {
if (!mMap) if (!mMap)
@ -926,6 +917,10 @@ namespace MWGui
if (mCharGen) if (mCharGen)
mCharGen->onFrame(frameDuration); mCharGen->onFrame(frameDuration);
updateActivatedQuickKey ();
cleanupGarbage();
} }
void WindowManager::changeCell(const MWWorld::CellStore* cell) void WindowManager::changeCell(const MWWorld::CellStore* cell)

7
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -146,13 +146,6 @@ namespace MWGui
/// (and will continually update the window while doing so) /// (and will continually update the window while doing so)
virtual void playVideo(const std::string& name, bool allowSkipping); virtual void playVideo(const std::string& name, bool allowSkipping);
/**
* Should be called each frame to update windows/gui elements.
* This could mean updating sizes of gui elements or opening
* new dialogs.
*/
virtual void update();
/// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this. /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
virtual void setKeyFocusWidget (MyGUI::Widget* widget); virtual void setKeyFocusWidget (MyGUI::Widget* widget);