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

moved InfoLayer rendering from main thread to render thread.

Browse source
This commit is contained in:
rachytski 2011-06-13 00:34:33 +03:00 • committed by Alex Zolotarev
parent 01de4ae2f3
commit 33cc10e8a1
15 changed files with 64 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
base/base_tests/string_utils_test.cpp
View file

@ -263,3 +263,23 @@ UNIT_TEST(Normalize)
strings::Normalize(us);
TEST_EQUAL(us, result, ());
}
UNIT_TEST(UniString_Less)
{
strings::UniString s0 = strings::MakeUniString("Test");
TEST(!(s0 < s0), ());
strings::UniString s1 = strings::MakeUniString("Test1");
TEST(s0 < s1, ());
strings::UniString s2 = strings::MakeUniString("Tast");
TEST(s2 < s1, ());
strings::UniString s3 = strings::MakeUniString("Tas");
TEST(s3 < s0, ());
strings::UniString s4 = strings::MakeUniString("Taste");
TEST(!(s0 < s4), ());
strings::UniString s5 = strings::MakeUniString("Tist");
TEST(s0 < s5, ());
strings::UniString s6 = strings::MakeUniString("Tis");
TEST(s0 < s6, ());
strings::UniString s7 = strings::MakeUniString("Tiste");
TEST(s0 < s7, ());
}

17
base/buffer_vector.hpp
View file

