diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-28 17:23:05 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-12-02 12:24:25 -0800 |
commit | a6522d4a5aa894d260c3fbb246deba95b66061fd (patch) | |
tree | d05825100ebd29a1e108b72cd8aa1237adcb98dd /include/mbgl | |
parent | 8fdf645e121034de2dd6ceca5e1c3bcd7c4c40a4 (diff) | |
download | qtlocation-mapboxgl-a6522d4a5aa894d260c3fbb246deba95b66061fd.tar.gz |
Texturepool ⇢ TexturePool (fixes #655)
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/map/map.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/map/raster_tile_data.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/map/source.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/map/tile_parser.hpp | 10 | ||||
-rw-r--r-- | include/mbgl/map/vector_tile_data.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/renderer/raster_bucket.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/util/raster.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/util/texture_pool.hpp (renamed from include/mbgl/util/texturepool.hpp) | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 1f4715339d..e97c63138c 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -24,7 +24,7 @@ class Style; class StyleLayer; class StyleLayerGroup; class StyleSource; -class Texturepool; +class TexturePool; class FileSource; class View; @@ -184,7 +184,7 @@ private: util::ptr<GlyphStore> glyphStore; SpriteAtlas spriteAtlas; util::ptr<Sprite> sprite; - util::ptr<Texturepool> texturepool; + util::ptr<TexturePool> texturePool; Painter painter; diff --git a/include/mbgl/map/raster_tile_data.hpp b/include/mbgl/map/raster_tile_data.hpp index cbbd864aae..42070d9c61 100644 --- a/include/mbgl/map/raster_tile_data.hpp +++ b/include/mbgl/map/raster_tile_data.hpp @@ -10,13 +10,13 @@ namespace mbgl { class Painter; class SourceInfo; class StyleLayer; -class Texturepool; +class TexturePool; class RasterTileData : public TileData { friend class TileParser; public: - RasterTileData(Tile::ID const& id, Texturepool&, const SourceInfo&); + RasterTileData(Tile::ID const& id, TexturePool&, const SourceInfo&); ~RasterTileData(); virtual void parse(); diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp index c36376fd5d..8976f67b05 100644 --- a/include/mbgl/map/source.hpp +++ b/include/mbgl/map/source.hpp @@ -23,7 +23,7 @@ class GlyphStore; class SpriteAtlas; class Sprite; class FileSource; -class Texturepool; +class TexturePool; class Style; class Painter; class StyleLayer; @@ -39,7 +39,7 @@ public: util::ptr<Style>, GlyphAtlas&, GlyphStore&, SpriteAtlas&, util::ptr<Sprite>, - Texturepool&, FileSource&, + TexturePool&, FileSource&, std::function<void ()> callback); void updateMatrices(const mat4 &projMatrix, const TransformState &transform); @@ -63,7 +63,7 @@ private: util::ptr<Style>, GlyphAtlas&, GlyphStore&, SpriteAtlas&, util::ptr<Sprite>, - FileSource&, Texturepool&, + FileSource&, TexturePool&, const Tile::ID&, std::function<void ()> callback); diff --git a/include/mbgl/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp index 460225db9f..beae3af831 100644 --- a/include/mbgl/map/tile_parser.hpp +++ b/include/mbgl/map/tile_parser.hpp @@ -13,7 +13,7 @@ namespace mbgl { class Bucket; -class Texturepool; +class TexturePool; class FontStack; class GlyphAtlas; class GlyphStore; @@ -28,7 +28,7 @@ class StyleBucketSymbol; class StyleLayerGroup; class VectorTileData; class Collision; -class Texturepool; +class TexturePool; class TileParser : private util::noncopyable { @@ -39,7 +39,7 @@ public: GlyphStore & glyphStore, SpriteAtlas & spriteAtlas, const util::ptr<Sprite> &sprite, - Texturepool& texturepool); + TexturePool& texturePool); ~TileParser(); public: @@ -51,7 +51,7 @@ private: std::unique_ptr<Bucket> createBucket(util::ptr<StyleBucket> bucket_desc); std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketFill &fill); - std::unique_ptr<Bucket> createRasterBucket(Texturepool& texturepool, const StyleBucketRaster &raster); + std::unique_ptr<Bucket> createRasterBucket(const StyleBucketRaster &raster); std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketLine &line); std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketSymbol &symbol); @@ -67,7 +67,7 @@ private: GlyphStore & glyphStore; SpriteAtlas & spriteAtlas; util::ptr<Sprite> sprite; - Texturepool& texturePool; + TexturePool& texturePool; std::unique_ptr<Collision> collision; }; diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp index 0a0569f2ee..b9bf55a1b3 100644 --- a/include/mbgl/map/vector_tile_data.hpp +++ b/include/mbgl/map/vector_tile_data.hpp @@ -24,7 +24,7 @@ class GlyphAtlas; class GlyphStore; class SpriteAtlas; class Sprite; -class Texturepool; +class TexturePool; class Style; class VectorTileData : public TileData { @@ -35,7 +35,7 @@ public: float mapMaxZoom, util::ptr<Style>, GlyphAtlas&, GlyphStore&, SpriteAtlas&, util::ptr<Sprite>, - Texturepool&, + TexturePool&, const SourceInfo&); ~VectorTileData(); @@ -62,7 +62,7 @@ protected: GlyphStore& glyphStore; SpriteAtlas& spriteAtlas; util::ptr<Sprite> sprite; - Texturepool& texturepool; + TexturePool& texturePool; util::ptr<Style> style; public: diff --git a/include/mbgl/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp index 8c5d9839a5..0a7651d7cc 100644 --- a/include/mbgl/renderer/raster_bucket.hpp +++ b/include/mbgl/renderer/raster_bucket.hpp @@ -16,7 +16,7 @@ class VertexArrayObject; class RasterBucket : public Bucket { public: - RasterBucket(Texturepool&, const StyleBucketRaster&); + RasterBucket(TexturePool&, const StyleBucketRaster&); virtual void render(Painter& painter, util::ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix); virtual bool hasData() const; diff --git a/include/mbgl/util/raster.hpp b/include/mbgl/util/raster.hpp index d74c78f714..ff27f509f4 100644 --- a/include/mbgl/util/raster.hpp +++ b/include/mbgl/util/raster.hpp @@ -2,7 +2,7 @@ #define MBGL_UTIL_RASTER #include <mbgl/util/transition.hpp> -#include <mbgl/util/texturepool.hpp> +#include <mbgl/util/texture_pool.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/renderer/prerendered_texture.hpp> @@ -17,7 +17,7 @@ namespace mbgl { class Raster : public std::enable_shared_from_this<Raster> { public: - Raster(Texturepool&); + Raster(TexturePool&); ~Raster(); // load image data @@ -57,7 +57,7 @@ private: bool loaded = false; // shared texture pool - Texturepool& texturepool; + TexturePool& texturePool; // min/mag filter uint32_t filter = 0; diff --git a/include/mbgl/util/texturepool.hpp b/include/mbgl/util/texture_pool.hpp index 566d8c1750..95d918c237 100644 --- a/include/mbgl/util/texturepool.hpp +++ b/include/mbgl/util/texture_pool.hpp @@ -9,7 +9,7 @@ namespace mbgl { -class Texturepool : private util::noncopyable { +class TexturePool : private util::noncopyable { public: GLuint getTextureID(); |