diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-21 15:00:44 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-29 09:58:56 -0400 |
commit | da8aa391d0a1079bbc697207803a48fce8ab916f (patch) | |
tree | 4fbf6a2dcc594860aa43517e6d78c542c7eff115 /include/mbgl/map | |
parent | 4f7bc80664c29d7f15598392946ff0ac73dd520c (diff) | |
download | qtlocation-mapboxgl-da8aa391d0a1079bbc697207803a48fce8ab916f.tar.gz |
Render map with a copy of TransformState
Diffstat (limited to 'include/mbgl/map')
-rw-r--r-- | include/mbgl/map/map.hpp | 8 | ||||
-rw-r--r-- | include/mbgl/map/transform_state.hpp | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index bc67e5b35b..8378b27376 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -55,8 +55,6 @@ public: // Triggers a lazy rerender: only performs a render when the map is not clean. void rerender(); - void renderLayer(util::ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr); - // Forces a map update: always triggers a rerender. void update(); @@ -156,18 +154,14 @@ private: void updateSources(); void updateSources(const util::ptr<StyleLayerGroup> &group); - void updateRenderState(); - size_t countLayers(const std::vector<LayerDescription>& layers); // Prepares a map render by updating the tiles we need for the current view, as well as updating // the stylesheet. void prepare(); - // Unconditionally performs a render with the current map state. void render(); - void renderLayers(util::ptr<StyleLayerGroup> group); private: bool async = false; @@ -224,8 +218,6 @@ private: bool debug = false; timestamp animationTime = 0; - int indent = 0; - std::set<util::ptr<StyleSource>> activeSources; }; diff --git a/include/mbgl/map/transform_state.hpp b/include/mbgl/map/transform_state.hpp index ed49dc3e99..bb330c1019 100644 --- a/include/mbgl/map/transform_state.hpp +++ b/include/mbgl/map/transform_state.hpp @@ -33,6 +33,7 @@ public: float lngX(float lon) const; float latY(float lat) const; std::array<float, 2> locationCoordinate(float lon, float lat) const; + void getLonLat(double &lon, double &lat) const; // Zoom float getNormalizedZoom() const; @@ -69,7 +70,7 @@ private: // map position double x = 0, y = 0; double angle = 0; - double scale = std::numeric_limits<double>::infinity(); + double scale = 1; }; } |