diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-09 20:56:07 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-01 20:58:54 +0000 |
commit | 4994b3dc574443ad6e24ea1d715e0ebcdbb0f124 (patch) | |
tree | f8b61e5acc88502b740f401deb61679126b1cbd0 /include | |
parent | 1ce99d2d7b1921dfac1d302553160184ceac7d3e (diff) | |
download | qtlocation-mapboxgl-4994b3dc574443ad6e24ea1d715e0ebcdbb0f124.tar.gz |
[core] PrecisionPoint is now ScreenCoordinate
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/camera.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/map/map.hpp | 18 | ||||
-rw-r--r-- | include/mbgl/util/geo.hpp | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index a1b9bfe691..2e20a6386f 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -22,7 +22,7 @@ struct CameraOptions { /** Point of reference for `zoom` and `angle`, assuming an origin at the top-left corner of the view. */ - optional<PrecisionPoint> anchor; + optional<ScreenCoordinate> anchor; /** Zero-based zoom level. Constrained to the minimum and maximum zoom levels. */ diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 688565fecb..463bee7938 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -97,16 +97,16 @@ public: void flyTo(const CameraOptions&, const AnimationOptions&); // Position - void moveBy(const PrecisionPoint&, const Duration& = Duration::zero()); - void setLatLng(const LatLng&, const PrecisionPoint&, const Duration& = Duration::zero()); + void moveBy(const ScreenCoordinate&, const Duration& = Duration::zero()); + void setLatLng(const LatLng&, const ScreenCoordinate&, const Duration& = Duration::zero()); void setLatLng(const LatLng&, const EdgeInsets&, const Duration& = Duration::zero()); void setLatLng(const LatLng&, const Duration& = Duration::zero()); LatLng getLatLng(const EdgeInsets& = {}) const; void resetPosition(const EdgeInsets& = {}); // Scale - void scaleBy(double ds, const PrecisionPoint& = { NAN, NAN }, const Duration& = Duration::zero()); - void setScale(double scale, const PrecisionPoint& = { NAN, NAN }, const Duration& = Duration::zero()); + void scaleBy(double ds, const ScreenCoordinate& = { NAN, NAN }, const Duration& = Duration::zero()); + void setScale(double scale, const ScreenCoordinate& = { NAN, NAN }, const Duration& = Duration::zero()); double getScale() const; void setZoom(double zoom, const Duration& = Duration::zero()); void setZoom(double zoom, const EdgeInsets&, const Duration& = Duration::zero()); @@ -122,9 +122,9 @@ public: double getMaxZoom() const; // Rotation - void rotateBy(const PrecisionPoint& first, const PrecisionPoint& second, const Duration& = Duration::zero()); + void rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second, const Duration& = Duration::zero()); void setBearing(double degrees, const Duration& = Duration::zero()); - void setBearing(double degrees, const PrecisionPoint&, const Duration& = Duration::zero()); + void setBearing(double degrees, const ScreenCoordinate&, const Duration& = Duration::zero()); void setBearing(double degrees, const EdgeInsets&, const Duration& = Duration::zero()); double getBearing() const; void resetNorth(const Duration& = Milliseconds(500)); @@ -132,7 +132,7 @@ public: // Pitch void setPitch(double pitch, const Duration& = Duration::zero()); - void setPitch(double pitch, const PrecisionPoint&, const Duration& = Duration::zero()); + void setPitch(double pitch, const ScreenCoordinate&, const Duration& = Duration::zero()); double getPitch() const; // North Orientation @@ -151,8 +151,8 @@ public: double getMetersPerPixelAtLatitude(double lat, double zoom) const; ProjectedMeters projectedMetersForLatLng(const LatLng&) const; LatLng latLngForProjectedMeters(const ProjectedMeters&) const; - PrecisionPoint pixelForLatLng(const LatLng&) const; - LatLng latLngForPixel(const PrecisionPoint&) const; + ScreenCoordinate pixelForLatLng(const LatLng&) const; + LatLng latLngForPixel(const ScreenCoordinate&) const; // Annotations void addAnnotationIcon(const std::string&, std::shared_ptr<const SpriteImage>); diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index 86bc586cba..fa36896869 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -9,7 +9,7 @@ namespace mbgl { class TileID; -using PrecisionPoint = vec2<double>; +using ScreenCoordinate = vec2<double>; class LatLng { public: @@ -26,7 +26,7 @@ public: // Constructs a LatLng object with the top left position of the specified tile. LatLng(const TileID& id); - PrecisionPoint project() const; + ScreenCoordinate project() const; }; inline bool operator==(const LatLng& a, const LatLng& b) { @@ -195,7 +195,7 @@ public: }; } - PrecisionPoint getCenter(uint16_t width, uint16_t height) const; + ScreenCoordinate getCenter(uint16_t width, uint16_t height) const; }; } // namespace mbgl |