summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/buckets/symbol_bucket.hpp
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-06-07 15:38:08 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-08-13 13:32:56 +0300
commit9aa529576f4d0565bb81369f03a1fecdb8dd0886 (patch)
tree22c66df95c47aa8ad7f1e76ba4497adcb471a892 /src/mbgl/renderer/buckets/symbol_bucket.hpp
parent075d458403ba2c7367f06e5fc66c2a00c788634a (diff)
downloadqtlocation-mapboxgl-9aa529576f4d0565bb81369f03a1fecdb8dd0886.tar.gz
[core] Implement support for "text-writing-mode" layout property
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.hpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index a94073f7d0..f47ced8331 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -39,6 +39,10 @@ public:
size_t vertexStartIndex;
// The crossTileID is only filled/used on the foreground for variable text anchors
uint32_t crossTileID = 0u;
+ // The placedOrientation is only used when symbol layer's property is set to support
+ // placement for orientation variants.
+ optional<style::TextWritingModeType> placedOrientation;
+ float angle = 0;
};
class SymbolBucket final : public Bucket {
@@ -53,7 +57,9 @@ public:
bool sortFeaturesByY,
const std::string bucketLeaderID,
const std::vector<SymbolInstance>&&,
- const float tilePixelRatio);
+ const float tilePixelRatio,
+ bool allowVerticalPlacement,
+ std::vector<style::TextWritingModeType> placementModes);
~SymbolBucket() override;
void upload(gfx::UploadPass&) override;
@@ -149,7 +155,8 @@ public:
const float tilePixelRatio;
uint32_t bucketInstanceId;
-
+ const bool allowVerticalPlacement;
+ const std::vector<style::TextWritingModeType> placementModes;
mutable optional<bool> hasFormatSectionOverrides_;
std::shared_ptr<std::vector<size_t>> featureSortOrder;