diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-25 13:58:34 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-26 10:32:07 -0700 |
| commit | 07a6d2ef647e44151c269de2abdc98c89b0ae910 (patch) | |
| tree | 82f423c9bafa82299d097447ff9a4785437d409b /include/mbgl | |
| parent | e87a36444f5210b50331fa8f456be110534dec81 (diff) | |
| download | qtlocation-mapboxgl-07a6d2ef647e44151c269de2abdc98c89b0ae910.tar.gz | |
Move Transform from MapData to Map
Pass current state to MapContext where needed. Remove mutex from
Transform.
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/map/map.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 54c4d44f2e..abd93fad6a 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -23,6 +23,7 @@ class View; class MapData; class MapContext; class StillImage; +class Transform; namespace util { template <class T> class Thread; @@ -153,6 +154,7 @@ public: bool isFullyLoaded() const; private: + const std::unique_ptr<Transform> transform; const std::unique_ptr<MapData> data; const std::unique_ptr<util::Thread<MapContext>> context; bool paused = false; |