mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 13:53:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'loadingScreen_initialdrawcallback' into 'master'

Browse source 
Wait for initialDrawCallback to finish before removing it

See merge request OpenMW/openmw!476
This commit is contained in:
psi29a 2020-12-18 08:48:39 +00:00
commit e586544ade
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwgui/loadingscreen.cpp
View file

@ -1,6 +1,7 @@
#include "loadingscreen.hpp"
#include <array>
#include <condition_variable>
#include <osgViewer/Viewer>
@ -139,6 +140,7 @@ namespace MWGui
public:
CopyFramebufferToTextureCallback(osg::Texture2D* texture)
: mTexture(texture)
, mOneshot(true)
{
}
@ -147,9 +149,25 @@ namespace MWGui
int w = renderInfo.getCurrentCamera()->getViewport()->width();
int h = renderInfo.getCurrentCamera()->getViewport()->height();
mTexture->copyTexImage2D(*renderInfo.getState(), 0, 0, w, h);
{
std::unique_lock<std::mutex> lock(mMutex);
mOneshot = false;
}
mSignal.notify_all();
}
void wait()
{
std::unique_lock<std::mutex> lock(mMutex);
while (mOneshot)
mSignal.wait(lock);
}
private:
mutable bool mOneshot;
mutable std::mutex mMutex;
mutable std::condition_variable mSignal;
osg::ref_ptr<osg::Texture2D> mTexture;
};
@ -375,7 +393,7 @@ namespace MWGui
if (mCopyFramebufferToTextureCallback)
{
mCopyFramebufferToTextureCallback->wait();
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 10)
mViewer->getCamera()->removeInitialDrawCallback(mCopyFramebufferToTextureCallback);
#else