diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-18 11:29:58 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-19 08:11:41 +0300 |
commit | f01a829dc9e076abeb7df90259e8e5c7d9cfbad6 (patch) | |
tree | d852d68a4629044c138ad4445c4d7e3c37079af0 /src/mbgl/map/transform_state.hpp | |
parent | 3a12dd2d4fec398bc84f88cfddc2ac4a37c3a7f1 (diff) | |
download | qtlocation-mapboxgl-f01a829dc9e076abeb7df90259e8e5c7d9cfbad6.tar.gz |
[core] Move TransformState::worldSize() to Projection
Diffstat (limited to 'src/mbgl/map/transform_state.hpp')
-rw-r--r-- | src/mbgl/map/transform_state.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index 1e4b2054f7..10d2301ea4 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -4,6 +4,7 @@ #include <mbgl/util/geo.hpp> #include <mbgl/util/geometry.hpp> #include <mbgl/util/constants.hpp> +#include <mbgl/util/projection.hpp> #include <mbgl/util/mat4.hpp> #include <cstdint> @@ -88,8 +89,6 @@ private: // logical dimensions uint16_t width = 0, height = 0; - double worldSize() const; - mat4 coordinatePointMatrix(double z) const; mat4 getPixelMatrix() const; @@ -117,8 +116,8 @@ private: double pitch = 0.0; // cache values for spherical mercator math - double Bc = worldSize() / util::DEGREES_MAX; - double Cc = worldSize() / util::M2PI; + double Bc = Projection::worldSize(scale) / util::DEGREES_MAX; + double Cc = Projection::worldSize(scale) / util::M2PI; }; } // namespace mbgl |