diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-12-14 23:11:37 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-12-15 12:52:13 -0800 |
| commit | e1854f0f2628e4808b48e01231c1a3a3a6cf9b68 (patch) | |
| tree | dde998bc54115ec14fa2c905f4a3be0d1df1b854 /src/mbgl/map/transform_state.hpp | |
| parent | b75c6edbf75f6bb11f23e0d1330efee3ed3ff880 (diff) | |
| download | qtlocation-mapboxgl-e1854f0f2628e4808b48e01231c1a3a3a6cf9b68.tar.gz | |
[core] Corrected flying trajectory; pitched flight
Corrected some fairly opaque code that was incorrectly ported from GL JS the first time around in #3171, causing the trajectory to extend far into the Earth’s orbit. Also transition pitch while flying, call transition frame/finish callback functions, and recognize the same “speed” and “curve” parameters that GL JS does.
Fixes #3296, fixes #3297.
Diffstat (limited to 'src/mbgl/map/transform_state.hpp')
| -rw-r--r-- | src/mbgl/map/transform_state.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index fd9a556eb9..fa6ed8b58b 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -95,6 +95,7 @@ private: double lngX(double lon) const; double latY(double lat) const; double zoomScale(double zoom) const; + double scaleZoom(double scale) const; float worldSize() const; mat4 coordinatePointMatrix(double z) const; |