diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-14 15:14:39 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-14 16:58:32 +0300 |
commit | 0ea8a37cb081302707c7815f3df5745bd3d6eef3 (patch) | |
tree | 1a6d5511d12ee57e461b48b6552bef47e9a053aa /src/mbgl/style/style.hpp | |
parent | 2aad2f4e14ab762847141788e725d50e1ee44ace (diff) | |
download | qtlocation-mapboxgl-0ea8a37cb081302707c7815f3df5745bd3d6eef3.tar.gz |
Unify default transition values in MapData
Relevant changes:
- Added 'defaultFadeDuration' and 'defaultTransitionDelay' to MapData;
- Painter & StyleParser now receives a reference to MapData;
- As previously seen on the code: 300ms is the default fade duration
and 0ms is the default transition duration;
- We no longer pass the current time point to Style, since it now uses
MapData.animationTime, which gets updated in MapContext::update().
- Updated StyleParser check to use a mock MapData;
Diffstat (limited to 'src/mbgl/style/style.hpp')
-rw-r--r-- | src/mbgl/style/style.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 16e0afcd4c..6d8a7ae522 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -54,10 +54,9 @@ public: // a tile is ready so observers can render the tile. void update(const TransformState&, TexturePool&); - void cascade(const std::vector<std::string>&, const TimePoint& now); - void recalculate(float z, const TimePoint& now); + void cascade(); + void recalculate(float z); - void setDefaultTransitionDuration(Duration); bool hasTransitions() const; std::exception_ptr getLastError() const { @@ -101,7 +100,6 @@ private: std::exception_ptr lastError; - PropertyTransition defaultTransition; std::unique_ptr<uv::rwlock> mtx; ZoomHistory zoomHistory; |