diff options
| author | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2015-12-24 18:53:17 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-01-04 14:44:10 +0300 |
| commit | 46a689b96d02299015946d4586c0118a958be731 (patch) | |
| tree | df86b03ce6ab2b967efb9e90703a7cc70f53acf7 /drape | |
| parent | 3461b1efd0f0f49e111f76b6c159d6b707159a77 (diff) | |
Review fixes
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/debug_rect_renderer.cpp | 4 | ||||
| -rw-r--r-- | drape/debug_rect_renderer.hpp | 2 | ||||
| -rw-r--r-- | drape/overlay_tree.cpp | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drape/debug_rect_renderer.cpp b/drape/debug_rect_renderer.cpp index 05e258709a..c4f9353298 100644 --- a/drape/debug_rect_renderer.cpp +++ b/drape/debug_rect_renderer.cpp @@ -139,8 +139,8 @@ void DebugRectRenderer::DrawArrow(ScreenBase const & screen, OverlayTree::Displa GLFunctions::glDisable(gl_const::GLDepthTest); array<m2::PointF, 5> vertices; - m2::PointF dir = (data.m_arrowEnd - data.m_arrowStart).Normalize(); - m2::PointF side = m2::PointF(-dir.y, dir.x); + m2::PointF const dir = (data.m_arrowEnd - data.m_arrowStart).Normalize(); + m2::PointF const side = m2::PointF(-dir.y, dir.x); vertices[0] = PixelPointToScreenSpace(screen, data.m_arrowStart); vertices[1] = PixelPointToScreenSpace(screen, data.m_arrowEnd); vertices[2] = PixelPointToScreenSpace(screen, data.m_arrowEnd - dir * 20 + side * 10); diff --git a/drape/debug_rect_renderer.hpp b/drape/debug_rect_renderer.hpp index 6c73461d90..7c64749e27 100644 --- a/drape/debug_rect_renderer.hpp +++ b/drape/debug_rect_renderer.hpp @@ -7,7 +7,7 @@ #include "geometry/rect2d.hpp" #include "geometry/screenbase.hpp" -#define RENDER_DEBUG_RECTS +//#define RENDER_DEBUG_RECTS namespace dp { diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index b2e16445fc..599d3ab7a0 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -173,15 +173,15 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, Erase(parentOverlay); #ifdef COLLECT_DISPLACEMENT_INFO - m_displacementInfo.emplace_back(DisplacementData(handle->GetPixelRect(modelView).Center(), - parentOverlay.m_handle->GetPixelRect(modelView).Center(), + m_displacementInfo.emplace_back(DisplacementData(handle->GetPixelRect(modelView, is3dMode).Center(), + parentOverlay.m_handle->GetPixelRect(modelView, is3dMode).Center(), dp::Color(0, 255, 0, 255))); #endif } #ifdef COLLECT_DISPLACEMENT_INFO - m_displacementInfo.emplace_back(DisplacementData(info.m_handle->GetPixelRect(modelView).Center(), - handle->GetPixelRect(modelView).Center(), + m_displacementInfo.emplace_back(DisplacementData(info.m_handle->GetPixelRect(modelView, is3dMode).Center(), + handle->GetPixelRect(modelView, is3dMode).Center(), dp::Color(0, 0, 255, 255))); #endif return; @@ -198,8 +198,8 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, Erase(handleToDelete); #ifdef COLLECT_DISPLACEMENT_INFO - m_displacementInfo.emplace_back(DisplacementData(handle->GetPixelRect(modelView).Center(), - handleToDelete.m_handle->GetPixelRect(modelView).Center(), + m_displacementInfo.emplace_back(DisplacementData(handle->GetPixelRect(modelView, is3dMode).Center(), + handleToDelete.m_handle->GetPixelRect(modelView, is3dMode).Center(), dp::Color(0, 0, 255, 255))); #endif } |