diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-07-11 11:22:39 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2017-07-12 14:14:09 -0700 |
| commit | e8657becc56c2aee5b070357092da028e752d461 (patch) | |
| tree | 21a877d6adacfc468b4d2c0223bffec49ea3f5dc /src/mbgl/programs/symbol_program.hpp | |
| parent | af10e2d3be5f24c1887622c63332a3cf67bc19d5 (diff) | |
| download | qtlocation-mapboxgl-e8657becc56c2aee5b070357092da028e752d461.tar.gz | |
[core] Update shaders.
Implements 'icon-pitch-alignment' (issue #9345)
Fixes issue #9456 (map-aligned point label regression)
Diffstat (limited to 'src/mbgl/programs/symbol_program.hpp')
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 79a961ad21..c74837b121 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -41,6 +41,8 @@ MBGL_DEFINE_UNIFORM_SCALAR(bool, u_is_size_feature_constant); MBGL_DEFINE_UNIFORM_SCALAR(float, u_size_t); MBGL_DEFINE_UNIFORM_SCALAR(float, u_size); MBGL_DEFINE_UNIFORM_SCALAR(float, u_max_camera_distance); +MBGL_DEFINE_UNIFORM_SCALAR(bool, u_rotate_symbol); +MBGL_DEFINE_UNIFORM_SCALAR(float, u_aspect_ratio); } // namespace uniforms struct SymbolLayoutAttributes : gl::Attributes< @@ -348,7 +350,9 @@ class SymbolIconProgram : public SymbolProgram< uniforms::u_camera_to_center_distance, uniforms::u_pitch, uniforms::u_pitch_with_map, - uniforms::u_max_camera_distance>, + uniforms::u_max_camera_distance, + uniforms::u_rotate_symbol, + uniforms::u_aspect_ratio>, style::IconPaintProperties> { public: @@ -387,6 +391,8 @@ class SymbolSDFProgram : public SymbolProgram< uniforms::u_pitch, uniforms::u_pitch_with_map, uniforms::u_max_camera_distance, + uniforms::u_rotate_symbol, + uniforms::u_aspect_ratio, uniforms::u_gamma_scale, uniforms::u_is_halo>, PaintProperties> @@ -409,6 +415,8 @@ public: uniforms::u_pitch, uniforms::u_pitch_with_map, uniforms::u_max_camera_distance, + uniforms::u_rotate_symbol, + uniforms::u_aspect_ratio, uniforms::u_gamma_scale, uniforms::u_is_halo>, PaintProperties>; |