diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-07-06 13:09:15 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-07-23 13:33:27 -0700 |
| commit | f9b36f9f5b4cf09e08c2ff0181b339b53e8d0014 (patch) | |
| tree | c1dbbdd657d7f5edee1defb239773576e43d27d0 /src/mbgl/programs/symbol_program.hpp | |
| parent | 870d7fda4d5b65d9a4993f35322678bc6f50767c (diff) | |
| download | qtlocation-mapboxgl-f9b36f9f5b4cf09e08c2ff0181b339b53e8d0014.tar.gz | |
[core] Add `symbol-placement: line-center`
- Remove unused/vestigial 'maxCameraDistance'
- Create a single collision circle for line labels that are less than half the width of a collision circle
Diffstat (limited to 'src/mbgl/programs/symbol_program.hpp')
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 35b5821918..653fce9d4c 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -41,7 +41,6 @@ MBGL_DEFINE_UNIFORM_SCALAR(bool, u_is_size_zoom_constant); 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 @@ -356,7 +355,6 @@ 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_rotate_symbol, uniforms::u_aspect_ratio>, style::IconPaintProperties> @@ -396,7 +394,6 @@ class SymbolSDFProgram : public SymbolProgram< uniforms::u_camera_to_center_distance, 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, @@ -418,8 +415,7 @@ public: uniforms::u_is_text, uniforms::u_camera_to_center_distance, uniforms::u_pitch, - uniforms::u_pitch_with_map, - uniforms::u_max_camera_distance, + uniforms::u_pitch_with_map, uniforms::u_rotate_symbol, uniforms::u_aspect_ratio, uniforms::u_gamma_scale, |