diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-02 11:30:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-04 09:59:56 -0700 |
commit | e7d2796762c3ba05e824177969c501ab2370336f (patch) | |
tree | 22caa9990d87f94c68b346993b5956b6792b5dbe /src/mbgl/renderer/property_evaluation_parameters.hpp | |
parent | 89f1ffc6d29d5631dfd322834397ec2247c5c9d7 (diff) | |
download | qtlocation-mapboxgl-e7d2796762c3ba05e824177969c501ab2370336f.tar.gz |
[core] Omnibus Style::update method
Combine Style::cascade, recalculate, relayout, and updateTiles into a single method. This allows multiple loops over sources and layers to be consolidated and prepares for additional Style-Map decoupling: rather than tracking pending updates via a set of Update flags held by the Map and passed to the Style, the Style can use its own data to determine what to update.
Diffstat (limited to 'src/mbgl/renderer/property_evaluation_parameters.hpp')
-rw-r--r-- | src/mbgl/renderer/property_evaluation_parameters.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/renderer/property_evaluation_parameters.hpp b/src/mbgl/renderer/property_evaluation_parameters.hpp index b18fe57aca..39b663bdb9 100644 --- a/src/mbgl/renderer/property_evaluation_parameters.hpp +++ b/src/mbgl/renderer/property_evaluation_parameters.hpp @@ -8,13 +8,15 @@ namespace mbgl { class PropertyEvaluationParameters { public: explicit PropertyEvaluationParameters(float z_) - : z(z_) {} + : z(z_), + now(Clock::time_point::max()), + zoomHistory(), + defaultFadeDuration(0) {} - PropertyEvaluationParameters(float z_, + PropertyEvaluationParameters(ZoomHistory zoomHistory_, TimePoint now_, - ZoomHistory zoomHistory_, Duration defaultFadeDuration_) - : z(z_), + : z(zoomHistory_.lastZoom), now(std::move(now_)), zoomHistory(std::move(zoomHistory_)), defaultFadeDuration(std::move(defaultFadeDuration_)) {} |