summaryrefslogtreecommitdiff
path: root/include/mbgl/renderer
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-07-29 18:27:59 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-07-29 18:27:59 +0200
commitfa3a41136ca6345f34b53a1f211926cc1bd8649c (patch)
tree457f0d528b02356e310f9d3a3f1f1859cc63dd8d /include/mbgl/renderer
parent270c24a9a8c8a02e62132cd4cb7b8aac2c1e6de5 (diff)
downloadqtlocation-mapboxgl-fa3a41136ca6345f34b53a1f211926cc1bd8649c.tar.gz
merge text and icon buckets/styles
(we're not yet placing together!)
Diffstat (limited to 'include/mbgl/renderer')
-rw-r--r--include/mbgl/renderer/icon_bucket.hpp53
-rw-r--r--include/mbgl/renderer/painter.hpp8
-rw-r--r--include/mbgl/renderer/symbol_bucket.hpp82
-rw-r--r--include/mbgl/renderer/text_bucket.hpp61
4 files changed, 85 insertions, 119 deletions
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 <mbgl/renderer/bucket.hpp>
-#include <mbgl/geometry/elements_buffer.hpp>
-#include <mbgl/geometry/icon_buffer.hpp>
-#include <mbgl/style/style_bucket.hpp>
-
-#include <vector>
-#include <memory>
-
-#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<StyleLayer> 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<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);
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 <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/text/types.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/style/style_bucket.hpp>
+
+#include <memory>
+#include <map>
+#include <vector>
+
+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<StyleLayer> 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<triangle_group_type> 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 <mbgl/geometry/vao.hpp>
-#include <mbgl/geometry/elements_buffer.hpp>
-#include <mbgl/map/vector_tile.hpp>
-#include <mbgl/text/types.hpp>
-#include <mbgl/text/glyph.hpp>
-#include <mbgl/style/style_bucket.hpp>
-
-#include <memory>
-#include <map>
-#include <vector>
-
-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<StyleLayer> 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<triangle_group_type> triangleGroups;
-};
-}
-
-#endif