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

Merge pull request #1263 from darina/selection-shape-fix

Browse source 
Fixed selection shape rendering order when 3d buildings feature is on.
This commit is contained in:
Roman Kuznetsov 2016-01-07 12:05:17 +03:00
commit 0ba8b4e977
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/frontend_renderer.cpp
View file

@ -814,9 +814,10 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
}
else if (selectedObject == SelectionShape::OBJECT_POI)
{
hasSelectedPOI = true;
if (!isPerspective)
if (!isPerspective && !has3dAreas)
m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
else
hasSelectedPOI = true;
}
}
@ -842,7 +843,7 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
m_transparentLayer->Render(m_framebuffer->GetTextureId(), make_ref(m_gpuProgramManager));
}
if (isPerspective && hasSelectedPOI)
if (hasSelectedPOI)
{
GLFunctions::glDisable(gl_const::GLDepthTest);
m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);