diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2014-11-18 09:29:01 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:32:44 +0300 |
| commit | 2d4d826e89d579b081b92e8e365a109ae0a374fb (patch) | |
| tree | 6fafef8d4adcc2ba5db7240b6a592bb4879b7a4b /drape | |
| parent | fdef7a4210a8d10e13265a0387946f3e91e3b80d (diff) | |
[drape] move font resources into "resources-common" folder. Xcode can't sign application if this folder named resources
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/texture_manager.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index 7f4b1a08c8..512166e9a8 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -111,7 +111,7 @@ void TextureManager::Init(string const & resourcePrefix) m_textures.push_back(MasterPointer<TextureSet>(defaultSet)); vector<TransferPointer<Texture> > tempTextures; - LoadFont(string("resources/font"), tempTextures); + LoadFont(string("resources-common/font"), tempTextures); for (size_t i = 0; i < tempTextures.size(); ++i) { RefPointer<TextureSet> set = m_textures.back().GetRefPointer(); @@ -130,11 +130,6 @@ void TextureManager::Init(string const & resourcePrefix) m_textures.push_back(MasterPointer<TextureSet>(new TextureSet(m_maxTextureBlocks))); textureSet = m_textures.back().GetRefPointer(); } - - typedef DynamicTexture<StipplePenIndex, StipplePenKey, Texture::StipplePen> TStippleTexture; - typedef DynamicTexture<ColorPalette, ColorKey, Texture::Color> TColorTexture; - textureSet->AddTexture(MovePointer<Texture>(new TStippleTexture(m2::PointU(1024, 1024), dp::ALPHA))); - textureSet->AddTexture(MovePointer<Texture>(new TColorTexture(m2::PointU(1024, 1024), dp::RGBA8))); } void TextureManager::Release() |