diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-08-03 01:36:19 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-08-05 15:19:00 +0300 |
commit | fa4636ffe4d2c00446292c229cd549cbaee9e20c (patch) | |
tree | 505e5fdad2051ebc47586e678935b1aa040853db /src/mbgl/map/map_context.hpp | |
parent | 9fd7e883a7515f97ec4edd097a0db5cbebce3ca1 (diff) | |
download | qtlocation-mapboxgl-fa4636ffe4d2c00446292c229cd549cbaee9e20c.tar.gz |
Map::nudgeTransitions no longer depends on client information
Clients no longer need to provide data (eg. if gesturing or in a custom
animation) to Map::nudgeTransitions().
Upon MapContext::renderSync(), a new atomic bool 'needsRepaint' in MapData
allows thread-safe communication between Map and MapContext.
Diffstat (limited to 'src/mbgl/map/map_context.hpp')
-rw-r--r-- | src/mbgl/map/map_context.hpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp index dd211d4a17..215f5d377a 100644 --- a/src/mbgl/map/map_context.hpp +++ b/src/mbgl/map/map_context.hpp @@ -38,16 +38,13 @@ public: MapContext(View&, FileSource&, MapData&); ~MapContext(); - struct RenderResult { - bool fullyLoaded; - bool needsRerender; - }; - void pause(); void triggerUpdate(const TransformState&, Update = Update::Nothing); void renderStill(const TransformState&, const FrameData&, Map::StillImageCallback callback); - RenderResult renderSync(const TransformState&, const FrameData&); + + // Triggers a synchronous render. Returns true if style has been fully loaded. + bool renderSync(const TransformState&, const FrameData&); void setStyleURL(const std::string&); void setStyleJSON(const std::string& json, const std::string& base); |