From cd0dc231ad79c089b254038ffe0f8141cf0989b0 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 9 Jun 2015 15:33:10 +0300 Subject: [PATCH] Fixes after rebasing --- drape_frontend/frontend_renderer.cpp | 7 ++++--- drape_frontend/message.hpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index e408618cd5..edf4bf0ceb 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -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) diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp index ac0b0a3c25..dcfbc2cc2a 100644 --- a/drape_frontend/message.hpp +++ b/drape_frontend/message.hpp @@ -30,7 +30,7 @@ public: CompassInfo, GpsInfo, FindVisiblePOI, - SelectObject + SelectObject, GetMyPosition, AddRoute, RemoveRoute,