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

code cleanup according to code review.

Browse source
This commit is contained in:
rachytski 2012-03-29 16:45:53 +04:00 • committed by Alex Zolotarev
parent 75a77e20a4
commit 98507afbd6
4 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/basic_tiling_render_policy.cpp
View file

@ -72,7 +72,10 @@ void BasicTilingRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e, Screen
void BasicTilingRenderPolicy::EndFrame(shared_ptr<PaintEvent> const & e, ScreenBase const & s)
{
ScreenCoverage * curCvg = &m_CoverageGenerator->CurrentCoverage();
curCvg->EndFrame(e->drawer()->screen().get());
DrawerYG * pDrawer = e->drawer();
curCvg->EndFrame(pDrawer->screen().get());
m_CoverageGenerator->Mutex().Unlock();
if (m_QueuedRenderer)

7
map/framework.cpp
View file

@ -357,10 +357,11 @@ void Framework::DrawModel(shared_ptr<PaintEvent> const & e,
}
catch (redraw_operation_cancelled const &)
{
if (e->drawer()->screen()->renderState())
DrawerYG * pDrawer = e->drawer();
if (pDrawer->screen()->renderState())
{
e->drawer()->screen()->renderState()->m_isEmptyModelCurrent = false;
e->drawer()->screen()->renderState()->m_isEmptyModelActual = false;
pDrawer->screen()->renderState()->m_isEmptyModelCurrent = false;
pDrawer->screen()->renderState()->m_isEmptyModelActual = false;
}
}

14
map/simple_render_policy.cpp
View file

@ -132,16 +132,16 @@ void SimpleRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
shared_ptr<yg::InfoLayer> infoLayer(new yg::InfoLayer());
e->drawer()->screen()->setInfoLayer(infoLayer);
DrawerYG * pDrawer = e->drawer();
e->drawer()->screen()->beginFrame();
e->drawer()->screen()->clear(m_bgColor);
pDrawer->screen()->setInfoLayer(infoLayer);
pDrawer->screen()->beginFrame();
pDrawer->screen()->clear(m_bgColor);
m_renderFn(e, s, s.ClipRect(), s.ClipRect(), scales::GetScaleLevel(glbRect), false);
infoLayer->draw(e->drawer()->screen().get(), math::Identity<double, 3>());
e->drawer()->screen()->resetInfoLayer();
infoLayer->draw(pDrawer->screen().get(), math::Identity<double, 3>());
pDrawer->screen()->resetInfoLayer();
e->drawer()->screen()->endFrame();
pDrawer->screen()->endFrame();
}

24
map/test_render_policy.cpp
View file

@ -150,13 +150,15 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
/// drawing with Z-order
DrawerYG * pDrawer = e->drawer();
for (unsigned i = 0; i < 40; ++i)
e->drawer()->screen()->drawRectangle(m2::RectD(10 + i, 10 + i, 110 + i, 110 + i),
pDrawer->screen()->drawRectangle(m2::RectD(10 + i, 10 + i, 110 + i, 110 + i),
yg::Color(255 - (i * 2) % 255, i * 2 % 255, 0, 255),
200 - i);
e->drawer()->screen()->drawRectangle(m2::RectD(80, 80, 180, 180), yg::Color(0, 255, 0, 255), 100);
e->drawer()->screen()->flush(-1);
pDrawer->screen()->drawRectangle(m2::RectD(80, 80, 180, 180), yg::Color(0, 255, 0, 255), 100);
pDrawer->screen()->flush(-1);
/// performing updateActualTarget
@ -185,9 +187,9 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
/// drawing with Z-order
e->drawer()->screen()->drawRectangle(m2::RectD(110, 110, 210, 210), yg::Color(0, 0, 255, 255), 50);
e->drawer()->screen()->drawRectangle(m2::RectD(140, 140, 240, 240), yg::Color(0, 255, 255, 255), 25);
e->drawer()->screen()->flush(-1);
pDrawer->screen()->drawRectangle(m2::RectD(110, 110, 210, 210), yg::Color(0, 0, 255, 255), 50);
pDrawer->screen()->drawRectangle(m2::RectD(140, 140, 240, 240), yg::Color(0, 255, 255, 255), 25);
pDrawer->screen()->flush(-1);
/// performing last updateActualTarget
@ -212,9 +214,9 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
OGLCHECK(glFramebufferTexture2DFn(GL_FRAMEBUFFER_MWM, GL_COLOR_ATTACHMENT0_MWM, GL_TEXTURE_2D, m_backBuffer->id(), 0));
e->drawer()->screen()->drawRectangle(m2::RectD(90, 150, 190, 250), yg::Color(255, 0, 255, 255), 20);
e->drawer()->screen()->drawRectangle(m2::RectD(120, 180, 220, 280), yg::Color(128, 128, 255, 255), 10);
e->drawer()->screen()->flush(-1);
pDrawer->screen()->drawRectangle(m2::RectD(90, 150, 190, 250), yg::Color(255, 0, 255, 255), 20);
pDrawer->screen()->drawRectangle(m2::RectD(120, 180, 220, 280), yg::Color(128, 128, 255, 255), 10);
pDrawer->screen()->flush(-1);
/// performing updateActualTarget
OGLCHECK(glFramebufferTexture2DFn(GL_FRAMEBUFFER_MWM, GL_COLOR_ATTACHMENT0_MWM, GL_TEXTURE_2D, m_actualTarget->id(), 0));
@ -231,9 +233,9 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
m_primaryFrameBuffer->makeCurrent();
utils::setupCoordinates(m_primaryFrameBuffer->width(), m_primaryFrameBuffer->height(), true);
e->drawer()->screen()->clear(m_bgColor);
pDrawer->screen()->clear(m_bgColor);
e->drawer()->screen()->blit(m_actualTarget, m_screen, s);
pDrawer->screen()->blit(m_actualTarget, m_screen, s);
}
m2::RectI const TestRenderPolicy::OnSize(int w, int h)