From 6ef28222f8606c76f46a12ce71d3e45be67b8d31 Mon Sep 17 00:00:00 2001 From: rachytski Date: Sun, 20 Mar 2011 12:28:12 +0200 Subject: [PATCH] doPeriodicalTextUpdate is switched off. --- iphone/Maps/Classes/EAGLView.mm | 2 +- yg/text_renderer.cpp | 10 +++++++--- yg/text_renderer.hpp | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index 2658b442ef..2b1b8e7df6 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -87,7 +87,7 @@ int blitIBSize = pow(2, ceil(log2(10 * sizeof(unsigned short)))); resourceManager = shared_ptr(new yg::ResourceManager( - bigVBSize, bigIBSize, 3, + bigVBSize, bigIBSize, 4, smallVBSize, smallIBSize, 10, blitVBSize, blitIBSize, 10, 512, 256, 10, diff --git a/yg/text_renderer.cpp b/yg/text_renderer.cpp index b77b9cf34f..c74402e6f2 100644 --- a/yg/text_renderer.cpp +++ b/yg/text_renderer.cpp @@ -24,7 +24,10 @@ namespace yg namespace gl { TextRenderer::Params::Params() - : m_textTreeAutoClean(true), m_useTextTree(false), m_drawTexts(true) + : m_textTreeAutoClean(true), + m_useTextTree(false), + m_drawTexts(true), + m_doPeriodicalTextUpdate(false) {} TextRenderer::TextRenderer(Params const & params) @@ -32,7 +35,8 @@ namespace yg m_needTextRedraw(false), m_textTreeAutoClean(params.m_textTreeAutoClean), m_useTextTree(params.m_useTextTree), - m_drawTexts(params.m_drawTexts) + m_drawTexts(params.m_drawTexts), + m_doPeriodicalTextUpdate(params.m_doPeriodicalTextUpdate) {} TextRenderer::TextObj::TextObj(m2::PointD const & pt, string const & txt, uint8_t sz, yg::Color const & c, bool isMasked, yg::Color const & maskColor, double d, bool isFixedFont, bool log2vis) @@ -178,7 +182,7 @@ namespace yg void TextRenderer::updateActualTarget() { if (m_useTextTree) - setNeedTextRedraw(true); + setNeedTextRedraw(m_doPeriodicalTextUpdate); base_t::updateActualTarget(); } diff --git a/yg/text_renderer.hpp b/yg/text_renderer.hpp index 02c68104e7..db58bfe2fb 100644 --- a/yg/text_renderer.hpp +++ b/yg/text_renderer.hpp @@ -91,6 +91,7 @@ namespace yg bool m_textTreeAutoClean; bool m_useTextTree; bool m_drawTexts; + bool m_doPeriodicalTextUpdate; public: @@ -101,6 +102,7 @@ namespace yg bool m_textTreeAutoClean; bool m_useTextTree; bool m_drawTexts; + bool m_doPeriodicalTextUpdate; Params(); };