diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png deleted file mode 100644 index 44e59ecf04..0000000000 Binary files a/data/resources-6plus_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-6plus_clear/symbols-ad.sdf b/data/resources-6plus_clear/symbols-ad.sdf deleted file mode 100644 index 7be7f97c06..0000000000 --- a/data/resources-6plus_clear/symbols-ad.sdf +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png deleted file mode 100644 index 44e59ecf04..0000000000 Binary files a/data/resources-6plus_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-6plus_dark/symbols-ad.sdf b/data/resources-6plus_dark/symbols-ad.sdf deleted file mode 100644 index 7be7f97c06..0000000000 --- a/data/resources-6plus_dark/symbols-ad.sdf +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-hdpi_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-hdpi_clear/symbols-ad.sdf b/data/resources-hdpi_clear/symbols-ad.sdf deleted file mode 100644 index c9cc7b2209..0000000000 --- a/data/resources-hdpi_clear/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-hdpi_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-hdpi_dark/symbols-ad.sdf b/data/resources-hdpi_dark/symbols-ad.sdf deleted file mode 100644 index c9cc7b2209..0000000000 --- a/data/resources-hdpi_dark/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-mdpi_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-mdpi_clear/symbols-ad.sdf b/data/resources-mdpi_clear/symbols-ad.sdf deleted file mode 100644 index c9cc7b2209..0000000000 --- a/data/resources-mdpi_clear/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-mdpi_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-mdpi_dark/symbols-ad.sdf b/data/resources-mdpi_dark/symbols-ad.sdf deleted file mode 100644 index c9cc7b2209..0000000000 --- a/data/resources-mdpi_dark/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xhdpi_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-xhdpi_clear/symbols-ad.sdf b/data/resources-xhdpi_clear/symbols-ad.sdf deleted file mode 100644 index 1d241c9a1a..0000000000 --- a/data/resources-xhdpi_clear/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xhdpi_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-xhdpi_dark/symbols-ad.sdf b/data/resources-xhdpi_dark/symbols-ad.sdf deleted file mode 100644 index 1d241c9a1a..0000000000 --- a/data/resources-xhdpi_dark/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-xxhdpi_clear/symbols-ad.sdf b/data/resources-xxhdpi_clear/symbols-ad.sdf deleted file mode 100644 index 8b85321d1c..0000000000 --- a/data/resources-xxhdpi_clear/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-xxhdpi_dark/symbols-ad.sdf b/data/resources-xxhdpi_dark/symbols-ad.sdf deleted file mode 100644 index 8b85321d1c..0000000000 --- a/data/resources-xxhdpi_dark/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xxxhdpi_clear/symbols-ad.png b/data/resources-xxxhdpi_clear/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xxxhdpi_clear/symbols-ad.png and /dev/null differ diff --git a/data/resources-xxxhdpi_clear/symbols-ad.sdf b/data/resources-xxxhdpi_clear/symbols-ad.sdf deleted file mode 100644 index 8b85321d1c..0000000000 --- a/data/resources-xxxhdpi_clear/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/resources-xxxhdpi_dark/symbols-ad.png b/data/resources-xxxhdpi_dark/symbols-ad.png deleted file mode 100644 index 83d08c30c2..0000000000 Binary files a/data/resources-xxxhdpi_dark/symbols-ad.png and /dev/null differ diff --git a/data/resources-xxxhdpi_dark/symbols-ad.sdf b/data/resources-xxxhdpi_dark/symbols-ad.sdf deleted file mode 100644 index 8b85321d1c..0000000000 --- a/data/resources-xxxhdpi_dark/symbols-ad.sdf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index 1ff9b8efca..a59efd7354 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -41,8 +41,7 @@ size_t const kReservedColors = 20; float const kGlyphAreaMultiplier = 1.2f; float const kGlyphAreaCoverage = 0.9f; -std::string const kDefaultSymbolsTexture = "symbols"; -std::string const kSymbolTextures[] = { kDefaultSymbolsTexture, "symbols-ad" }; +std::string const kSymbolTextures[] = { "symbols" }; uint32_t const kDefaultSymbolsIndex = 0; namespace @@ -253,7 +252,7 @@ void TextureManager::Release() m_glyphManager.reset(); m_glyphGenerator->FinishGeneration(); - + m_isInitialized = false; m_nothingToUpload.test_and_set(); } @@ -276,7 +275,7 @@ bool TextureManager::UpdateDynamicTextures(ref_ptr context) CHECK(false, ("Unsupported API version.")); } - + CHECK(m_isInitialized, ()); m_uploadTimer.Reset(); @@ -427,7 +426,7 @@ size_t TextureManager::FindHybridGlyphsGroup(TMultilineText const & text, int fi void TextureManager::Init(ref_ptr context, Params const & params) { CHECK(!m_isInitialized, ()); - + m_resPostfix = params.m_resPostfix; m_textureAllocator = CreateAllocator(context); @@ -505,7 +504,7 @@ void TextureManager::Init(ref_ptr context, Params const & p void TextureManager::OnSwitchMapStyle(ref_ptr context) { CHECK(m_isInitialized, ()); - + // Here we need invalidate only textures which can be changed in map style switch. // Now we update only symbol textures, if we need update other textures they must be added here. // For Vulkan we use m_texturesToCleanup to defer textures destroying. diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index d5af57f2dc..aca799e944 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -45,7 +45,7 @@ fi # Parameter $3 - resource name (mdpi, hdpi, ...) # Parameter $4 - symbol size # Parameter $5 - style suffix (none, _dark, _clear) -# Parameter $6 - symbols folder (symbols, symbols-ad) +# Parameter $6 - symbols folder (symbols) # Parameter $7 - symbols suffix (none, -ad) function BuildSkin() { styleType=$1 @@ -93,20 +93,6 @@ BuildSkin clear clear xxhdpi 54 _clear symbols BuildSkin clear clear 6plus 54 _clear symbols BuildSkin clear clear xxxhdpi 64 _clear symbols -BuildSkin clear night mdpi 22 _dark symbols-ad -ad -BuildSkin clear night hdpi 34 _dark symbols-ad -ad -BuildSkin clear night xhdpi 44 _dark symbols-ad -ad -BuildSkin clear night xxhdpi 68 _dark symbols-ad -ad -BuildSkin clear night 6plus 68 _dark symbols-ad -ad -BuildSkin clear night xxxhdpi 78 _dark symbols-ad -ad - -BuildSkin clear clear mdpi 22 _clear symbols-ad -ad -BuildSkin clear clear hdpi 34 _clear symbols-ad -ad -BuildSkin clear clear xhdpi 44 _clear symbols-ad -ad -BuildSkin clear clear xxhdpi 68 _clear symbols-ad -ad -BuildSkin clear clear 6plus 68 _clear symbols-ad -ad -BuildSkin clear clear xxxhdpi 78 _clear symbols-ad -ad - rm -rf "$OMIM_PATH"/data/resources-{*} rm -rf "$OMIM_PATH"/data/resources-*_design