mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 06:40:09 +00:00
Code Issues Projects Releases Wiki Activity

Call WindowBase::onFrame() for every active window

Browse Source
This commit is contained in:
scrawl 2017-09-23 22:00:15 +02:00
parent ba7ae2663f
commit 2b03bc0c56
20 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwgui/companionwindow.cpp
View File

@ -116,8 +116,9 @@ void CompanionWindow::setPtr(const MWWorld::Ptr& npc)
setTitle(npc.getClass().getName(npc));
}
void CompanionWindow::onFrame()
void CompanionWindow::onFrame(float dt)
{
checkReferenceAvailable();
updateEncumbranceBar();
}

2
apps/openmw/mwgui/companionwindow.hpp
View File

@ -23,7 +23,7 @@ namespace MWGui
virtual void resetReference();
void setPtr(const MWWorld::Ptr& npc);
void onFrame ();
void onFrame (float dt);
private:
ItemView* mItemView;

2
apps/openmw/mwgui/console.hpp
View File

@ -42,6 +42,8 @@ namespace MWGui
virtual void onOpen();
virtual void onClose();
void onFrame(float dt) { checkReferenceAvailable(); }
void setFont(const std::string &fntName);
void onResChange(int width, int height);

2
apps/openmw/mwgui/container.hpp
View File

@ -36,6 +36,8 @@ namespace MWGui
void setPtr(const MWWorld::Ptr& container);
virtual void onClose();
void onFrame(float dt) { checkReferenceAvailable(); }
virtual void resetReference();
private:

5
apps/openmw/mwgui/dialogue.cpp
View File

