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

searching at additionalSkinPages before pages when mapping resources onto skin.

Browse source
This commit is contained in:
rachytski 2012-01-24 14:43:55 +04:00 • committed by Alex Zolotarev
parent e1e25dff3b
commit 16164acc38
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
yg/skin.cpp
View file

@ -92,13 +92,6 @@ namespace yg
uint32_t Skin::mapSymbol(char const * symbolName)
{
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
uint32_t res = m_pages[i]->findSymbol(symbolName);
if (res != invalidPageHandle())
return packID(i, res);
}
for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
{
uint32_t res = m_additionalPages[i]->findSymbol(symbolName);
@ -106,6 +99,13 @@ namespace yg
return packID(i + m_pages.size(), res);
}
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
uint32_t res = m_pages[i]->findSymbol(symbolName);
if (res != invalidPageHandle())
return packID(i, res);
}
return invalidHandle();
}
@ -113,13 +113,6 @@ namespace yg
{
uint32_t res = invalidPageHandle();
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findColor(c);
if (res != invalidPageHandle())
return packID(i, res);
}
for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
{
res = m_additionalPages[i]->findColor(c);
@ -127,6 +120,13 @@ namespace yg
return packID(i + m_pages.size(), res);
}
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findColor(c);
if (res != invalidPageHandle())
return packID(i, res);
}
if (!m_pages[m_currentDynamicPage]->hasRoom(c))
changeCurrentDynamicPage();
@ -137,13 +137,6 @@ namespace yg
{
uint32_t res = invalidPageHandle();
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findPenInfo(penInfo);
if (res != invalidPageHandle())
return packID(i, res);
}
for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
{
res = m_additionalPages[i]->findPenInfo(penInfo);
@ -151,6 +144,13 @@ namespace yg
return packID(i + m_pages.size(), res);
}
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findPenInfo(penInfo);
if (res != invalidPageHandle())
return packID(i, res);
}
if (!m_pages[m_currentDynamicPage]->hasRoom(penInfo))
changeCurrentDynamicPage();
@ -161,13 +161,6 @@ namespace yg
{
uint32_t res = invalidPageHandle();
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findCircleInfo(circleInfo);
if (res != invalidPageHandle())
return packID(i, res);
}
for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
{
res = m_additionalPages[i]->findCircleInfo(circleInfo);
@ -175,6 +168,13 @@ namespace yg
return packID(i + m_pages.size(), res);
}
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findCircleInfo(circleInfo);
if (res != invalidPageHandle())
return packID(i, res);
}
if (!m_pages[m_currentDynamicPage]->hasRoom(circleInfo))
changeCurrentDynamicPage();
@ -218,13 +218,6 @@ namespace yg
{
uint32_t res = invalidPageHandle();
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findGlyph(gk);
if (res != invalidPageHandle())
return packID(i, res);
}
for (uint8_t i = 0; i < m_additionalPages.size(); ++i)
{
res = m_additionalPages[i]->findGlyph(gk);
@ -232,6 +225,13 @@ namespace yg
return packID(i + m_pages.size(), res);
}
for (uint8_t i = 0; i < m_pages.size(); ++i)
{
res = m_pages[i]->findGlyph(gk);
if (res != invalidPageHandle())
return packID(i, res);
}
if (!m_pages[m_currentTextPage]->hasRoom(gk, glyphCache))
changeCurrentTextPage();