@ -234,6 +234,23 @@ inline bool operator==(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> con
return (v1.size() == v2.size() && std::equal(v1.begin(), v1.end(), v2.begin()));
}
template <typename T, size_t N1, size_t N2>
inline bool operator<(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> const & v2)
{
const int N = v1.size() > v2.size() ? v2.size() : v1.size();
for (size_t i = 0; i < N; ++i)
{
if (v1[i] == v2[i])
continue;
return v1[i] < v2[i];
}
if (v1.size() == v2.size())
return false;
if (v1.size() == N)
return true;
return false;
}
template <typename T, size_t N1, size_t N2>
inline bool operator!=(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> const & v2)
{

3
iphone/Maps/Classes/EAGLView.mm
View file

@ -112,7 +112,8 @@
DrawerYG::params_t p;
p.m_resourceManager = resourceManager;
p.m_isMultiSampled = false;
p.m_frameBuffer = frameBuffer;
p.m_frameBuffer = frameBuffer;
p.m_glyphCacheID = 1;
drawer = shared_ptr<DrawerYG>(new DrawerYG(GetPlatform().SkinName(), p));

4
map/framework.cpp
View file

@ -884,9 +884,9 @@ void FrameWork<TModel>::AddRedrawCommandSure()
m_informationDisplay.doDraw(pDrawer);
m_renderQueue.renderState().m_actualInfoLayer->draw(
/* m_renderQueue.renderState().m_actualInfoLayer->draw(
pDrawer->screen().get(),
m_renderQueue.renderState().m_actualScreen.PtoGMatrix() * currentScreen.GtoPMatrix());
m_renderQueue.renderState().m_actualScreen.PtoGMatrix() * currentScreen.GtoPMatrix());*/
m_locationState.DrawMyPosition(*pDrawer, m_navigator.Screen());

10
map/render_queue_routine.cpp
View file

@ -239,7 +239,7 @@ void RenderQueueRoutine::Do()
params.m_renderState = m_renderState;
params.m_doPeriodicalUpdate = m_doPeriodicalUpdate;
params.m_updateInterval = m_updateInterval;
params.m_glyphCacheID = 1;
params.m_glyphCacheID = 0;
/* params.m_isDebugging = true;
params.m_drawPathes = false;
params.m_drawAreas = false;
@ -324,7 +324,7 @@ void RenderQueueRoutine::Do()
areas.push_back(curRect);
fullRectRepaint = true;
m_renderState->m_currentInfoLayer->clear();
m_renderState->m_actualInfoLayer->clear();
// m_renderState->m_actualInfoLayer->clear();
m_renderState->m_doRepaintAll = false;
}
else
@ -358,7 +358,7 @@ void RenderQueueRoutine::Do()
else
{
m_renderState->m_currentInfoLayer->clear();
m_renderState->m_actualInfoLayer->clear();
// m_renderState->m_actualInfoLayer->clear();
}
}
}
@ -423,6 +423,10 @@ void RenderQueueRoutine::Do()
/// setting the "whole texture" clip rect to render texts opened by panning.
m_threadDrawer->screen()->setClipRect(textureRect);
/// rendering all collected texts
m_renderState->m_currentInfoLayer->draw(m_threadDrawer->screen().get(), math::Identity<double, 3>());
m_threadDrawer->endFrame();
}

1
qt/widgets.cpp
View file

@ -65,6 +65,7 @@ namespace qt
p.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(true));
p.m_dynamicPagesCount = 2;
p.m_textPagesCount = 2;
p.m_glyphCacheID = 1;
m_p = shared_ptr<DrawerYG>(new DrawerYG(GetPlatform().SkinName(), p));
}

1
qt_tstfrm/tstwidgets.cpp
View file

@ -71,6 +71,7 @@ void GLDrawWidget::initializeGL()
params.m_resourceManager = m_resourceManager;
params.m_isMultiSampled = false;
params.m_frameBuffer = m_frameBuffer;
params.m_glyphCacheID = 1;
m_p = make_shared_ptr(new yg::gl::Screen(params));

3
yg/glyph_layout.cpp
View file

@ -133,7 +133,8 @@ namespace yg
double pathOffset,
yg::EPosition pos)
: m_firstVisible(0),
m_lastVisible(0)
m_lastVisible(0),
m_limitRect(m2::RectD(0, 0, 0, 0))
{
TextPath arrPath(pts, ptsCount, fullLength, pathOffset);

6
yg/info_layer.cpp
View file

@ -25,7 +25,7 @@ namespace yg
{
m_tree.ForEach(bind(&StraightTextElement::draw, _1, r, m));
list<string> toErase;
list<strings::UniString> toErase;
for (path_text_elements::const_iterator it = m_pathTexts.begin(); it != m_pathTexts.end(); ++it)
{
@ -38,7 +38,7 @@ namespace yg
toErase.push_back(it->first);
}
for (list<string>::const_iterator it = toErase.begin(); it != toErase.end(); ++it)
for (list<strings::UniString>::const_iterator it = toErase.begin(); it != toErase.end(); ++it)
m_pathTexts.erase(*it);
}
@ -111,7 +111,7 @@ namespace yg
void InfoLayer::addPathText(PathTextElement const & pte)
{
list<PathTextElement> & l = m_pathTexts[pte.utf8Text()];
list<PathTextElement> & l = m_pathTexts[pte.logText()];
bool doAppend = true;

2
yg/info_layer.hpp
View file

@ -28,7 +28,7 @@ namespace yg
static bool better_text(StraightTextElement const & r1, StraightTextElement const & r2);
m4::Tree<StraightTextElement, StraightTextElementTraits> m_tree;
typedef map<string, list<PathTextElement> > path_text_elements;
typedef map<strings::UniString, list<PathTextElement> > path_text_elements;
path_text_elements m_pathTexts;
void offsetPathTexts(m2::PointD const & offs, m2::RectD const & rect);

4
yg/render_state_updater.cpp
View file

@ -55,12 +55,12 @@ namespace yg
{
threads::MutexGuard guard(*m_renderState->m_mutex.get());
swap(m_renderState->m_actualTarget, m_renderState->m_backBufferLayers.front());
swap(m_renderState->m_actualInfoLayer, m_renderState->m_currentInfoLayer);
// swap(m_renderState->m_actualInfoLayer, m_renderState->m_currentInfoLayer);
m_renderState->m_actualScreen = m_renderState->m_currentScreen;
}
/// copying info layer
*m_renderState->m_currentInfoLayer.get() = *m_renderState->m_actualInfoLayer.get();
// *m_renderState->m_currentInfoLayer.get() = *m_renderState->m_actualInfoLayer.get();
/// blitting will be performed through
/// non-multisampled framebuffer for the sake of speed

1
yg/resource_manager.cpp
View file

@ -35,7 +35,6 @@ namespace yg
m_useVA(useVA),
m_fillSkinAlpha(fillSkinAlpha)
{
/// primary cache is for rendering, so it's big
m_glyphCaches.push_back(GlyphCache(GlyphCache::Params(blocksFile, whiteListFile, blackListFile, maxGlyphCacheSize)));
/// secondary caches is for glyph metrics only, so they are small

10
yg/text_element.cpp
View file

@ -63,8 +63,7 @@ namespace yg
m_fontDesc(p.m_fontDesc),
m_logText(p.m_logText),
m_log2vis(p.m_log2vis),
m_glyphCache(p.m_glyphCache),
m_utf8Text(p.m_utf8Text)
m_glyphCache(p.m_glyphCache)
{
if (m_log2vis)
m_visText = log2vis(m_logText);
@ -82,11 +81,6 @@ namespace yg
return m_visText;
}
string const & TextElement::utf8Text() const
{
return m_utf8Text;
}
FontDesc const & TextElement::fontDesc() const
{
return m_fontDesc;
@ -94,7 +88,7 @@ namespace yg
void TextElement::drawTextImpl(GlyphLayout const & layout, gl::TextRenderer * screen, math::Matrix<double, 3, 3> const & m, FontDesc const & fontDesc, double depth) const
{
if ((layout.lastVisible() != visText().size()) && (layout.firstVisible() != 0))
if ((layout.firstVisible() != 0) || (layout.lastVisible() != visText().size()))
return;
m2::PointD pivot = layout.entries()[0].m_pt;

7
yg/text_element.hpp
View file

@ -76,7 +76,7 @@ namespace yg
struct Params : OverlayElement::Params
{
FontDesc m_fontDesc;
wstring m_logText;
strings::UniString m_logText;
bool m_log2vis;
GlyphCache * m_glyphCache;
};
@ -88,9 +88,8 @@ namespace yg
math::Matrix<double, 3, 3> const & m,
FontDesc const & desc,
double depth) const;
wstring const & logText() const;
wstring const & visText() const;
string const & utf8Text() const;
strings::UniString const & logText() const;
strings::UniString const & visText() const;
FontDesc const & fontDesc() const;
};

2
yg/text_renderer.cpp
View file

@ -69,7 +69,7 @@ namespace yg
params.m_fullLength = fullLength;
params.m_pathOffset = pathOffset;
params.m_fontDesc = fontDesc;
params.m_logText = strings::FromUtf8(utf8Text);
params.m_logText = strings::MakeUniString(utf8Text);
params.m_depth = depth;
params.m_log2vis = true;
params.m_glyphCache = resourceManager()->glyphCache(m_glyphCacheID);