@ -630,9 +630,10 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Dialogue);
}
void DialogueWindow::onFrame()
void DialogueWindow::onFrame(float dt)
{
if(mMainWidget->getVisible() && mPtr.getTypeName() == typeid(ESM::NPC).name())
checkReferenceAvailable();
if(mPtr.getTypeName() == typeid(ESM::NPC).name())
{
int disp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
mDispositionBar->setProgressRange(100);

2
apps/openmw/mwgui/dialogue.hpp
View File

@ -117,7 +117,7 @@ namespace MWGui
void clearChoices();
void goodbye();
void onFrame();
void onFrame(float dt);
// make sure to call these before setKeywords()
void setServices(int services) { mServices = services; }

2
apps/openmw/mwgui/enchantingdialog.hpp
View File

@ -21,6 +21,8 @@ namespace MWGui
virtual void onOpen();
void onFrame(float dt) { checkReferenceAvailable(); }
void setSoulGem (const MWWorld::Ptr& gem);
void setItem (const MWWorld::Ptr& item);

5
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -589,11 +589,8 @@ namespace MWGui
mEncumbranceBar->setValue(static_cast<int>(encumbrance), static_cast<int>(capacity));
}
void InventoryWindow::onFrame()
void InventoryWindow::onFrame(float dt)
{
if (!mMainWidget->getVisible())
return;
updateEncumbranceBar();
}

2
apps/openmw/mwgui/inventorywindow.hpp
View File

@ -40,7 +40,7 @@ namespace MWGui
/// start trading, disables item drag&drop
void setTrading(bool trading);
void onFrame();
void onFrame(float dt);
void pickUpObject (MWWorld::Ptr object);

2
apps/openmw/mwgui/mainmenu.cpp
View File

@ -197,7 +197,7 @@ namespace MWGui
}
}
void MainMenu::update(float dt)
void MainMenu::onFrame(float dt)
{
if (mVideo)
{

2
apps/openmw/mwgui/mainmenu.hpp
View File

@ -36,7 +36,7 @@ namespace MWGui
virtual void setVisible (bool visible);
void update(float dt);
void onFrame(float dt);
private:
const VFS::Manager* mVFS;

2
apps/openmw/mwgui/spellbuyingwindow.hpp
View File

@ -28,6 +28,8 @@ namespace MWGui
void setPtr(const MWWorld::Ptr& actor);
void setPtr(const MWWorld::Ptr& actor, int startOffset);
void onFrame(float dt) { checkReferenceAvailable(); }
protected:
MyGUI::Button* mCancelButton;
MyGUI::TextBox* mPlayerGold;

2
apps/openmw/mwgui/spellcreationdialog.hpp
View File

@ -152,6 +152,8 @@ namespace MWGui
virtual void onOpen();
void onFrame(float dt) { checkReferenceAvailable(); }
void setPtr(const MWWorld::Ptr& actor);
protected:

15
apps/openmw/mwgui/spellwindow.cpp
View File

@ -68,16 +68,13 @@ namespace MWGui
}
void SpellWindow::onFrame(float dt)
{
if (mMainWidget->getVisible())
{
NoDrop::onFrame(dt);
mUpdateTimer += dt;
if (0.5f < mUpdateTimer)
{
NoDrop::onFrame(dt);
mUpdateTimer += dt;
if (0.5f < mUpdateTimer)
{
mUpdateTimer = 0;
mSpellView->incrementalUpdate();
}
mUpdateTimer = 0;
mSpellView->incrementalUpdate();
}
}

3
apps/openmw/mwgui/statswindow.cpp
View File

@ -297,9 +297,6 @@ namespace MWGui
void StatsWindow::onFrame (float dt)
{
if (!mMainWidget->getVisible())
return;
NoDrop::onFrame(dt);
MWWorld::Ptr player = MWMechanics::getPlayer();

5
apps/openmw/mwgui/tradewindow.cpp
View File

@ -142,6 +142,11 @@ namespace MWGui
onFilterChanged(mFilterAll);
}
void TradeWindow::onFrame(float dt)
{
checkReferenceAvailable();
}
void TradeWindow::onFilterChanged(MyGUI::Widget* _sender)
{
if (_sender == mFilterAll)

2
apps/openmw/mwgui/tradewindow.hpp
View File

@ -29,6 +29,8 @@ namespace MWGui
void setPtr(const MWWorld::Ptr& actor);
void onFrame(float dt);
void borrowItem (int index, size_t count);
void returnItem (int index, size_t count);

1
apps/openmw/mwgui/trainingwindow.cpp
View File

@ -195,6 +195,7 @@ namespace MWGui
void TrainingWindow::onFrame(float dt)
{
checkReferenceAvailable();
mTimeAdvancer.onFrame(dt);
if (mFadeTimeRemaining <= 0)

3
apps/openmw/mwgui/windowbase.hpp
View File

@ -29,6 +29,9 @@ namespace MWGui
/// Open this object in the GUI, for windows that support it
virtual void setPtr(const MWWorld::Ptr& ptr) {}
/// Called every frame if the window is in an active GUI mode
virtual void onFrame(float duration) {}
/// Notify that window has been made visible
virtual void onOpen() {}
/// Notify that window has been hidden

35
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -890,12 +890,19 @@ namespace MWGui
void WindowManager::onFrame (float frameDuration)
{
if (!mGuiModes.empty())
{
GuiModeState& state = mGuiModeStates[mGuiModes.back()];
for (WindowBase* window : state.mWindows)
window->onFrame(frameDuration);
}
if (!mCurrentModals.empty())
mCurrentModals.top()->onFrame(frameDuration);
mMessageBoxManager->onFrame(frameDuration);
mToolTips->onFrame(frameDuration);
mMenu->update(frameDuration);
if (mLocalMapRender)
mLocalMapRender->cleanupCameras();
@ -909,34 +916,10 @@ namespace MWGui
mDragAndDrop->mDraggedWidget->setPosition(MyGUI::InputManager::getInstance().getMousePosition());
}
mDialogueWindow->onFrame();
mInventoryWindow->onFrame();
updateMap();
mStatsWindow->onFrame(frameDuration);
mMap->onFrame(frameDuration);
mSpellWindow->onFrame(frameDuration);
mWaitDialog->onFrame(frameDuration);
mHud->onFrame(frameDuration);
mTrainingWindow->onFrame (frameDuration);
mTrainingWindow->checkReferenceAvailable();
mDialogueWindow->checkReferenceAvailable();
mTradeWindow->checkReferenceAvailable();
mSpellBuyingWindow->checkReferenceAvailable();
mSpellCreationDialog->checkReferenceAvailable();
mEnchantingDialog->checkReferenceAvailable();
mContainerWindow->checkReferenceAvailable();
mCompanionWindow->checkReferenceAvailable();
mConsole->checkReferenceAvailable();
mCompanionWindow->onFrame();
mJailScreen->onFrame(frameDuration);
if (mWerewolfFader)
mWerewolfFader->update(frameDuration);
mBlindnessFader->update(frameDuration);