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

Review fixes

Browse source
This commit is contained in:
Roman Kuznetsov 2015-12-24 18:53:17 +03:00 • committed by r.kuznetsov
parent 3461b1efd0
commit 46a689b96d
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape/debug_rect_renderer.cpp
View file

@ -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);

2
drape/debug_rect_renderer.hpp
View file

@ -7,7 +7,7 @@
#include "geometry/rect2d.hpp"
#include "geometry/screenbase.hpp"
#define RENDER_DEBUG_RECTS
//#define RENDER_DEBUG_RECTS
namespace dp
{

12
drape/overlay_tree.cpp
View file

@ -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
}