diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-22 13:28:09 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-26 11:21:56 -0700 |
commit | aa216d00254c18f7b5903026ab1a489ae7797dd8 (patch) | |
tree | 7decb42cb0f8a8a5ae0e9d3bdcfdf69e76949e15 /src/mbgl/sprite/sprite_atlas.hpp | |
parent | 6cf9d5cfbfe8120121d8d53cbbf8915cea8f4879 (diff) | |
download | qtlocation-mapboxgl-aa216d00254c18f7b5903026ab1a489ae7797dd8.tar.gz |
[core] Don't use a separate SpriteAtlas for annotation images
Instead, just add them to the Style as needed. Includes changes from #8905 and takes care to avoid regressing #3817.
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index f5c7fd114a..807c871731 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -66,10 +66,6 @@ public: void onSpriteLoaded(); - void markAsLoaded() { - loaded = true; - } - bool isLoaded() const { return loaded; } @@ -80,8 +76,8 @@ public: void addImage(Immutable<style::Image::Impl>); void removeImage(const std::string&); - void getIcons(IconRequestor& requestor); - void removeRequestor(IconRequestor& requestor); + void getIcons(IconRequestor&, IconDependencies); + void removeRequestor(IconRequestor&); // Ensure that the atlas contains the named image suitable for rendering as an icon, and // return its metrics. The image will be padded on each side with a one pixel wide transparent |