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

Eliminate Map::getGlyphAtlas()

Browse Source
This commit is contained in:
John Firebaugh
2014-11-21 15:44:15 -08:00
parent 655ee501e7
commit a5fe8ec3dc
6 changed files with 20 additions and 15 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 GlyphAtlas & getGlyphAtlas() { return glyphAtlas; }
inline util::ptr<GlyphStore> getGlyphStore() { return glyphStore; }
inline SpriteAtlas & getSpriteAtlas() { return spriteAtlas; }
util::ptr<Sprite> getSprite();

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

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

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

@@ -21,13 +21,15 @@ class Painter;
class SourceInfo;
class StyleLayer;
class TileParser;
class GlyphAtlas;
class VectorTileData : public TileData {
friend class TileParser;
public:
VectorTileData(Tile::ID const& id, Map &map, const util::ptr<SourceInfo> &source);
VectorTileData(Tile::ID const&, Map&, GlyphAtlas&, const util::ptr<SourceInfo>&);
~VectorTileData();
virtual void parse();
virtual void render(Painter &painter, util::ptr<StyleLayer> layer_desc, const mat4 &matrix);
virtual bool hasData(StyleLayer const& layer_desc) const;
@@ -46,6 +48,8 @@ protected:
// Holds the buckets of this tile.
// They contain the location offsets in the buffers stored above
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
GlyphAtlas& glyphAtlas;
public:
const float depth;
};

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, *fileSource);
source->source->update(*this, glyphAtlas, *fileSource);
}
}

12
src/map/source.cpp
View File

@@ -61,9 +61,9 @@ void Source::load(Map& map, FileSource& fileSource) {
});
}
bool Source::update(Map& map, FileSource& fileSource) {
bool Source::update(Map& map, GlyphAtlas& glyphAtlas, FileSource& fileSource) {
if (loaded && map.getTime() > updated) {
return updateTiles(map, fileSource);
return updateTiles(map, glyphAtlas, fileSource);
} else {
return false;
}
@@ -159,7 +159,7 @@ TileData::State Source::hasTile(const Tile::ID& id) {
return TileData::State::invalid;
}
TileData::State Source::addTile(Map& map, FileSource& fileSource, const Tile::ID& id) {
TileData::State Source::addTile(Map& map, GlyphAtlas& glyphAtlas, FileSource& fileSource, const Tile::ID& id) {
const TileData::State state = hasTile(id);
if (state != TileData::State::invalid) {
@@ -187,7 +187,7 @@ TileData::State Source::addTile(Map& map, FileSource& fileSource, const Tile::ID
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, info);
new_tile.data = std::make_shared<VectorTileData>(normalized_id, map, glyphAtlas, info);
} else if (info->type == SourceType::Raster) {
new_tile.data = std::make_shared<RasterTileData>(normalized_id, map, info);
} else {
@@ -281,7 +281,7 @@ bool Source::findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::
return false;
}
bool Source::updateTiles(Map& map, FileSource& fileSource) {
bool Source::updateTiles(Map& map, GlyphAtlas& glyphAtlas, FileSource& fileSource) {
bool changed = false;
int32_t zoom = std::floor(getZoom(map.getState()));
@@ -298,7 +298,7 @@ bool Source::updateTiles(Map& map, FileSource& fileSource) {
// 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, fileSource, id);
const TileData::State state = addTile(map, glyphAtlas, fileSource, id);
if (state != TileData::State::parsed) {
// The tile we require is not yet loaded. Try to find a parent or

7
src/map/vector_tile_data.cpp
View File

@@ -8,13 +8,14 @@
using namespace mbgl;
VectorTileData::VectorTileData(Tile::ID const& id_, Map &map_, const util::ptr<SourceInfo> &source_)
VectorTileData::VectorTileData(Tile::ID const& id_, Map &map_, GlyphAtlas& glyphAtlas_, const util::ptr<SourceInfo> &source_)
: TileData(id_, map_, source_),
glyphAtlas(glyphAtlas_),
depth(id.z >= source->max_zoom ? map.getMaxZoom() - id.z : 1) {
}
VectorTileData::~VectorTileData() {
map.getGlyphAtlas().removeGlyphs(id.to_uint64());
glyphAtlas.removeGlyphs(id.to_uint64());
}
@@ -27,7 +28,7 @@ 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(), map.getGlyphAtlas(),
TileParser parser(data, *this, map.getStyle(), glyphAtlas,
map.getGlyphStore(), map.getSpriteAtlas(), map.getSprite());
parser.parse();
} catch (const std::exception& ex) {