diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-02-01 20:24:49 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-02-04 13:30:21 +0200 |
commit | e45c3926c26884aceca5789837e1c1b31a51154e (patch) | |
tree | 2c954fb953e70b7a670b7c879b67f8bf50ef6471 /src/mbgl/renderer/layers | |
parent | b56a7181afc40029d4280d60489d989b5dddf304 (diff) | |
download | qtlocation-mapboxgl-e45c3926c26884aceca5789837e1c1b31a51154e.tar.gz |
[core] Reduce presence of the 'useIntegerZoom' option
The `useIntegerZoom` presence is now limited: it is removed
from `PossiblyEvaluatedPropertyValue` class specializations
(was never used there!) and from the `PropertyEvaluationParameters`
class, so we do not have to copy `PropertyEvaluationParameters`
instance at `RenderLineLayer::evaluate`.
Diffstat (limited to 'src/mbgl/renderer/layers')
-rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.hpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index b7785d1cb7..7026175bfc 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -47,12 +47,8 @@ void RenderLineLayer::transition(const TransitionParameters& parameters) { void RenderLineLayer::evaluate(const PropertyEvaluationParameters& parameters) { style::Properties<LineFloorwidth>::Unevaluated extra(unevaluated.get<style::LineWidth>()); - - auto dashArrayParams = parameters; - dashArrayParams.useIntegerZoom = true; - evaluated = RenderLinePaintProperties::PossiblyEvaluated( - unevaluated.evaluate(parameters).concat(extra.evaluate(dashArrayParams))); + unevaluated.evaluate(parameters).concat(extra.evaluate(parameters))); crossfade = parameters.getCrossfadeParameters(); diff --git a/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp index 3d050528c4..d586725f54 100644 --- a/src/mbgl/renderer/layers/render_line_layer.hpp +++ b/src/mbgl/renderer/layers/render_line_layer.hpp @@ -10,7 +10,8 @@ namespace mbgl { struct LineFloorwidth : style::DataDrivenPaintProperty<float, attributes::a_floorwidth, uniforms::u_floorwidth> { - static float defaultValue() { return 1; } + using EvaluatorType = DataDrivenPropertyEvaluator<float, true>; + static float defaultValue() { return 1.0; } }; class RenderLinePaintProperties : public style::ConcatenateProperties< |