summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/property_evaluation_parameters.hpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-02-01 20:24:49 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-02-04 13:30:21 +0200
commite45c3926c26884aceca5789837e1c1b31a51154e (patch)
tree2c954fb953e70b7a670b7c879b67f8bf50ef6471 /src/mbgl/renderer/property_evaluation_parameters.hpp
parentb56a7181afc40029d4280d60489d989b5dddf304 (diff)
downloadqtlocation-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/property_evaluation_parameters.hpp')
-rw-r--r--src/mbgl/renderer/property_evaluation_parameters.hpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mbgl/renderer/property_evaluation_parameters.hpp b/src/mbgl/renderer/property_evaluation_parameters.hpp
index 0e1c317294..7c0d4e0fe2 100644
--- a/src/mbgl/renderer/property_evaluation_parameters.hpp
+++ b/src/mbgl/renderer/property_evaluation_parameters.hpp
@@ -18,18 +18,15 @@ public:
: z(z_),
now(Clock::time_point::max()),
zoomHistory(),
- defaultFadeDuration(0),
- useIntegerZoom(false) {}
+ defaultFadeDuration(0) {}
PropertyEvaluationParameters(ZoomHistory zoomHistory_,
TimePoint now_,
- Duration defaultFadeDuration_,
- bool useIntegerZoom_ = false)
+ Duration defaultFadeDuration_)
: z(zoomHistory_.lastZoom),
now(std::move(now_)),
zoomHistory(std::move(zoomHistory_)),
- defaultFadeDuration(std::move(defaultFadeDuration_)),
- useIntegerZoom(useIntegerZoom_) {}
+ defaultFadeDuration(std::move(defaultFadeDuration_)) {}
CrossfadeParameters getCrossfadeParameters() const {
const float fraction = z - std::floor(z);
@@ -47,7 +44,6 @@ public:
TimePoint now;
ZoomHistory zoomHistory;
Duration defaultFadeDuration;
- bool useIntegerZoom;
};
} // namespace mbgl