diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-05-25 09:15:27 -0700 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2017-06-15 15:24:49 -0400 |
| commit | 50a56f5b06ed35ff33aca5d6c98ec71d2f28d5e0 (patch) | |
| tree | ae9d0e6df12b651dae6e03819b03c5da3b7a7dda | |
| parent | bcc041639de550fed55179af19e3c86248b7f351 (diff) | |
| download | qtlocation-mapboxgl-50a56f5b06ed35ff33aca5d6c98ec71d2f28d5e0.tar.gz | |
[core] Use fade texture in collision debug boxes so that they agree more closely with symbol shaders.
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 3 | ||||
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/programs/uniforms.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/painters/painter_symbol.cpp | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 3b4260bb78..ba99e0c087 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -33,7 +33,8 @@ class CollisionBoxProgram : public Program< uniforms::u_maxzoom, uniforms::u_collision_y_stretch, uniforms::u_camera_to_center_distance, - uniforms::u_pitch>, + uniforms::u_pitch, + uniforms::u_fadetexture>, style::Properties<>> { public: diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 6e7454d5c7..9abd2a7b6b 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -32,7 +32,6 @@ namespace uniforms { MBGL_DEFINE_UNIFORM_SCALAR(bool, u_rotate_with_map); MBGL_DEFINE_UNIFORM_SCALAR(bool, u_pitch_with_map); MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_texture); -MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_fadetexture); MBGL_DEFINE_UNIFORM_SCALAR(float, u_aspect_ratio); MBGL_DEFINE_UNIFORM_SCALAR(bool, u_is_halo); MBGL_DEFINE_UNIFORM_SCALAR(float, u_gamma_scale); diff --git a/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp index ff9800609c..8d4ed13f08 100644 --- a/src/mbgl/programs/uniforms.hpp +++ b/src/mbgl/programs/uniforms.hpp @@ -47,6 +47,7 @@ MBGL_DEFINE_UNIFORM_VECTOR(float, 2, u_pixel_coord_lower); MBGL_DEFINE_UNIFORM_SCALAR(float, u_mix); MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image); +MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_fadetexture); MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale_a); MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale_b); MBGL_DEFINE_UNIFORM_SCALAR(float, u_tile_units_to_pixels); diff --git a/src/mbgl/renderer/painters/painter_symbol.cpp b/src/mbgl/renderer/painters/painter_symbol.cpp index c358d78b80..dc80f096f4 100644 --- a/src/mbgl/renderer/painters/painter_symbol.cpp +++ b/src/mbgl/renderer/painters/painter_symbol.cpp @@ -154,7 +154,8 @@ void Painter::renderSymbol(PaintParameters& parameters, uniforms::u_maxzoom::Value{ float((tile.id.canonical.z + 1) * 10) }, uniforms::u_collision_y_stretch::Value{ tile.tile.yStretch() }, uniforms::u_camera_to_center_distance::Value{ state.getCameraToCenterDistance() }, - uniforms::u_pitch::Value{ state.getPitch() } + uniforms::u_pitch::Value{ state.getPitch() }, + uniforms::u_fadetexture::Value{ 1 } }, *bucket.collisionBox.vertexBuffer, *bucket.collisionBox.indexBuffer, |