diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-25 13:36:07 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 15:13:13 -0800 |
commit | 576533b18c7ecc93656f840994d90a3bb86ae239 (patch) | |
tree | 59867819363f56d4ccdf68198bceb763ec46baa5 /src/map/tile_parser.cpp | |
parent | 3aa15306f6b9df452a42a419b2096e41ba11d414 (diff) | |
download | qtlocation-mapboxgl-576533b18c7ecc93656f840994d90a3bb86ae239.tar.gz |
Eliminate Map::getTexturepool()
Diffstat (limited to 'src/map/tile_parser.cpp')
-rw-r--r-- | src/map/tile_parser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp index 768b7da9fd..dcbac71c7c 100644 --- a/src/map/tile_parser.cpp +++ b/src/map/tile_parser.cpp @@ -34,7 +34,8 @@ TileParser::TileParser(const std::string &data, VectorTileData &tile_, GlyphAtlas & glyphAtlas_, GlyphStore & glyphStore_, SpriteAtlas & spriteAtlas_, - const util::ptr<Sprite> &sprite_) + const util::ptr<Sprite> &sprite_, + Texturepool& texturePool_) : vector_data(pbf((const uint8_t *)data.data(), data.size())), tile(tile_), style(style_), @@ -42,6 +43,7 @@ TileParser::TileParser(const std::string &data, VectorTileData &tile_, glyphStore(glyphStore_), spriteAtlas(spriteAtlas_), sprite(sprite_), + texturePool(texturePool_), collision(std::make_unique<Collision>(tile.id.z, 4096, tile.source->tile_size, tile.depth)) { assert(&tile != nullptr); assert(style); @@ -153,7 +155,7 @@ std::unique_ptr<Bucket> TileParser::createFillBucket(const VectorTileLayer& laye return obsolete() ? nullptr : std::move(bucket); } -std::unique_ptr<Bucket> TileParser::createRasterBucket(const util::ptr<Texturepool> &texturepool, const StyleBucketRaster &raster) { +std::unique_ptr<Bucket> TileParser::createRasterBucket(Texturepool& texturepool, const StyleBucketRaster &raster) { std::unique_ptr<RasterBucket> bucket = std::make_unique<RasterBucket>(texturepool, raster); return obsolete() ? nullptr : std::move(bucket); } |