diff options
Diffstat (limited to 'src/mbgl/renderer/painter_circle.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_circle.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp index 763181605f..0767a50943 100644 --- a/src/mbgl/renderer/painter_circle.cpp +++ b/src/mbgl/renderer/painter_circle.cpp @@ -20,8 +20,8 @@ void Painter::renderCircle(PaintParameters& parameters, return; } - const CirclePaintProperties& properties = layer.impl->paint; - const bool scaleWithMap = properties.circlePitchScale.value == CirclePitchScaleType::Map; + const CirclePaintProperties::Evaluated& properties = layer.impl->paint.evaluated; + const bool scaleWithMap = properties.get<CirclePitchScale>() == CirclePitchScaleType::Map; parameters.programs.circle.draw( context, @@ -32,13 +32,15 @@ void Painter::renderCircle(PaintParameters& parameters, : gl::StencilMode::disabled(), colorModeForRenderPass(), CircleProgram::UniformValues { - uniforms::u_matrix::Value{ tile.translatedMatrix(properties.circleTranslate.value, - properties.circleTranslateAnchor.value, - state) }, - uniforms::u_opacity::Value{ properties.circleOpacity.value }, - uniforms::u_color::Value{ properties.circleColor.value }, - uniforms::u_radius::Value{ properties.circleRadius.value }, - uniforms::u_blur::Value{ properties.circleBlur.value }, + uniforms::u_matrix::Value{ + tile.translatedMatrix(properties.get<CircleTranslate>(), + properties.get<CircleTranslateAnchor>(), + state) + }, + uniforms::u_opacity::Value{ properties.get<CircleOpacity>() }, + uniforms::u_color::Value{ properties.get<CircleColor>() }, + uniforms::u_radius::Value{ properties.get<CircleRadius>() }, + uniforms::u_blur::Value{ properties.get<CircleBlur>() }, uniforms::u_scale_with_map::Value{ scaleWithMap }, uniforms::u_extrude_scale::Value{ scaleWithMap ? std::array<float, 2> {{ |