diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-01 10:30:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 10:18:43 -0700 |
| commit | 92252849c1a2ddf7887d1908841fa3c90dd59766 (patch) | |
| tree | 9d192d0e60b46479122ea2e4a606b598287d49d7 /src/mbgl/tile/geometry_tile.hpp | |
| parent | b201a7900f989af432aaea500a0e6c5ea5bbba53 (diff) | |
| download | qtlocation-mapboxgl-92252849c1a2ddf7887d1908841fa3c90dd59766.tar.gz | |
[core] Per-bucket glyph atlases
Diffstat (limited to 'src/mbgl/tile/geometry_tile.hpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index e92d2f4975..659f4f7e9f 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -3,7 +3,7 @@ #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/tile/tile.hpp> #include <mbgl/tile/geometry_tile_worker.hpp> -#include <mbgl/text/glyph_atlas.hpp> +#include <mbgl/text/glyph_manager.hpp> #include <mbgl/text/placement_config.hpp> #include <mbgl/util/feature.hpp> #include <mbgl/util/throttler.hpp> @@ -38,7 +38,7 @@ public: void setPlacementConfig(const PlacementConfig&) override; void setLayers(const std::vector<Immutable<style::Layer::Impl>>&) override; - void onGlyphsAvailable(GlyphPositionMap) override; + void onGlyphsAvailable(GlyphMap) override; void onIconsAvailable(IconMap) override; void getGlyphs(GlyphDependencies); @@ -96,7 +96,7 @@ private: std::shared_ptr<Mailbox> mailbox; Actor<GeometryTileWorker> worker; - GlyphAtlas& glyphAtlas; + GlyphManager& glyphManager; SpriteAtlas& spriteAtlas; uint64_t correlationID = 0; |