diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-15 16:42:05 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-15 18:53:05 +0300 |
| commit | 814e516a4f7a34b43a991e5205128532c144f879 (patch) | |
| tree | 51cb4b00f76ee3d7e9ad15a6365dbdf4a714e66b /src/mbgl/map/transform_state.hpp | |
| parent | 121b4ca9ca0fdf4d46c296ffc0372beca80b1cb6 (diff) | |
| download | qtlocation-mapboxgl-814e516a4f7a34b43a991e5205128532c144f879.tar.gz | |
[core] Separate pattern size from draw-time variables
Part of https://github.com/mapbox/mapbox-gl-shaders/issues/1.
Diffstat (limited to 'src/mbgl/map/transform_state.hpp')
| -rw-r--r-- | src/mbgl/map/transform_state.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index 0489b69dd4..83e4f64b07 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -72,6 +72,9 @@ public: Point<double> project(const LatLng&) const; LatLng unproject(const Point<double>&, double worldSize, LatLng::WrapMode = LatLng::Unwrapped) const; + double zoomScale(double zoom) const; + double scaleZoom(double scale) const; + private: bool rotatedNorth() const; void constrain(double& scale, double& x, double& y) const; @@ -85,8 +88,6 @@ private: // logical dimensions uint16_t width = 0, height = 0; - double zoomScale(double zoom) const; - double scaleZoom(double scale) const; double worldSize() const; mat4 coordinatePointMatrix(double z) const; |