summaryrefslogtreecommitdiff
path: root/include/mbgl/style
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2014-08-05 18:04:31 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2014-08-20 13:58:37 -0700
commitb9c7e1bdd99b4c6d37672ef34ffe178d4bc54ad3 (patch)
treed53d5f9068a3501bad712e8c0c3e999a25068297 /include/mbgl/style
parent2660b7bd1b77d9571ceb12adfef4b83e56d8e0f0 (diff)
downloadqtlocation-mapboxgl-b9c7e1bdd99b4c6d37672ef34ffe178d4bc54ad3.tar.gz
Consolidate duplicate interpolation definitions
While here, do not interpolate style properties that are not transitionable. The previous behavior was to switch from old to new value halfway through the transition; now the new value is used immediately, as in JS.
Diffstat (limited to 'include/mbgl/style')
-rw-r--r--include/mbgl/style/style_layer.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mbgl/style/style_layer.hpp b/include/mbgl/style/style_layer.hpp
index f8cfff7f63..84981e3fb4 100644
--- a/include/mbgl/style/style_layer.hpp
+++ b/include/mbgl/style/style_layer.hpp
@@ -51,6 +51,7 @@ private:
// 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);
// Removes all expired style transitions.
void cleanupAppliedStyleProperties(timestamp now);