diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 16:39:50 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-02 09:44:42 -0800 |
commit | 141e995806576364d185626176c1b993fc519291 (patch) | |
tree | ecdc41fc7699f2a1a9e9456157348451ebe99597 /src/mbgl/renderer/painter_circle.cpp | |
parent | 6a6bddb4537004cc1bfc506e76772de74d33f3f7 (diff) | |
download | qtlocation-mapboxgl-141e995806576364d185626176c1b993fc519291.tar.gz |
[core] Add support for data-driven styling
Diffstat (limited to 'src/mbgl/renderer/painter_circle.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_circle.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp index 966d58b59b..8d47e75f71 100644 --- a/src/mbgl/renderer/painter_circle.cpp +++ b/src/mbgl/renderer/painter_circle.cpp @@ -37,13 +37,6 @@ void Painter::renderCircle(PaintParameters& parameters, 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_stroke_color::Value{ properties.get<CircleStrokeColor>() }, - uniforms::u_stroke_width::Value{ properties.get<CircleStrokeWidth>() }, - uniforms::u_stroke_opacity::Value{ properties.get<CircleStrokeOpacity>() }, uniforms::u_scale_with_map::Value{ scaleWithMap }, uniforms::u_extrude_scale::Value{ scaleWithMap ? std::array<float, 2> {{ @@ -54,7 +47,10 @@ void Painter::renderCircle(PaintParameters& parameters, }, *bucket.vertexBuffer, *bucket.indexBuffer, - bucket.segments + bucket.segments, + bucket.paintPropertyBinders.at(layer.getID()), + properties, + state.getZoom() ); } |