diff options
Diffstat (limited to 'src/mbgl/renderer/layers/render_circle_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_circle_layer.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index ce63ada770..af96e2e991 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -47,6 +47,10 @@ bool RenderCircleLayer::hasTransition() const { return unevaluated.hasTransition(); } +bool RenderCircleLayer::hasCrossfade() const { + return false; +} + void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { if (parameters.pass == RenderPass::Opaque) { return; @@ -68,19 +72,19 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { const auto allUniformValues = programInstance.computeAllUniformValues( CircleProgram::UniformValues { - uniforms::u_matrix::Value{ + uniforms::u_matrix::Value( tile.translatedMatrix(evaluated.get<CircleTranslate>(), evaluated.get<CircleTranslateAnchor>(), parameters.state) - }, - uniforms::u_scale_with_map::Value{ scaleWithMap }, - uniforms::u_extrude_scale::Value{ pitchWithMap + ), + uniforms::u_scale_with_map::Value( scaleWithMap ), + uniforms::u_extrude_scale::Value( pitchWithMap ? std::array<float, 2> {{ tile.id.pixelsToTileUnits(1, parameters.state.getZoom()), tile.id.pixelsToTileUnits(1, parameters.state.getZoom()) }} - : parameters.pixelsToGLUnits }, - uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }, - uniforms::u_pitch_with_map::Value{ pitchWithMap } + : parameters.pixelsToGLUnits ), + uniforms::u_camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() ), + uniforms::u_pitch_with_map::Value( pitchWithMap ) }, paintPropertyBinders, evaluated, |