From 0b6a8f09d42fa87ffa6a1611894ec1138c3edf1e Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 24 Jul 2011 17:27:27 +0300 Subject: [PATCH] [android] Enabled text filtering --- android/jni/rendering.cpp | 1 + map/render_policy_st.cpp | 8 ++++++++ yg/info_layer.cpp | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/android/jni/rendering.cpp b/android/jni/rendering.cpp index d2c733b598..c20bd28bb1 100644 --- a/android/jni/rendering.cpp +++ b/android/jni/rendering.cpp @@ -50,6 +50,7 @@ shared_ptr CreateDrawer(shared_ptr pRM) p.m_resourceManager = pRM; p.m_glyphCacheID = pRM->guiThreadGlyphCacheID(); p.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(true)); + p.m_useOverlay = true; return make_shared_ptr(new DrawerYG(pl.SkinName(), p)); } diff --git a/map/render_policy_st.cpp b/map/render_policy_st.cpp index 2c59d4608c..021f97a534 100644 --- a/map/render_policy_st.cpp +++ b/map/render_policy_st.cpp @@ -3,6 +3,7 @@ #include "render_policy_st.hpp" #include "events.hpp" #include "drawer_yg.hpp" +#include "../yg/info_layer.hpp" #include "../indexer/scales.hpp" #include "../geometry/screenbase.hpp" @@ -31,10 +32,17 @@ void RenderPolicyST::DrawFrame(shared_ptr const & e, pxCenter + m2::PointD(scaleEtalonSize / 2, scaleEtalonSize / 2)), glbRect); + shared_ptr infoLayer(new yg::InfoLayer()); + + e->drawer()->screen()->setInfoLayer(infoLayer); + e->drawer()->SetVisualScale(GetPlatform().VisualScale()); e->drawer()->screen()->clear(bgColor()); renderFn()(e, s, s.GlobalRect(), scales::GetScaleLevel(glbRect)); + + infoLayer->draw(e->drawer()->screen().get(), math::Identity()); + e->drawer()->screen()->resetInfoLayer(); } void RenderPolicyST::OnSize(int w, int h) diff --git a/yg/info_layer.cpp b/yg/info_layer.cpp index 49eb2ae8d9..827bf91ed8 100644 --- a/yg/info_layer.cpp +++ b/yg/info_layer.cpp @@ -199,10 +199,10 @@ namespace yg void InfoLayer::addPathText(PathTextElement const & pte, math::Matrix const & m) { -/* if (m == math::Identity()) + if (m == math::Identity()) addPathTextImpl(pte); else - addPathTextImpl(PathTextElement(pte, m));*/ + addPathTextImpl(PathTextElement(pte, m)); } void InfoLayer::merge(InfoLayer const & layer, math::Matrix const & m)