diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-12 15:54:54 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-13 10:55:47 -0700 |
commit | bffee0715458530c6c86f440f757a4de667278a2 (patch) | |
tree | 603205a6487065d7d9f61663879ce91b70cdddc8 /include/mbgl/map/map.hpp | |
parent | c36522e2a0481eaa0960f45f59ac3b023846b3e0 (diff) | |
download | qtlocation-mapboxgl-bffee0715458530c6c86f440f757a4de667278a2.tar.gz |
Move atlas ownership to Style
This follows gl-js and just makes sense -- whenever the style changes
the atlases should be blown away.
Refs #957
Diffstat (limited to 'include/mbgl/map/map.hpp')
-rw-r--r-- | include/mbgl/map/map.hpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 44a560a468..5d8b66ab1d 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -23,7 +23,6 @@ namespace mbgl { class Painter; -class GlyphStore; class LayerDescription; class Sprite; class Style; @@ -33,9 +32,6 @@ class StyleSource; class TexturePool; class FileSource; class View; -class GlyphAtlas; -class SpriteAtlas; -class LineAtlas; class Environment; class Map : private util::noncopyable { @@ -153,7 +149,6 @@ private: void resize(uint16_t width, uint16_t height, float ratio = 1); void resize(uint16_t width, uint16_t height, float ratio, uint16_t fbWidth, uint16_t fbHeight); - util::ptr<Sprite> getSprite(); uv::worker& getWorker(); // Checks if render thread needs to pause @@ -163,8 +158,6 @@ private: void setup(); void updateTiles(); - void updateSources(); - void updateSources(const util::ptr<StyleLayerGroup> &group); // Prepares a map render by updating the tiles we need for the current view, as well as updating // the stylesheet. @@ -213,11 +206,6 @@ private: FileSource& fileSource; util::ptr<Style> style; - const std::unique_ptr<GlyphAtlas> glyphAtlas; - util::ptr<GlyphStore> glyphStore; - const std::unique_ptr<SpriteAtlas> spriteAtlas; - util::ptr<Sprite> sprite; - const std::unique_ptr<LineAtlas> lineAtlas; util::ptr<TexturePool> texturePool; const std::unique_ptr<Painter> painter; @@ -231,8 +219,6 @@ private: bool debug = false; std::chrono::steady_clock::time_point animationTime = std::chrono::steady_clock::time_point::min(); - - std::set<util::ptr<StyleSource>> activeSources; }; } |