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

2 files changed, 11 insertions, 12 deletions

diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index ce320791c3..eadfe5c1fd 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -57,7 +57,7 @@ SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon,
     }
 
     SymbolQuads quads;
-    quads.emplace_back(tl, tr, bl, br, image.pos, 0, anchor.point, globalMinScale, std::numeric_limits<float>::infinity());
+    quads.emplace_back(tl, tr, bl, br, image.pos, 0, 0, anchor.point, globalMinScale, std::numeric_limits<float>::infinity());
     return quads;
 }
 
@@ -102,8 +102,6 @@ void getSegmentGlyphs(std::back_insert_iterator<GlyphInstances> glyphs, Anchor &
         float angle = std::atan2(end.y - newAnchorPoint.y, end.x - newAnchorPoint.x);
         if (!forward)
             angle += M_PI;
-        if (upsideDown)
-            angle += M_PI;
 
         glyphs = GlyphInstance{
             /* anchor */ newAnchorPoint,
@@ -188,12 +186,11 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText,
             Point<float> tr = otr;
             Point<float> bl = obl;
             Point<float> br = obr;
-            const float angle = instance.angle + textRotate;
 
-            if (angle) {
+            if (textRotate) {
                 // Compute the transformation matrix.
-                float angle_sin = std::sin(angle);
-                float angle_cos = std::cos(angle);
+                float angle_sin = std::sin(textRotate);
+                float angle_cos = std::cos(textRotate);
                 std::array<float, 4> matrix = {{angle_cos, -angle_sin, angle_sin, angle_cos}};
 
                 tl = util::matrixMultiply(matrix, tl);
@@ -205,8 +202,9 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText,
             // Prevent label from extending past the end of the line
             const float glyphMinScale = std::max(instance.minScale, anchor.scale);
 
-            const float glyphAngle = std::fmod((anchor.angle + textRotate + instance.offset + 2 * M_PI), (2 * M_PI));
-            quads.emplace_back(tl, tr, bl, br, rect, glyphAngle, instance.anchorPoint, glyphMinScale, instance.maxScale);
+            const float anchorAngle = std::fmod((anchor.angle + textRotate + instance.offset + 2 * M_PI), (2 * M_PI));
+            const float glyphAngle = std::fmod((instance.angle + textRotate + instance.offset + 2 * M_PI), (2 * M_PI));
+            quads.emplace_back(tl, tr, bl, br, rect, anchorAngle, glyphAngle, instance.anchorPoint, glyphMinScale, instance.maxScale);
 
         }
 
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;
 };