diff options
author | Young Hahn <young@mapbox.com> | 2016-06-10 23:05:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-10 23:05:15 -0400 |
commit | ecd4aa14397ed081a521d8412557724e52f277f3 (patch) | |
tree | a04bca00190eba8f3f3947689ab6b7ff537e8946 /src/mbgl/text/quads.hpp | |
parent | a8df0feb5414af2c16bfdae27431d779e4545dbe (diff) | |
download | qtlocation-mapboxgl-ecd4aa14397ed081a521d8412557724e52f277f3.tar.gz |
text-pitch-alignment (#5288)
* First pass at port of https://github.com/mapbox/mapbox-gl-js/pull/2668
* RotationAlignmentType => AlignmentType
* Handle undefined default value for text-pitch-alignment and implement inheritance for this value from text-rotation-alignment
* Update dependencies
* Move handling fo undefined default value out of camelize functions
Diffstat (limited to 'src/mbgl/text/quads.hpp')
-rw-r--r-- | src/mbgl/text/quads.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 0627647f4c..e78fe308e2 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -17,21 +17,22 @@ class SymbolLayoutProperties; struct SymbolQuad { explicit SymbolQuad(const Point<float> &tl_, const Point<float> &tr_, const Point<float> &bl_, const Point<float> &br_, - const Rect<uint16_t> &tex_, float angle_, const Point<float> &anchorPoint_, + const Rect<uint16_t> &tex_, float anchorAngle_, float glyphAngle_, const Point<float> &anchorPoint_, float minScale_, float maxScale_) : tl(tl_), tr(tr_), bl(bl_), br(br_), tex(tex_), - angle(angle_), + anchorAngle(anchorAngle_), + glyphAngle(glyphAngle_), anchorPoint(anchorPoint_), minScale(minScale_), maxScale(maxScale_) {} Point<float> tl, tr, bl, br; Rect<uint16_t> tex; - float angle; + float anchorAngle, glyphAngle; Point<float> anchorPoint; float minScale, maxScale; }; |