diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-19 16:39:51 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-19 16:41:41 +0300 |
commit | 09f40ceeb006843c405923afb05c5522f7d9f921 (patch) | |
tree | 49f4df42e7dc3fde99a2f6bdd94d25cf0a9dc993 /drape_frontend | |
parent | 40856edc02a43097f1ef7d62268fe85d6523e718 (diff) |
Fixed house numbers selection in perspective mode.
Diffstat (limited to 'drape_frontend')
-rwxr-xr-x | drape_frontend/frontend_renderer.cpp | 15 | ||||
-rw-r--r-- | drape_frontend/text_shape.cpp | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index c8b6c4dc03..d2afb09d40 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -39,7 +39,7 @@ namespace df namespace { -constexpr float kIsometryAngle = math::pi * 80.0f / 180.0f; +constexpr float kIsometryAngle = math::pi * 76.0f / 180.0f; const double VSyncInterval = 0.06; //const double VSyncInterval = 0.014; @@ -1210,18 +1210,7 @@ void FrontendRenderer::RefreshModelView(ScreenBase const & screen) m_generalUniforms.SetMatrix4x4Value("modelView", mv.m_data); - float zScale; - if (screen.isPerspective()) - { - // TODO: Calculate exact value of zScale - double const averageScale3d = 3.0; - zScale = 2.0f / (screen.PixelRectIn3d().SizeY() * averageScale3d * screen.GetScale()); - } - else - { - zScale = 2.0f / (screen.GetHeight() * screen.GetScale()); - } - + float const zScale = screen.GetZScale(); m_generalUniforms.SetFloatValue("zScale", zScale); } diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index 08336eac6d..7da84dda33 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -43,7 +43,7 @@ public: { m2::PointD pivot = TBase::GetPivot(screen, false); if (perspective) - pivot = screen.PtoP3d(pivot - m_offset, -m_pivotZ / screen.GetScale()) + m_offset; + pivot = screen.PtoP3d(pivot - m_offset, -m_pivotZ) + m_offset; return pivot; } @@ -54,7 +54,7 @@ public: if (IsBillboard()) { m2::PointD const pxPivot = screen.GtoP(m_pivot); - m2::PointD const pxPivotPerspective = screen.PtoP3d(pxPivot, -m_pivotZ / screen.GetScale()); + m2::PointD const pxPivotPerspective = screen.PtoP3d(pxPivot, -m_pivotZ); m2::RectD pxRectPerspective = GetPixelRect(screen, false); pxRectPerspective.Offset(-pxPivot); |