tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate Map::getGlyphStore()

Browse Source
This commit is contained in:
John Firebaugh
2014-11-21 15:54:14 -08:00
parent 8e33076bf1
commit 8c3e39a516
8 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbgl/map/map.hpp
View File

@@ -127,7 +127,6 @@ public:
public:
inline const TransformState &getState() const { return state; }
inline util::ptr<Style> getStyle() const { return style; }
inline util::ptr<GlyphStore> getGlyphStore() { return glyphStore; }
util::ptr<Sprite> getSprite();
inline util::ptr<Texturepool> getTexturepool() { return texturepool; }
uv::worker &getWorker();

7
include/mbgl/map/source.hpp
View File

@@ -19,6 +19,7 @@ namespace mbgl {
class Map;
class GlyphAtlas;
class GlyphStore;
class SpriteAtlas;
class FileSource;
class Painter;
@@ -31,7 +32,7 @@ public:
Source(const util::ptr<SourceInfo>& info);
void load(Map&, FileSource&);
bool update(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&);
bool update(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&);
void updateMatrices(const mat4 &projMatrix, const TransformState &transform);
void drawClippingMasks(Painter &painter);
@@ -50,9 +51,9 @@ private:
int32_t coveringZoomLevel(const TransformState&) const;
std::forward_list<Tile::ID> coveringTiles(const TransformState&) const;
bool updateTiles(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&);
bool updateTiles(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&);
TileData::State addTile(Map&, GlyphAtlas&, SpriteAtlas&, FileSource&, const Tile::ID&);
TileData::State addTile(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&, const Tile::ID&);
TileData::State hasTile(const Tile::ID& id);
double getZoom(const TransformState &state) const;

4
include/mbgl/map/tile_parser.hpp
View File

@@ -35,7 +35,7 @@ public:
TileParser(const std::string &data, VectorTileData &tile,
const util::ptr<const Style> &style,
GlyphAtlas & glyphAtlas,
const util::ptr<GlyphStore> &glyphStore,
GlyphStore & glyphStore,
SpriteAtlas & spriteAtlas,
const util::ptr<Sprite> &sprite);
~TileParser();
@@ -62,7 +62,7 @@ private:
// Cross-thread shared data.
util::ptr<const Style> style;
GlyphAtlas & glyphAtlas;
util::ptr<GlyphStore> glyphStore;
GlyphStore & glyphStore;
SpriteAtlas & spriteAtlas;
util::ptr<Sprite> sprite;
util::ptr<Texturepool> texturePool;

5
include/mbgl/map/vector_tile_data.hpp
View File

@@ -22,6 +22,7 @@ class SourceInfo;
class StyleLayer;
class TileParser;
class GlyphAtlas;
class GlyphStore;
class SpriteAtlas;
class VectorTileData : public TileData {
@@ -29,7 +30,8 @@ class VectorTileData : public TileData {
public:
VectorTileData(Tile::ID const&, Map&,
GlyphAtlas&, SpriteAtlas&,
GlyphAtlas&, GlyphStore&,
SpriteAtlas&,
const util::ptr<SourceInfo>&);
~VectorTileData();
@@ -53,6 +55,7 @@ protected:
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
GlyphAtlas& glyphAtlas;
GlyphStore& glyphStore;
SpriteAtlas& spriteAtlas;
public:

2
src/map/map.cpp
View File

@@ -642,7 +642,7 @@ void Map::updateSources(const util::ptr<StyleLayerGroup> &group) {
void Map::updateTiles() {
for (const util::ptr<StyleSource> &source : getActiveSources()) {
source->source->update(*this, glyphAtlas, spriteAtlas, *fileSource);
source->source->update(*this, glyphAtlas, *glyphStore, spriteAtlas, *fileSource);
}
}

19
src/map/source.cpp
View File

@@ -61,9 +61,11 @@ void Source::load(Map& map, FileSource& fileSource) {
});
}
bool Source::update(Map& map, GlyphAtlas& glyphAtlas, SpriteAtlas& spriteAtlas, FileSource& fileSource) {
bool Source::update(Map& map,
GlyphAtlas& glyphAtlas, GlyphStore& glyphStore,
SpriteAtlas& spriteAtlas, FileSource& fileSource) {
if (loaded && map.getTime() > updated) {
return updateTiles(map, glyphAtlas, spriteAtlas, fileSource);
return updateTiles(map, glyphAtlas, glyphStore, spriteAtlas, fileSource);
} else {
return false;
}
@@ -159,7 +161,10 @@ TileData::State Source::hasTile(const Tile::ID& id) {
return TileData::State::invalid;
}
TileData::State Source::addTile(Map& map, GlyphAtlas& glyphAtlas, SpriteAtlas& spriteAtlas, FileSource& fileSource, const Tile::ID& id) {
TileData::State Source::addTile(Map& map,
GlyphAtlas& glyphAtlas, GlyphStore& glyphStore,
SpriteAtlas& spriteAtlas,
FileSource& fileSource, const Tile::ID& id) {
const TileData::State state = hasTile(id);
if (state != TileData::State::invalid) {
@@ -187,7 +192,7 @@ TileData::State Source::addTile(Map& map, GlyphAtlas& glyphAtlas, SpriteAtlas& s
if (!new_tile.data) {
// If we don't find working tile data, we're just going to load it.
if (info->type == SourceType::Vector) {
new_tile.data = std::make_shared<VectorTileData>(normalized_id, map, glyphAtlas, spriteAtlas, info);
new_tile.data = std::make_shared<VectorTileData>(normalized_id, map, glyphAtlas, glyphStore, spriteAtlas, info);
} else if (info->type == SourceType::Raster) {
new_tile.data = std::make_shared<RasterTileData>(normalized_id, map, info);
} else {
@@ -281,7 +286,9 @@ bool Source::findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::
return false;
}
bool Source::updateTiles(Map& map, GlyphAtlas& glyphAtlas, SpriteAtlas& spriteAtlas, FileSource& fileSource) {
bool Source::updateTiles(Map& map,
GlyphAtlas& glyphAtlas, GlyphStore& glyphStore,
SpriteAtlas& spriteAtlas, FileSource& fileSource) {
bool changed = false;
int32_t zoom = std::floor(getZoom(map.getState()));
@@ -298,7 +305,7 @@ bool Source::updateTiles(Map& map, GlyphAtlas& glyphAtlas, SpriteAtlas& spriteAt
// Add existing child/parent tiles if the actual tile is not yet loaded
for (const Tile::ID& id : required) {
const TileData::State state = addTile(map, glyphAtlas, spriteAtlas, fileSource, id);
const TileData::State state = addTile(map, glyphAtlas, glyphStore, spriteAtlas, fileSource, id);
if (state != TileData::State::parsed) {
// The tile we require is not yet loaded. Try to find a parent or

5
src/map/tile_parser.cpp
View File

@@ -32,7 +32,7 @@ TileParser::~TileParser() = default;
TileParser::TileParser(const std::string &data, VectorTileData &tile_,
const util::ptr<const Style> &style_,
GlyphAtlas & glyphAtlas_,
const util::ptr<GlyphStore> &glyphStore_,
GlyphStore & glyphStore_,
SpriteAtlas & spriteAtlas_,
const util::ptr<Sprite> &sprite_)
: vector_data(pbf((const uint8_t *)data.data(), data.size())),
@@ -45,7 +45,6 @@ TileParser::TileParser(const std::string &data, VectorTileData &tile_,
collision(std::make_unique<Collision>(tile.id.z, 4096, tile.source->tile_size, tile.depth)) {
assert(&tile != nullptr);
assert(style);
assert(glyphStore);
assert(sprite);
assert(collision);
}
@@ -167,7 +166,7 @@ std::unique_ptr<Bucket> TileParser::createLineBucket(const VectorTileLayer& laye
std::unique_ptr<Bucket> TileParser::createSymbolBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketSymbol &symbol) {
std::unique_ptr<SymbolBucket> bucket = std::make_unique<SymbolBucket>(symbol, *collision);
bucket->addFeatures(layer, filter, tile.id, spriteAtlas, *sprite, glyphAtlas, *glyphStore);
bucket->addFeatures(layer, filter, tile.id, spriteAtlas, *sprite, glyphAtlas, glyphStore);
return obsolete() ? nullptr : std::move(bucket);
}

9
src/map/vector_tile_data.cpp
View File

@@ -9,10 +9,12 @@
using namespace mbgl;
VectorTileData::VectorTileData(Tile::ID const& id_, Map &map_,
GlyphAtlas& glyphAtlas_, SpriteAtlas& spriteAtlas_,
GlyphAtlas& glyphAtlas_, GlyphStore& glyphStore_,
SpriteAtlas& spriteAtlas_,
const util::ptr<SourceInfo> &source_)
: TileData(id_, map_, source_),
glyphAtlas(glyphAtlas_),
glyphStore(glyphStore_),
spriteAtlas(spriteAtlas_),
depth(id.z >= source->max_zoom ? map.getMaxZoom() - id.z : 1) {
}
@@ -31,8 +33,9 @@ void VectorTileData::parse() {
// Parsing creates state that is encapsulated in TileParser. While parsing,
// the TileParser object writes results into this objects. All other state
// is going to be discarded afterwards.
TileParser parser(data, *this, map.getStyle(), glyphAtlas,
map.getGlyphStore(), spriteAtlas, map.getSprite());
TileParser parser(data, *this, map.getStyle(),
glyphAtlas, glyphStore,
spriteAtlas, map.getSprite());
parser.parse();
} catch (const std::exception& ex) {
#if defined(DEBUG)