diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2017-06-16 10:42:33 -0400 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2017-07-10 13:09:34 -0400 |
| commit | 9034544932c81201d71e3043be785bc2b251042a (patch) | |
| tree | 35cedb587e7874f517e09c1573c71f354a269828 /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
| parent | 5cfa15e1143aea8d2a6a25625350399c483f10b9 (diff) | |
| download | qtlocation-mapboxgl-9034544932c81201d71e3043be785bc2b251042a.tar.gz | |
[core] improve legibility of labels that follow lines
port https://github.com/mapbox/mapbox-gl-js/pull/4781
This improves legibility of labels that follow lines in pitched views.
The previous approach used the limited information in the shader to
calculate put the glyph in approximatelyright place. The new approach
does this more accurately by doing it on the cpu where we have access to
the entire line geometry.
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 573e9db72e..2fe6dd971e 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -84,6 +84,7 @@ style::SymbolPropertyValues RenderSymbolLayer::iconPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get<style::IconRotationAlignment>(), // icon-pitch-alignment is not yet implemented; inherit the rotation alignment layout_.get<style::IconRotationAlignment>(), + layout_.get<style::IconKeepUpright>(), evaluated.get<style::IconTranslate>(), evaluated.get<style::IconTranslateAnchor>(), evaluated.get<style::IconHaloColor>().constantOr(Color::black()).a > 0 && @@ -109,6 +110,7 @@ style::SymbolPropertyValues RenderSymbolLayer::textPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get<style::TextPitchAlignment>(), layout_.get<style::TextRotationAlignment>(), + layout_.get<style::TextKeepUpright>(), evaluated.get<style::TextTranslate>(), evaluated.get<style::TextTranslateAnchor>(), evaluated.get<style::TextHaloColor>().constantOr(Color::black()).a > 0 && |