diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-25 16:22:05 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 15:13:13 -0800 |
| commit | d3ba1071cbaf7bc474206774778fdfdec62fc5e3 (patch) | |
| tree | ff4bebb1b057c1363e0ce925d013d04a4e87b188 /include | |
| parent | 576533b18c7ecc93656f840994d90a3bb86ae239 (diff) | |
| download | qtlocation-mapboxgl-d3ba1071cbaf7bc474206774778fdfdec62fc5e3.tar.gz | |
Make Map::getSprite() private
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/map/source.hpp | 7 | ||||
| -rw-r--r-- | include/mbgl/map/vector_tile_data.hpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index f36ec6d734..7ce2bb7020 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -127,12 +127,12 @@ public: public: inline const TransformState &getState() const { return state; } inline util::ptr<Style> getStyle() const { return style; } - util::ptr<Sprite> getSprite(); inline timestamp getAnimationTime() const { return animationTime; } inline timestamp getTime() const { return animationTime; } void updateTiles(); private: + util::ptr<Sprite> getSprite(); uv::worker& getWorker(); // uv async callbacks diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp index a358cfaee5..0eefe1ad5d 100644 --- a/include/mbgl/map/source.hpp +++ b/include/mbgl/map/source.hpp @@ -21,6 +21,7 @@ class Map; class GlyphAtlas; class GlyphStore; class SpriteAtlas; +class Sprite; class FileSource; class Texturepool; class Painter; @@ -35,7 +36,7 @@ public: void load(Map&, FileSource&); bool update(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, - SpriteAtlas&, + SpriteAtlas&, util::ptr<Sprite>, Texturepool&, FileSource&); void updateMatrices(const mat4 &projMatrix, const TransformState &transform); @@ -57,12 +58,12 @@ private: bool updateTiles(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, - SpriteAtlas&, + SpriteAtlas&, util::ptr<Sprite>, Texturepool&, FileSource&); TileData::State addTile(Map&, uv::worker&, GlyphAtlas&, GlyphStore&, - SpriteAtlas&, + SpriteAtlas&, util::ptr<Sprite>, FileSource&, Texturepool&, const Tile::ID&); diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp index 56ecfb51eb..ee2d63a2b2 100644 --- a/include/mbgl/map/vector_tile_data.hpp +++ b/include/mbgl/map/vector_tile_data.hpp @@ -24,6 +24,7 @@ class TileParser; class GlyphAtlas; class GlyphStore; class SpriteAtlas; +class Sprite; class Texturepool; class VectorTileData : public TileData { @@ -32,7 +33,7 @@ class VectorTileData : public TileData { public: VectorTileData(Tile::ID const&, Map&, GlyphAtlas&, GlyphStore&, - SpriteAtlas&, + SpriteAtlas&, util::ptr<Sprite>, Texturepool&, const util::ptr<SourceInfo>&); ~VectorTileData(); @@ -59,6 +60,7 @@ protected: GlyphAtlas& glyphAtlas; GlyphStore& glyphStore; SpriteAtlas& spriteAtlas; + util::ptr<Sprite> sprite; Texturepool& texturepool; public: |