Unverified Commit 5e12073b authored by Bret Curtis's avatar Bret Curtis Committed by GitHub

Merge pull request #2272 from akortunov/optimize_terrain

Do not block loading while compiling composite maps
parents 0c11f903 0e1f5f68
Pipeline #52903950 passed with stage
......@@ -47,8 +47,6 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
double availableTime = std::max((targetFrameTime - dt)*conservativeTimeRatio,
mMinimumTimeAvailable);
mCompiled.clear();
if (mWorkQueue)
mUnrefQueue->flush(mWorkQueue.get());
......@@ -59,26 +57,30 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
while (!mImmediateCompileSet.empty())
{
CompositeMap* node = *mImmediateCompileSet.begin();
mCompiled.insert(node);
osg::ref_ptr<CompositeMap> node = *mImmediateCompileSet.begin();
mImmediateCompileSet.erase(node);
mMutex.unlock();
compile(*node, renderInfo, nullptr);
mImmediateCompileSet.erase(mImmediateCompileSet.begin());
mMutex.lock();
}
double timeLeft = availableTime;
while (!mCompileSet.empty() && timeLeft > 0)
{
CompositeMap* node = *mCompileSet.begin();
osg::ref_ptr<CompositeMap> node = *mCompileSet.begin();
mCompileSet.erase(node);
mMutex.unlock();
compile(*node, renderInfo, &timeLeft);
mMutex.lock();
if (node->mCompiled >= node->mDrawables.size())
if (node->mCompiled < node->mDrawables.size())
{
mCompiled.insert(node);
mCompileSet.erase(mCompileSet.begin());
// We did not compile the map fully.
// Place it back to queue to continue work in the next time.
mCompileSet.insert(node);
}
}
mTimer.setStartTick();
......
......@@ -76,8 +76,6 @@ namespace Terrain
mutable CompileSet mCompileSet;
mutable CompileSet mImmediateCompileSet;
mutable CompileSet mCompiled;
mutable OpenThreads::Mutex mMutex;
osg::ref_ptr<osg::FrameBufferObject> mFBO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment