diff options
Diffstat (limited to 'src/mbgl/programs/background_program.cpp')
| -rw-r--r-- | src/mbgl/programs/background_program.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mbgl/programs/background_program.cpp b/src/mbgl/programs/background_program.cpp index 52a9638d6b..94d7aab2c8 100644 --- a/src/mbgl/programs/background_program.cpp +++ b/src/mbgl/programs/background_program.cpp @@ -16,7 +16,7 @@ BackgroundPatternUniforms::values(mat4 matrix, Size atlasSize, const ImagePosition& a, const ImagePosition& b, - const Faded<std::string>& fading, + const CrossfadeParameters& fading, const UnwrappedTileID& tileID, const TransformState& state) { @@ -25,22 +25,22 @@ BackgroundPatternUniforms::values(mat4 matrix, int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y; return BackgroundPatternUniforms::Values { - uniforms::u_matrix::Value{ matrix }, - uniforms::u_opacity::Value{ opacity }, - uniforms::u_texsize::Value{ atlasSize }, - uniforms::u_pattern_tl_a::Value{ a.tl() }, - uniforms::u_pattern_br_a::Value{ a.br() }, - uniforms::u_pattern_tl_b::Value{ b.tl() }, - uniforms::u_pattern_br_b::Value{ b.br() }, - uniforms::u_pattern_size_a::Value{ a.displaySize() }, - uniforms::u_pattern_size_b::Value{ b.displaySize() }, - uniforms::u_scale_a::Value{ fading.fromScale }, - uniforms::u_scale_b::Value{ fading.toScale }, - 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) }} }, - uniforms::u_pixel_coord_lower::Value{ std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} }, - uniforms::u_tile_units_to_pixels::Value{ 1.0f / tileID.pixelsToTileUnits(1.0f, state.getIntegerZoom()) }, + uniforms::u_matrix::Value( matrix ), + uniforms::u_opacity::Value( opacity ), + uniforms::u_texsize::Value( atlasSize ), + uniforms::u_pattern_tl_a::Value( a.tl() ), + uniforms::u_pattern_br_a::Value( a.br() ), + uniforms::u_pattern_tl_b::Value( b.tl() ), + uniforms::u_pattern_br_b::Value( b.br() ), + uniforms::u_pattern_size_a::Value( a.displaySize() ), + uniforms::u_pattern_size_b::Value( b.displaySize() ), + uniforms::u_scale_a::Value( fading.fromScale ), + uniforms::u_scale_b::Value( fading.toScale ), + 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) }}), + uniforms::u_pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF)}}), + uniforms::u_tile_units_to_pixels::Value( 1.0f / tileID.pixelsToTileUnits(1.0f, state.getIntegerZoom()) ), }; } |