diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-18 13:52:53 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-15 09:56:18 -0700 |
commit | ce4270b01c692bcb1af64a774e2d595438057375 (patch) | |
tree | 88fd6d1bee21058f366bc96e14d48364c163ef37 /include/mbgl/map | |
parent | 6e78eabfff75579286ab23cbde8a36fba061ca1d (diff) | |
download | qtlocation-mapboxgl-ce4270b01c692bcb1af64a774e2d595438057375.tar.gz |
[core] Convert MapContext to Map::Impl; eliminate indirection
Diffstat (limited to 'include/mbgl/map')
-rw-r--r-- | include/mbgl/map/map.hpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index b70c388183..e33b8e49f3 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -8,7 +8,6 @@ #include <mbgl/map/mode.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/util/noncopyable.hpp> -#include <mbgl/util/vec.hpp> #include <mbgl/annotation/annotation.hpp> #include <mbgl/style/types.hpp> #include <mbgl/style/property_transition.hpp> @@ -23,18 +22,13 @@ namespace mbgl { class FileSource; class View; -class MapData; -class MapContext; class SpriteImage; -class Transform; class PointAnnotation; class ShapeAnnotation; struct CameraOptions; struct AnimationOptions; class Map : private util::noncopyable { - friend class View; - public: explicit Map(View&, FileSource&, MapMode mapMode = MapMode::Continuous, @@ -176,19 +170,8 @@ public: void dumpDebugLogs() const; private: - View& view; - const std::unique_ptr<Transform> transform; - const std::unique_ptr<MapContext> context; - MapData* data; - - enum class RenderState { - never, - partial, - fully - }; - - RenderState renderState = RenderState::never; - bool loading = false; + class Impl; + const std::unique_ptr<Impl> impl; }; } // namespace mbgl |