diff options
Diffstat (limited to 'src/mbgl/programs/fill_extrusion_program.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_extrusion_program.cpp | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp index aaf192a843..2bdd0604d7 100644 --- a/src/mbgl/programs/fill_extrusion_program.cpp +++ b/src/mbgl/programs/fill_extrusion_program.cpp @@ -36,47 +36,39 @@ FillExtrusionUniforms::values(mat4 matrix, const TransformState& state, const EvaluatedLight& light) { return FillExtrusionUniforms::Values{ - uniforms::u_matrix::Value{ matrix }, - uniforms::u_lightcolor::Value{ lightColor(light) }, - uniforms::u_lightpos::Value{ lightPosition(light, state) }, - uniforms::u_lightintensity::Value{ lightIntensity(light) } + uniforms::u_matrix::Value( matrix ), + uniforms::u_lightcolor::Value( lightColor(light) ), + uniforms::u_lightpos::Value( lightPosition(light, state) ), + uniforms::u_lightintensity::Value( lightIntensity(light) ) }; } FillExtrusionPatternUniforms::Values FillExtrusionPatternUniforms::values(mat4 matrix, Size atlasSize, - const ImagePosition& a, - const ImagePosition& b, - const Faded<std::string>& fading, + const CrossfadeParameters& crossfade, const UnwrappedTileID& tileID, const TransformState& state, const float heightFactor, + const float pixelRatio, const EvaluatedLight& light) { + const auto tileRatio = 1 / tileID.pixelsToTileUnits(1, state.getIntegerZoom()); int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z); int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z)); int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y; return FillExtrusionPatternUniforms::Values{ - uniforms::u_matrix::Value{ matrix }, - 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_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) }} }, - 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_height_factor::Value{ heightFactor }, - uniforms::u_lightcolor::Value{ lightColor(light) }, - uniforms::u_lightpos::Value{ lightPosition(light, state) }, - uniforms::u_lightintensity::Value{ lightIntensity(light) }, + uniforms::u_matrix::Value( matrix ), + uniforms::u_scale::Value( {{pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale}} ), + uniforms::u_texsize::Value( atlasSize ), + uniforms::u_fade::Value( crossfade.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_height_factor::Value( heightFactor ), + uniforms::u_lightcolor::Value( lightColor(light) ), + uniforms::u_lightpos::Value( lightPosition(light, state) ), + uniforms::u_lightintensity::Value( lightIntensity(light) ), }; } |