From fa3a41136ca6345f34b53a1f211926cc1bd8649c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 29 Jul 2014 18:27:59 +0200 Subject: merge text and icon buckets/styles (we're not yet placing together!) --- include/mbgl/renderer/icon_bucket.hpp | 53 --------------------- include/mbgl/renderer/painter.hpp | 8 ++-- include/mbgl/renderer/symbol_bucket.hpp | 82 +++++++++++++++++++++++++++++++++ include/mbgl/renderer/text_bucket.hpp | 61 ------------------------ 4 files changed, 85 insertions(+), 119 deletions(-) delete mode 100644 include/mbgl/renderer/icon_bucket.hpp create mode 100644 include/mbgl/renderer/symbol_bucket.hpp delete mode 100644 include/mbgl/renderer/text_bucket.hpp (limited to 'include/mbgl/renderer') diff --git a/include/mbgl/renderer/icon_bucket.hpp b/include/mbgl/renderer/icon_bucket.hpp deleted file mode 100644 index e3b311332d..0000000000 --- a/include/mbgl/renderer/icon_bucket.hpp +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef MBGL_RENDERER_ICONBUCKET -#define MBGL_RENDERER_ICONBUCKET - -#include -#include -#include -#include - -#include -#include - -#ifndef BUFFER_OFFSET -#define BUFFER_OFFSET(i) ((char *)nullptr + (i)) -#endif - -namespace mbgl { - -class Style; -class IconVertexBuffer; -class BucketDescription; -class IconShader; -class DotShader; -class SpriteAtlas; -class VectorTileFeature; - -class IconBucket : public Bucket { -public: - IconBucket(IconVertexBuffer& vertexBuffer, - const StyleBucketIcon& properties); - - virtual void render(Painter& painter, std::shared_ptr layer_desc, const Tile::ID& id); - virtual bool hasData() const; - - void addFeature(const VectorTileFeature &feature, SpriteAtlas &sprite_atlas); - - void drawIcons(IconShader& shader); - void drawIcons(DotShader& shader); - -public: - const StyleBucketIcon &properties; - -private: - - IconVertexBuffer& vertexBuffer; - VertexArrayObject array; - - const size_t vertex_start; - size_t vertex_end = 0; -}; - -} - -#endif 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 layer_desc, const Tile::ID& id); void renderLine(LineBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); - void renderIcon(IconBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); - void renderText(TextBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); + void renderSymbol(SymbolBucket& bucket, std::shared_ptr layer_desc, const Tile::ID& id); void renderRaster(RasterBucket& bucket, std::shared_ptr 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 &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Default); + const mat4 &translatedMatrix(const std::array &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Map); void prepareTile(const Tile& tile); diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp new file mode 100644 index 0000000000..a073856d2b --- /dev/null +++ b/include/mbgl/renderer/symbol_bucket.hpp @@ -0,0 +1,82 @@ +#ifndef MBGL_RENDERER_SYMBOLBUCKET +#define MBGL_RENDERER_SYMBOLBUCKET + +#include "bucket.hpp" +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace mbgl { + +class Style; +class TextVertexBuffer; +class IconVertexBuffer; +class TriangleElementsBuffer; +class TextShader; +class IconShader; +class DotShader; +class Placement; +class SpriteAtlas; +class GlyphAtlas; +class GlyphStore; +class FontStack; + +class SymbolBucket : public Bucket { + typedef ElementGroup triangle_group_type; + +public: + SymbolBucket( + TextVertexBuffer &textVertexBuffer, + IconVertexBuffer& iconVertexBuffer, + TriangleElementsBuffer &triangleElementsBuffer, + const StyleBucketSymbol &properties, Placement &placement); + + virtual void render(Painter &painter, std::shared_ptr layer_desc, const Tile::ID &id); + virtual bool hasData() const; + virtual bool hasTextData() const; + virtual bool hasIconData() const; + + void addFeatures(const VectorTileLayer &layer, const FilterExpression &filter, + const Tile::ID &id, SpriteAtlas &spriteAtlas, GlyphAtlas &glyphAtlas, + GlyphStore &glyphStore); + + void addGlyphs(const PlacedGlyphs &glyphs, float placementZoom, PlacementRange placementRange, + float zoom); + + + void drawGlyphs(TextShader &shader); + void drawIcons(IconShader& shader); + void drawIcons(DotShader& shader); + +private: + void addGlyph(uint64_t tileid, const std::string stackname, const std::u32string &string, + const FontStack &fontStack, GlyphAtlas &glyphAtlas, GlyphPositions &face); + void addFeature(const pbf &geom_pbf, const GlyphPositions &face, const Shaping &shaping); + +public: + const StyleBucketSymbol &properties; + +private: + TextVertexBuffer& textVertexBuffer; + IconVertexBuffer& iconVertexBuffer; + TriangleElementsBuffer& triangleElementsBuffer; + Placement &placement; + + const size_t text_vertex_start; + const size_t icon_vertex_start; + const size_t triangle_elements_start; + size_t icon_vertex_end = 0; + VertexArrayObject array; + + std::vector triangleGroups; +}; +} + +#endif diff --git a/include/mbgl/renderer/text_bucket.hpp b/include/mbgl/renderer/text_bucket.hpp deleted file mode 100644 index cb4b8f2cda..0000000000 --- a/include/mbgl/renderer/text_bucket.hpp +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef MBGL_RENDERER_TEXTBUCKET -#define MBGL_RENDERER_TEXTBUCKET - -#include "bucket.hpp" -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace mbgl { - -class Style; -class TextVertexBuffer; -class TriangleElementsBuffer; -class TextShader; -class Placement; -struct pbf; - -class TextBucket : public Bucket { - typedef ElementGroup triangle_group_type; - -public: - TextBucket( - TextVertexBuffer &vertexBuffer, - TriangleElementsBuffer &triangleElementsBuffer, - const StyleBucketText &properties, Placement &placement); - - virtual void render(Painter &painter, std::shared_ptr layer_desc, const Tile::ID &id); - virtual bool hasData() const; - - void addGlyphs(const PlacedGlyphs &glyphs, float placementZoom, - PlacementRange placementRange, float zoom); - - void addFeature(const pbf &geometry, - const GlyphPositions &face, - const Shaping &shaping); - - void drawGlyphs(TextShader &shader); - -public: - const StyleBucketText &properties; - -private: - TextVertexBuffer& vertexBuffer; - TriangleElementsBuffer& triangleElementsBuffer; - Placement &placement; - - const size_t vertex_start; - const size_t triangle_elements_start; - - std::vector triangleGroups; -}; -} - -#endif -- cgit v1.2.1