Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/drape
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2014-12-11 12:06:09 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:34:53 +0300
commit76617ab027ca4e26c34799fb805a3c0a7abdff29 (patch)
treec83ee6e3d760f15062e6e47fa68db490605eb81c /drape
parent400cbbd668a5501ff4c8d99ecaecc8dc958fef17 (diff)
[drape] temporary comment this code. In future here will be code that manage glyphs according dynamic strategy
Diffstat (limited to 'drape')
-rw-r--r--drape/texture_manager.cpp43
-rw-r--r--drape/texture_set_holder.cpp7
2 files changed, 26 insertions, 24 deletions
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index c3e31a922b..56c2226fb0 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -116,25 +116,25 @@ void TextureManager::Init(string const & resourcePrefix)
m_textures.push_back(MasterPointer<TextureSet>(defaultSet));
vector<TransferPointer<Texture> > tempTextures;
- LoadFont(string("resources-common/font"), tempTextures);
- for (size_t i = 0; i < tempTextures.size(); ++i)
- {
- RefPointer<TextureSet> set = m_textures.back().GetRefPointer();
- if (set->IsFull())
- {
- m_textures.push_back(MasterPointer<TextureSet>(new TextureSet(m_maxTextureBlocks)));
- set = m_textures.back().GetRefPointer();
- }
-
- set->AddTexture(tempTextures[i]);
- }
-
- RefPointer<TextureSet> textureSet = m_textures.back().GetRefPointer();
- if (textureSet->IsFull())
- {
- m_textures.push_back(MasterPointer<TextureSet>(new TextureSet(m_maxTextureBlocks)));
- textureSet = m_textures.back().GetRefPointer();
- }
+// LoadFont(string("resources-common/font"), tempTextures);
+// for (size_t i = 0; i < tempTextures.size(); ++i)
+// {
+// RefPointer<TextureSet> set = m_textures.back().GetRefPointer();
+// if (set->IsFull())
+// {
+// m_textures.push_back(MasterPointer<TextureSet>(new TextureSet(m_maxTextureBlocks)));
+// set = m_textures.back().GetRefPointer();
+// }
+
+// set->AddTexture(tempTextures[i]);
+// }
+
+// RefPointer<TextureSet> textureSet = m_textures.back().GetRefPointer();
+// if (textureSet->IsFull())
+// {
+// m_textures.push_back(MasterPointer<TextureSet>(new TextureSet(m_maxTextureBlocks)));
+// textureSet = m_textures.back().GetRefPointer();
+// }
}
void TextureManager::Release()
@@ -174,8 +174,9 @@ bool TextureManager::FindResource(TKey const & key, TRegion & region) const
bool TextureManager::GetGlyphRegion(strings::UniChar charCode, GlyphRegion & region) const
{
- FontTexture::GlyphKey key(charCode);
- return FindResource(key, region);
+ //FontTexture::GlyphKey key(charCode);
+ //return FindResource(key, region);
+ return false;
}
void TextureManager::GetStippleRegion(StipplePenKey const & pen, TextureSetHolder::StippleRegion & region) const
diff --git a/drape/texture_set_holder.cpp b/drape/texture_set_holder.cpp
index 3392bfeeb8..857cea618b 100644
--- a/drape/texture_set_holder.cpp
+++ b/drape/texture_set_holder.cpp
@@ -67,14 +67,15 @@ TextureSetHolder::GlyphRegion::GlyphRegion()
void TextureSetHolder::GlyphRegion::GetMetrics(float & xOffset, float & yOffset, float & advance) const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
- FontTexture::GlyphInfo const * info = static_cast<FontTexture::GlyphInfo const *>(m_info);
- info->GetMetrics(xOffset, yOffset, advance);
+ //FontTexture::GlyphInfo const * info = static_cast<FontTexture::GlyphInfo const *>(m_info);
+ //info->GetMetrics(xOffset, yOffset, advance);
}
float TextureSetHolder::GlyphRegion::GetAdvance() const
{
ASSERT(m_info->GetType() == Texture::Glyph, ());
- return static_cast<FontTexture::GlyphInfo const *>(m_info)->GetAdvance();
+ //return static_cast<FontTexture::GlyphInfo const *>(m_info)->GetAdvance();
+ return 0.0f;
}
uint32_t TextureSetHolder::StippleRegion::GetMaskPixelLength() const