diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-17 18:19:48 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-23 12:59:27 -0700 |
| commit | 71c8f6aa10368084bc0a365b15f004d0629a8b67 (patch) | |
| tree | 14f22e8b37c0ca5112f5c4cefe34e72882dee3b7 /src/mbgl/programs/fill_extrusion_program.hpp | |
| parent | 72b13cef6a83594b15f47bfeaee782504def619e (diff) | |
| download | qtlocation-mapboxgl-71c8f6aa10368084bc0a365b15f004d0629a8b67.tar.gz | |
[core] Move pattern coordinate division by texture size into shader
This makes pattern usage more like icons, and will be necessary for data-driven *-pattern properties.
Diffstat (limited to 'src/mbgl/programs/fill_extrusion_program.hpp')
| -rw-r--r-- | src/mbgl/programs/fill_extrusion_program.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp index 48fca44ee8..7f1c76a6ad 100644 --- a/src/mbgl/programs/fill_extrusion_program.hpp +++ b/src/mbgl/programs/fill_extrusion_program.hpp @@ -55,6 +55,7 @@ struct FillExtrusionPatternUniforms : gl::Uniforms< uniforms::u_pattern_size_b, uniforms::u_scale_a, uniforms::u_scale_b, + uniforms::u_texsize, uniforms::u_mix, uniforms::u_image, uniforms::u_pixel_coord_upper, @@ -66,6 +67,7 @@ struct FillExtrusionPatternUniforms : gl::Uniforms< uniforms::u_lightintensity> { static Values values(mat4, + Size atlasSize, const SpriteAtlasElement&, const SpriteAtlasElement&, const Faded<std::string>&, |