diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-29 18:27:59 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-29 18:27:59 +0200 |
| commit | fa3a41136ca6345f34b53a1f211926cc1bd8649c (patch) | |
| tree | 457f0d528b02356e310f9d3a3f1f1859cc63dd8d /include/mbgl/renderer/painter.hpp | |
| parent | 270c24a9a8c8a02e62132cd4cb7b8aac2c1e6de5 (diff) | |
| download | qtlocation-mapboxgl-fa3a41136ca6345f34b53a1f211926cc1bd8649c.tar.gz | |
merge text and icon buckets/styles
(we're not yet placing together!)
Diffstat (limited to 'include/mbgl/renderer/painter.hpp')
| -rw-r--r-- | include/mbgl/renderer/painter.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index dedb4dc120..b4023de167 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -38,8 +38,7 @@ class StyleSource; class FillBucket; class LineBucket; -class IconBucket; -class TextBucket; +class SymbolBucket; class RasterBucket; struct FillProperties; @@ -83,8 +82,7 @@ public: void renderFill(FillBucket& bucket, const FillProperties& properties, const Tile::ID& id, const mat4 &mat); void renderFill(FillBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); void renderLine(LineBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); - void renderIcon(IconBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); - void renderText(TextBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); + void renderSymbol(SymbolBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); void renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); void preparePrerender(PrerenderedTexture &texture); @@ -119,7 +117,7 @@ public: bool needsAnimation() const; private: void setupShaders(); - const mat4 &translatedMatrix(const std::array<float, 2> &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Default); + const mat4 &translatedMatrix(const std::array<float, 2> &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Map); void prepareTile(const Tile& tile); |