diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-10-03 17:00:28 -0700 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-21 16:43:20 +0200 |
commit | 594d2074a3849d141219c04cdde739f86e7256b3 (patch) | |
tree | 0c7c0c5bd549b47e3b0c248d8412fa9c79c9504c /src/mbgl/text/placement.hpp | |
parent | 5fb0b0c1bc2dbde473742ab281706abff2b24217 (diff) | |
download | qtlocation-mapboxgl-594d2074a3849d141219c04cdde739f86e7256b3.tar.gz |
[core] Let placement transitions use the transition duration, if set, and allow disabling them entirely
Diffstat (limited to 'src/mbgl/text/placement.hpp')
-rw-r--r-- | src/mbgl/text/placement.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp index f34a8a25c2..cc23110e54 100644 --- a/src/mbgl/text/placement.hpp +++ b/src/mbgl/text/placement.hpp @@ -5,6 +5,7 @@ #include <mbgl/util/chrono.hpp> #include <mbgl/text/collision_index.hpp> #include <mbgl/layout/symbol_projection.hpp> +#include <mbgl/style/transition_options.hpp> #include <unordered_set> namespace mbgl { @@ -79,7 +80,7 @@ private: class Placement { public: - Placement(const TransformState&, MapMode mapMode, const bool crossSourceCollisions); + Placement(const TransformState&, MapMode, style::TransitionOptions, const bool crossSourceCollisions); void placeLayer(const RenderLayerSymbolInterface&, const mat4&, bool showCollisionBoxes); void commit(const Placement& prevPlacement, TimePoint); void updateLayerOpacities(const RenderLayerSymbolInterface&); @@ -113,6 +114,8 @@ private: TransformState state; MapMode mapMode; + style::TransitionOptions transitionOptions; + TimePoint fadeStartTime; TimePoint commitTime; |