diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-02 14:46:48 -0800 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-02 14:46:48 -0800 |
commit | d532824aec25e20efccb80860b990db0b85780ac (patch) | |
tree | 4210723832ad827f188bddf384c30d46d5819cb8 /src/mbgl/style/style_layer.hpp | |
parent | 47966a143176a337733fe63b4121d2d00c48359a (diff) | |
download | qtlocation-mapboxgl-d532824aec25e20efccb80860b990db0b85780ac.tar.gz |
implement functions for patterns
It introduces a new function type, FadedStopsFunction, that transitions
between the stops values instead of interpolating between them.
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 7cf661ca33..8531ad3a05 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> @@ -35,7 +36,7 @@ public: // Updates the StyleProperties information in this layer by evaluating all // pending transitions and applied classes in order. - void updateProperties(float z, timestamp now); + void updateProperties(float z, timestamp 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, timestamp now, @@ -50,9 +51,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, timestamp now); - template <typename T> void applyStyleProperty(PropertyKey key, T &, float z, timestamp now); - template <typename T> void applyTransitionedStyleProperty(PropertyKey key, T &, float z, timestamp now); + template <typename T> void applyStyleProperties(float z, timestamp now, const ZoomHistory &zoomHistory); + template <typename T> void applyStyleProperty(PropertyKey key, T &, float z, timestamp now, const ZoomHistory &zoomHistory); + template <typename T> void applyTransitionedStyleProperty(PropertyKey key, T &, float z, timestamp now, const ZoomHistory &zoomHistory); // Removes all expired style transitions. void cleanupAppliedStyleProperties(timestamp now); |