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/layout/symbol_layout.hpp | |
parent | 92252849c1a2ddf7887d1908841fa3c90dd59766 (diff) | |
download | qtlocation-mapboxgl-0b687312071305c050d97e04fef1c80193f443c5.tar.gz |
[core] Per-bucket icon atlases
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
-rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index e947ee354b..7d6f2319cd 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -30,10 +30,10 @@ public: SymbolLayout(const BucketParameters&, const std::vector<const RenderLayer*>&, const GeometryTileLayer&, - IconDependencies&, + ImageDependencies&, GlyphDependencies&); - void prepare(const GlyphMap& glyphs, const IconMap& icons); + void prepare(const GlyphMap& glyphs, const ImageMap& icons); std::unique_ptr<SymbolBucket> place(CollisionTile&); @@ -94,6 +94,7 @@ private: std::vector<SymbolFeature> features; GlyphAtlas glyphAtlas; + ImageAtlas imageAtlas; BiDi bidi; // Consider moving this up to geometry tile worker to reduce reinstantiation costs; use of BiDi/ubiditransform object must be constrained to one thread }; |