diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-24 17:16:04 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 15:13:13 -0800 |
| commit | 3aa15306f6b9df452a42a419b2096e41ba11d414 (patch) | |
| tree | 3299d5ce2c176b8320804e51b38be1266b7c0e89 /include | |
| parent | 8c3e39a5167991e628db981e73eb39f69dd4f86a (diff) | |
| download | qtlocation-mapboxgl-3aa15306f6b9df452a42a419b2096e41ba11d414.tar.gz | |
Map Map::getWorker() private
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/map/source.hpp | 6 | ||||
| -rw-r--r-- | include/mbgl/map/tile_data.hpp | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index fca3619c0c..e56a0f81c1 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -129,12 +129,13 @@ public: inline util::ptr<Style> getStyle() const { return style; } util::ptr<Sprite> getSprite(); inline util::ptr<Texturepool> getTexturepool() { return texturepool; } - uv::worker &getWorker(); inline timestamp getAnimationTime() const { return animationTime; } inline timestamp getTime() const { return animationTime; } void updateTiles(); private: + uv::worker& getWorker(); + // uv async callbacks static void render(uv_async_t *async); static void terminate(uv_async_t *async); diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp index b515d26f0a..1ceb04d326 100644 --- a/include/mbgl/map/source.hpp +++ b/include/mbgl/map/source.hpp @@ -32,7 +32,7 @@ public: Source(const util::ptr<SourceInfo>& info); void load(Map&, FileSource&); - bool update(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); + bool update(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); void updateMatrices(const mat4 &projMatrix, const TransformState &transform); void drawClippingMasks(Painter &painter); @@ -51,9 +51,9 @@ private: int32_t coveringZoomLevel(const TransformState&) const; std::forward_list<Tile::ID> coveringTiles(const TransformState&) const; - bool updateTiles(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); + bool updateTiles(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&); - TileData::State addTile(Map&, GlyphAtlas&, GlyphStore&, SpriteAtlas&, FileSource&, 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; diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp index baae542e49..3907ac10ce 100644 --- a/include/mbgl/map/tile_data.hpp +++ b/include/mbgl/map/tile_data.hpp @@ -13,6 +13,10 @@ #include <iosfwd> #include <string> +namespace uv { +class worker; +} + namespace mbgl { class Map; @@ -44,9 +48,9 @@ public: TileData(Tile::ID const& id, Map &map, const util::ptr<SourceInfo> &source); ~TileData(); - void request(FileSource&); + void request(uv::worker&, FileSource&); + void reparse(uv::worker&); void cancel(); - void reparse(); const std::string toString() const; inline bool ready() const { |