diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-03-29 17:49:01 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-02 17:56:16 +0300 |
| commit | ebe6f7dea33c59b91464f7c6c905600184324f3c (patch) | |
| tree | 2ca2b78bbf5b82b3dc51cf8ca0abdff183b55571 /src/mbgl/renderer/layers/render_line_layer.cpp | |
| parent | 45e8154d334aa967ac22910cad1f3d96f4c8e72b (diff) | |
| download | qtlocation-mapboxgl-ebe6f7dea33c59b91464f7c6c905600184324f3c.tar.gz | |
[core] Remove RenderLinePaintProperties
This patch removes the `RenderLinePaintProperties` by
making `LineFloorWidth` part of the `style::LinePaintProperties`.
It normalizes paint properties evaluation for the line layer.
Diffstat (limited to 'src/mbgl/renderer/layers/render_line_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 04b191d0f6..2d246df7f4 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -33,10 +33,7 @@ void RenderLineLayer::transition(const TransitionParameters& parameters) { } void RenderLineLayer::evaluate(const PropertyEvaluationParameters& parameters) { - style::Properties<LineFloorwidth>::Unevaluated extra(unevaluated.get<style::LineWidth>()); - evaluated = RenderLinePaintProperties::PossiblyEvaluated( - unevaluated.evaluate(parameters).concat(extra.evaluate(parameters))); - + evaluated = unevaluated.evaluate(parameters); crossfade = parameters.getCrossfadeParameters(); passes = (evaluated.get<style::LineOpacity>().constantOr(1.0) > 0 |