[core] Tweak handling of annotation special case SpriteAtlas
* Simplify SymbolLayout; it never needs to care about more than one SpriteAtlas. * Move the reference from SymbolLayer::Impl to SymbolBucket. This is a prerequisite for making layer Impls immutable.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
#include <mbgl/tile/vector_tile.hpp>
|
||||
#include <mbgl/tile/tile_loader_impl.hpp>
|
||||
#include <mbgl/tile/geometry_tile_data.hpp>
|
||||
#include <mbgl/style/style.hpp>
|
||||
#include <mbgl/style/update_parameters.hpp>
|
||||
|
||||
#include <protozero/pbf_reader.hpp>
|
||||
|
||||
@@ -83,7 +85,9 @@ VectorTile::VectorTile(const OverscaledTileID& id_,
|
||||
std::string sourceID_,
|
||||
const style::UpdateParameters& parameters,
|
||||
const Tileset& tileset)
|
||||
: GeometryTile(id_, sourceID_, parameters),
|
||||
: GeometryTile(id_, sourceID_, parameters,
|
||||
*parameters.style.glyphAtlas,
|
||||
*parameters.style.spriteAtlas),
|
||||
loader(*this, id_, parameters, tileset) {
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user