mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-04-23 19:12:22 +03:00
parent 3b009921ae
commit 199040d0aa
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/timer.cpp
View file

@ -144,4 +144,9 @@ uint64_t HighResTimer::ElapsedNano() const
return duration_cast<nanoseconds>(high_resolution_clock::now() - m_start).count();
}
double HighResTimer::ElapsedSeconds() const
{
return duration_cast<duration<double>>(high_resolution_clock::now() - m_start).count();
}
}

1
base/timer.hpp
View file

@ -67,6 +67,7 @@ public:
void Reset();
uint64_t ElapsedNano() const;
double ElapsedSeconds() const;
};
}

10
drape_frontend/frontend_renderer.cpp
View file

@ -449,22 +449,24 @@ void FrontendRenderer::Routine::Do()
GLFunctions::glCullFace(gl_const::GLBack);
GLFunctions::glEnable(gl_const::GLCullFace);
my::Timer timer;
my::HighResTimer timer;
//double processingTime = InitAvarageTimePerMessage; // By init we think that one message processed by 1ms
timer.Reset();
bool isInactiveLastFrame = false;
while (!IsCancelled())
{
context->setDefaultFramebuffer();
m_renderer.m_textureManager->UpdateDynamicTextures();
m_renderer.RenderScene();
bool const viewChanged = m_renderer.UpdateScene();
context->present();
bool const isInactiveCurrentFrame = (!viewChanged && m_renderer.IsQueueEmpty());
if (!viewChanged && m_renderer.IsQueueEmpty())
if (isInactiveLastFrame && isInactiveCurrentFrame)
{
// process a message or wait for a message
m_renderer.ProcessSingleMessage();
isInactiveLastFrame = false;
}
else
{
@ -481,8 +483,10 @@ void FrontendRenderer::Routine::Do()
}
//processingTime = (timer.ElapsedSeconds() - processingTime) / messageCount;
isInactiveLastFrame = isInactiveCurrentFrame;
}
context->present();
timer.Reset();
m_renderer.CheckRenderingEnabled();