diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-02-28 13:22:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 13:22:47 -0500 |
commit | 34fef22d95124e3e59b6c7962bdc4a01c84dde2e (patch) | |
tree | 255fc0fcb352684251c88cfb0ec24a3822008e99 /include | |
parent | 05ec852885608070d7a5df50c7a098441e643bce (diff) | |
download | qtlocation-mapboxgl-34fef22d95124e3e59b6c7962bdc4a01c84dde2e.tar.gz |
[core] [android] - allow zooming/scaling to use AnimationOptions (#8181)
[glfw] - allow glfw binding to use AnimationOptions instead of using direction directly
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/map.hpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 3939ab1881..95a82ebd74 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -88,22 +88,22 @@ public: // Position void moveBy(const ScreenCoordinate&, const AnimationOptions& = {}); - void setLatLng(const LatLng&, optional<ScreenCoordinate>, const Duration& = Duration::zero()); - void setLatLng(const LatLng&, optional<EdgeInsets>, const Duration& = Duration::zero()); - void setLatLng(const LatLng&, const Duration& = Duration::zero()); + void setLatLng(const LatLng&, optional<ScreenCoordinate>, const AnimationOptions& = {}); + void setLatLng(const LatLng&, optional<EdgeInsets>, const AnimationOptions& = {}); + void setLatLng(const LatLng&, const AnimationOptions& = {}); LatLng getLatLng(optional<EdgeInsets> = {}) const; void resetPosition(optional<EdgeInsets> = {}); // Scale - void scaleBy(double ds, optional<ScreenCoordinate> = {}, const Duration& = Duration::zero()); - void setScale(double scale, optional<ScreenCoordinate> = {}, const Duration& = Duration::zero()); + void scaleBy(double ds, optional<ScreenCoordinate> = {}, const AnimationOptions& = {}); + void setScale(double scale, optional<ScreenCoordinate> = {}, const AnimationOptions& = {}); double getScale() const; - void setZoom(double zoom, const Duration& = Duration::zero()); - void setZoom(double zoom, optional<ScreenCoordinate>, const Duration& = Duration::zero()); - void setZoom(double zoom, optional<EdgeInsets>, const Duration& = Duration::zero()); + void setZoom(double zoom, const AnimationOptions& = {}); + void setZoom(double zoom, optional<ScreenCoordinate>, const AnimationOptions& = {}); + void setZoom(double zoom, optional<EdgeInsets>, const AnimationOptions& = {}); double getZoom() const; - void setLatLngZoom(const LatLng&, double zoom, const Duration& = Duration::zero()); - void setLatLngZoom(const LatLng&, double zoom, optional<EdgeInsets>, const Duration& = Duration::zero()); + void setLatLngZoom(const LatLng&, double zoom, const AnimationOptions& = {}); + void setLatLngZoom(const LatLng&, double zoom, optional<EdgeInsets>, const AnimationOptions& = {}); CameraOptions cameraForLatLngBounds(const LatLngBounds&, optional<EdgeInsets>) const; CameraOptions cameraForLatLngs(const std::vector<LatLng>&, optional<EdgeInsets>) const; void resetZoom(); @@ -113,17 +113,17 @@ public: double getMaxZoom() const; // Rotation - void rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second, const Duration& = Duration::zero()); - void setBearing(double degrees, const Duration& = Duration::zero()); - void setBearing(double degrees, optional<ScreenCoordinate>, const Duration& = Duration::zero()); - void setBearing(double degrees, optional<EdgeInsets>, const Duration& = Duration::zero()); + void rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second, const AnimationOptions& = {}); + void setBearing(double degrees, const AnimationOptions& = {}); + void setBearing(double degrees, optional<ScreenCoordinate>, const AnimationOptions& = {}); + void setBearing(double degrees, optional<EdgeInsets>, const AnimationOptions& = {}); double getBearing() const; - void resetNorth(const Duration& = Milliseconds(500)); - void resetNorth(optional<EdgeInsets>, const Duration& = Milliseconds(500)); + void resetNorth(const AnimationOptions& = {{mbgl::Milliseconds(500)}}); + void resetNorth(optional<EdgeInsets>, const AnimationOptions& = {{mbgl::Milliseconds(500)}}); // Pitch - void setPitch(double pitch, const Duration& = Duration::zero()); - void setPitch(double pitch, optional<ScreenCoordinate>, const Duration& = Duration::zero()); + void setPitch(double pitch, const AnimationOptions& = {}); + void setPitch(double pitch, optional<ScreenCoordinate>, const AnimationOptions& = {}); double getPitch() const; // North Orientation |