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 /include/mbgl/map | |
| 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 'include/mbgl/map')
| -rw-r--r-- | include/mbgl/map/camera.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index 18e7dbf96c..dd9e0a0f56 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -17,6 +17,8 @@ struct CameraOptions { mapbox::util::optional<double> angle; mapbox::util::optional<double> pitch; mapbox::util::optional<Duration> duration; + mapbox::util::optional<double> speed; + mapbox::util::optional<double> curve; mapbox::util::optional<mbgl::util::UnitBezier> easing; std::function<void(double)> transitionFrameFn; std::function<void()> transitionFinishFn; |