diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-03-16 18:30:47 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-03-16 18:30:47 +0300 |
| commit | e5e934290b87459ebc2bf3886cad11dd19f6c1e6 (patch) | |
| tree | 13ff0fa5c7f553577cd4f03a4005748417266f22 /drape/texture_manager.hpp | |
| parent | bd250b5deb022dacf15be3aeea138e18cd842216 (diff) | |
Added support of multiple symbols textures
Diffstat (limited to 'drape/texture_manager.hpp')
| -rw-r--r-- | drape/texture_manager.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp index 60d18f18a7..5459f87b7d 100644 --- a/drape/texture_manager.hpp +++ b/drape/texture_manager.hpp @@ -8,8 +8,9 @@ #include "base/string_utils.hpp" -#include "std/atomic.hpp" -#include "std/unordered_set.hpp" +#include <atomic> +#include <list> +#include <vector> namespace dp { @@ -235,10 +236,10 @@ private: static constexpr size_t GetInvalidGlyphGroup(); private: - drape_ptr<Texture> m_symbolTexture; + std::vector<drape_ptr<Texture>> m_symbolTextures; drape_ptr<Texture> m_stipplePenTexture; drape_ptr<Texture> m_colorTexture; - list<drape_ptr<Texture>> m_glyphTextures; + std::list<drape_ptr<Texture>> m_glyphTextures; drape_ptr<Texture> m_trafficArrowTexture; @@ -248,7 +249,7 @@ private: buffer_vector<GlyphGroup, 64> m_glyphGroups; buffer_vector<HybridGlyphGroup, 4> m_hybridGlyphGroups; - atomic_flag m_nothingToUpload; + std::atomic_flag m_nothingToUpload; }; } // namespace dp |