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

[drape] move font resources into "resources-common" folder. Xcode can't sign application if this folder named resources

Browse source
This commit is contained in:
ExMix 2014-11-18 09:29:01 +03:00 • committed by Alex Zolotarev
parent fdef7a4210
commit 2d4d826e89
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
data/resources/font.fdf → data/resources-common/font.fdf
View file

0
data/resources/font.png → data/resources-common/font.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

7
drape/texture_manager.cpp
View file

@ -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()