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 /include/mbgl/map/source.hpp | |
parent | 3aa15306f6b9df452a42a419b2096e41ba11d414 (diff) | |
download | qtlocation-mapboxgl-576533b18c7ecc93656f840994d90a3bb86ae239.tar.gz |
Eliminate Map::getTexturepool()
Diffstat (limited to 'include/mbgl/map/source.hpp')
-rw-r--r-- | include/mbgl/map/source.hpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp index 1ceb04d326..a358cfaee5 100644 --- a/include/mbgl/map/source.hpp +++ b/include/mbgl/map/source.hpp @@ -22,6 +22,7 @@ class GlyphAtlas; class GlyphStore; class SpriteAtlas; class FileSource; +class Texturepool; class Painter; class StyleLayer; class TransformState; @@ -32,7 +33,10 @@ public: Source(const util::ptr<SourceInfo>& info); void load(Map&, FileSource&); - bool update(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); + bool update(Map&, uv::worker&, + GlyphAtlas&, GlyphStore&, + SpriteAtlas&, + Texturepool&, FileSource&); void updateMatrices(const mat4 &projMatrix, const TransformState &transform); void drawClippingMasks(Painter &painter); @@ -51,9 +55,17 @@ private: int32_t coveringZoomLevel(const TransformState&) const; std::forward_list<Tile::ID> coveringTiles(const TransformState&) const; - bool updateTiles(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); + bool updateTiles(Map&, uv::worker&, + GlyphAtlas&, GlyphStore&, + SpriteAtlas&, + Texturepool&, FileSource&); + + TileData::State addTile(Map&, uv::worker&, + GlyphAtlas&, GlyphStore&, + SpriteAtlas&, + FileSource&, Texturepool&, + const Tile::ID&); - TileData::State addTile(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&, const Tile::ID&); TileData::State hasTile(const Tile::ID& id); double getZoom(const TransformState &state) const; |