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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_extrusion_program.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp index 63d1cbeb59..1b0f483b1a 100644 --- a/src/mbgl/programs/fill_extrusion_program.cpp +++ b/src/mbgl/programs/fill_extrusion_program.cpp @@ -45,6 +45,7 @@ FillExtrusionUniforms::values(mat4 matrix, FillExtrusionPatternUniforms::Values FillExtrusionPatternUniforms::values(mat4 matrix, + Size atlasSize, const SpriteAtlasElement& a, const SpriteAtlasElement& b, const Faded<std::string>& fading, @@ -66,6 +67,7 @@ FillExtrusionPatternUniforms::values(mat4 matrix, uniforms::u_pattern_size_b::Value{ b.size }, uniforms::u_scale_a::Value{ fading.fromScale }, uniforms::u_scale_b::Value{ fading.toScale }, + uniforms::u_texsize::Value{ atlasSize }, uniforms::u_mix::Value{ fading.t }, uniforms::u_image::Value{ 0 }, uniforms::u_pixel_coord_upper::Value{ std::array<float, 2>{{ float(pixelX >> 16), float(pixelY >> 16) }} }, |