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

Fixes after rebasing

Browse source
This commit is contained in:
r.kuznetsov 2015-06-09 15:33:10 +03:00
parent 82d87dc5e1
commit cd0dc231ad
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/frontend_renderer.cpp
View file

@ -501,14 +501,15 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
SelectionShape::ESelectedObject selectedObject = m_selectionShape->GetSelectedObject();
if (selectedObject == SelectionShape::OBJECT_MY_POSITION)
{
GLFunctions::glClearDepth();
m_myPositionController->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
m_routeRenderer->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
ASSERT(m_myPositionController->IsModeHasPosition(), ());
m_selectionShape->SetPosition(m_myPositionController->Position());
m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
}
else if (selectedObject == SelectionShape::OBJECT_POI)
m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
}
m_routeRenderer->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
m_myPositionController->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
for (; currentRenderGroup < m_renderGroups.size(); ++currentRenderGroup)

2
drape_frontend/message.hpp
View file

@ -30,7 +30,7 @@ public:
CompassInfo,
GpsInfo,
FindVisiblePOI,
SelectObject
SelectObject,
GetMyPosition,
AddRoute,
RemoveRoute,