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/renderer/painter.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/renderer/painter.hpp')
| -rw-r--r-- | src/mbgl/renderer/painter.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 25627a8d7a..65573b6594 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -140,7 +140,8 @@ private: void (SymbolBucket::*drawSDF)(SDFShader&, gl::ObjectStore&), // Layout - style::RotationAlignmentType rotationAlignment, + style::AlignmentType rotationAlignment, + style::AlignmentType pitchAlignment, float layoutSize, // Paint |