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

Fixed rendering of selection shape

Browse source
This commit is contained in:
r.kuznetsov 2016-12-15 14:00:56 +03:00 • committed by Vladimir Byko-Ianko
parent aca06a5f03
commit 13ba308f6e
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drape_frontend/frontend_renderer.cpp
View file

@ -1094,8 +1094,6 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
BeforeDrawFrame();
#endif
bool const isPerspective = modelView.isPerspective();
GLFunctions::glEnable(gl_const::GLDepthTest);
m_viewport.Apply();
RefreshBgColor();
@ -1103,28 +1101,6 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
Render2dLayer(modelView);
bool hasSelectedPOI = false;
if (m_selectionShape != nullptr)
{
GLFunctions::glDisable(gl_const::GLDepthTest);
SelectionShape::ESelectedObject selectedObject = m_selectionShape->GetSelectedObject();
if (selectedObject == SelectionShape::OBJECT_MY_POSITION)
{
ASSERT(m_myPositionController->IsModeHasPosition(), ());
m_selectionShape->SetPosition(m_myPositionController->Position());
m_selectionShape->Render(modelView, m_currentZoomLevel,
make_ref(m_gpuProgramManager), m_generalUniforms);
}
else if (selectedObject == SelectionShape::OBJECT_POI)
{
if (!isPerspective && m_layers[RenderLayer::Geometry3dID].m_renderGroups.empty())
m_selectionShape->Render(modelView, m_currentZoomLevel,
make_ref(m_gpuProgramManager), m_generalUniforms);
else
hasSelectedPOI = true;
}
}
if (m_framebuffer->IsSupported())
{
RenderTrafficAndRouteLayer(modelView);
@ -1144,12 +1120,25 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
RenderTrafficAndRouteLayer(modelView);
}
GLFunctions::glDisable(gl_const::GLDepthTest);
if (hasSelectedPOI)
m_selectionShape->Render(modelView, m_currentZoomLevel, make_ref(m_gpuProgramManager), m_generalUniforms);
GLFunctions::glClearDepth();
if (m_selectionShape != nullptr)
{
GLFunctions::glDisable(gl_const::GLDepthTest);
SelectionShape::ESelectedObject selectedObject = m_selectionShape->GetSelectedObject();
if (selectedObject == SelectionShape::OBJECT_MY_POSITION)
{
ASSERT(m_myPositionController->IsModeHasPosition(), ());
m_selectionShape->SetPosition(m_myPositionController->Position());
m_selectionShape->Render(modelView, m_currentZoomLevel,
make_ref(m_gpuProgramManager), m_generalUniforms);
}
else if (selectedObject == SelectionShape::OBJECT_POI)
{
m_selectionShape->Render(modelView, m_currentZoomLevel, make_ref(m_gpuProgramManager), m_generalUniforms);
}
}
GLFunctions::glEnable(gl_const::GLDepthTest);
GLFunctions::glClearDepth();
RenderOverlayLayer(modelView);
m_gpsTrackRenderer->RenderTrack(modelView, m_currentZoomLevel, make_ref(m_gpuProgramManager), m_generalUniforms);