mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 09:36:37 +00:00
Code Issues Projects Releases Wiki Activity

Small delay before the loading screen shows

Browse Source 
Kinda irritating to have the loading bar pop up for a fraction of a second.
This commit is contained in:
scrawl 2015-10-23 16:50:08 +02:00
parent 8552a9d82c
commit 69f234d97b
2 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/openmw/mwgui/loadingscreen.cpp
View File

@ -235,13 +235,38 @@ namespace MWGui
draw();
}
void LoadingScreen::draw()
bool LoadingScreen::needToDrawLoadingScreen()
{
if (mTimer.time_m() > mLastRenderTime + (1.0/mTargetFrameRate) * 1000.0)
if ( mTimer.time_m() <= mLastRenderTime + (1.0/mTargetFrameRate) * 1000.0)
return false;
// the minimal delay before a loading screen shows
const float initialDelay = 0.05;
bool alreadyShown = (mLastRenderTime > mLoadingOnTime);
float diff = (mTimer.time_m() - mLoadingOnTime);
if (!alreadyShown)
{
// bump the delay by the current progress - i.e. if during the initial delay the loading
// has almost finished, no point showing the loading screen now
diff -= mProgress / static_cast<float>(mProgressBar->getScrollRange()) * 100.f;
}
bool showWallpaper = (MWBase::Environment::get().getStateManager()->getState()
== MWBase::StateManager::State_NoGame);
if (!showWallpaper && diff < initialDelay*1000)
return false;
return true;
}
void LoadingScreen::draw()
{
if (!needToDrawLoadingScreen())
return;
bool showWallpaper = (MWBase::Environment::get().getStateManager()->getState()
== MWBase::StateManager::State_NoGame);
if (showWallpaper && mTimer.time_m() > mLastWallpaperChangeTime + 5000*1)
{
mLastWallpaperChangeTime = mTimer.time_m();
@ -269,6 +294,5 @@ namespace MWGui
mLastRenderTime = mTimer.time_m();
}
}
}

1
apps/openmw/mwgui/loadingscreen.hpp
View File

@ -52,6 +52,7 @@ namespace MWGui
private:
void findSplashScreens();
bool needToDrawLoadingScreen();
const VFS::Manager* mVFS;
osg::ref_ptr<osgViewer::Viewer> mViewer;