diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-07 12:45:35 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 10:18:43 -0700 |
| commit | 0b687312071305c050d97e04fef1c80193f443c5 (patch) | |
| tree | 64c20efaa17fefef9f902811a000fd6e425c849b /src/mbgl/tile/geometry_tile_worker.hpp | |
| parent | 92252849c1a2ddf7887d1908841fa3c90dd59766 (diff) | |
| download | qtlocation-mapboxgl-0b687312071305c050d97e04fef1c80193f443c5.tar.gz | |
[core] Per-bucket icon atlases
Diffstat (limited to 'src/mbgl/tile/geometry_tile_worker.hpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile_worker.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp index c07c16dd9b..194477e7b8 100644 --- a/src/mbgl/tile/geometry_tile_worker.hpp +++ b/src/mbgl/tile/geometry_tile_worker.hpp @@ -2,7 +2,7 @@ #include <mbgl/map/mode.hpp> #include <mbgl/tile/tile_id.hpp> -#include <mbgl/sprite/sprite_atlas.hpp> +#include <mbgl/style/image_impl.hpp> #include <mbgl/text/glyph.hpp> #include <mbgl/text/placement_config.hpp> #include <mbgl/actor/actor_ref.hpp> @@ -38,7 +38,7 @@ public: void setPlacementConfig(PlacementConfig, uint64_t correlationID); void onGlyphsAvailable(GlyphMap glyphs); - void onIconsAvailable(IconMap icons); + void onImagesAvailable(ImageMap images); private: void coalesced(); @@ -48,7 +48,7 @@ private: void coalesce(); void requestNewGlyphs(const GlyphDependencies&); - void requestNewIcons(const IconDependencies&); + void requestNewImages(const ImageDependencies&); void symbolDependenciesChanged(); bool hasPendingSymbolDependencies() const; @@ -79,9 +79,9 @@ private: std::vector<std::unique_ptr<SymbolLayout>> symbolLayouts; GlyphDependencies pendingGlyphDependencies; - IconDependencies pendingIconDependencies; + ImageDependencies pendingImageDependencies; GlyphMap glyphMap; - IconMap iconMap; + ImageMap imageMap; }; } // namespace mbgl |