diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-02-10 14:41:44 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-02-10 14:41:44 -0800 |
commit | ad481f6f12b299e9be81d89aacd6f31f27c1db20 (patch) | |
tree | 47b72bcf14205819ba5d45d2768dd5e285289826 /src/mbgl/style/style_layer.hpp | |
parent | b864d6960638c82e8c16c63712ca235dd6f96fa6 (diff) | |
parent | 6d47e9b6849f7c383dc6e71d9e8d6baeaacf8e9f (diff) | |
download | qtlocation-mapboxgl-ad481f6f12b299e9be81d89aacd6f31f27c1db20.tar.gz |
Merge pull request #821 from mapbox/pattern-functions
functions for everything
Diffstat (limited to 'src/mbgl/style/style_layer.hpp')
-rw-r--r-- | src/mbgl/style/style_layer.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index b6cfe779c7..69af1dc230 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -5,6 +5,7 @@ #include <mbgl/style/class_properties.hpp> #include <mbgl/style/style_properties.hpp> #include <mbgl/style/applied_class_properties.hpp> +#include <mbgl/style/zoom_history.hpp> #include <mbgl/util/ptr.hpp> @@ -36,7 +37,7 @@ public: // Updates the StyleProperties information in this layer by evaluating all // pending transitions and applied classes in order. - void updateProperties(float z, std::chrono::steady_clock::time_point now); + void updateProperties(float z, std::chrono::steady_clock::time_point now, ZoomHistory &zoomHistory); // Sets the list of classes and creates transitions to the currently applied values. void setClasses(const std::vector<std::string> &class_names, std::chrono::steady_clock::time_point now, @@ -51,9 +52,9 @@ private: // Sets the properties of this object by evaluating all pending transitions and // aplied classes in order. - template <typename T> void applyStyleProperties(float z, std::chrono::steady_clock::time_point now); - template <typename T> void applyStyleProperty(PropertyKey key, T &, float z, std::chrono::steady_clock::time_point now); - template <typename T> void applyTransitionedStyleProperty(PropertyKey key, T &, float z, std::chrono::steady_clock::time_point now); + template <typename T> void applyStyleProperties(float z, std::chrono::steady_clock::time_point now, const ZoomHistory &zoomHistory); + template <typename T> void applyStyleProperty(PropertyKey key, T &, float z, std::chrono::steady_clock::time_point now, const ZoomHistory &zoomHistory); + template <typename T> void applyTransitionedStyleProperty(PropertyKey key, T &, float z, std::chrono::steady_clock::time_point now, const ZoomHistory &zoomHistory); // Removes all expired style transitions. void cleanupAppliedStyleProperties(std::chrono::steady_clock::time_point now); |