summaryrefslogtreecommitdiff
path: root/src/mbgl/map/transform_state.cpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-10 12:05:10 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-11 16:59:49 +0200
commitc78e7696352e73f94500fd94a5eaaafffb971be6 (patch)
treea41e8934d663d91b319bcc047a59282f23c63bc5 /src/mbgl/map/transform_state.cpp
parente2052ea3e46272f5b0eb26643c0d7e70bad46557 (diff)
downloadqtlocation-mapboxgl-c78e7696352e73f94500fd94a5eaaafffb971be6.tar.gz
[core] Use PrecisionPoint in coordinate functions
Diffstat (limited to 'src/mbgl/map/transform_state.cpp')
-rw-r--r--src/mbgl/map/transform_state.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
index dd67a17c67..cb094577a3 100644
--- a/src/mbgl/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -69,7 +69,7 @@ uint16_t TransformState::getHeight() const {
#pragma mark - Position
-const LatLng TransformState::getLatLng() const {
+LatLng TransformState::getLatLng() const {
LatLng ll;
ll.longitude = -x / Bc;
@@ -216,11 +216,11 @@ float TransformState::worldSize() const {
return util::tileSize * scale;
}
-vec2<double> TransformState::latLngToPoint(const LatLng& latLng) const {
+PrecisionPoint TransformState::latLngToPoint(const LatLng& latLng) const {
return coordinateToPoint(latLngToCoordinate(latLng));
}
-LatLng TransformState::pointToLatLng(const vec2<double> point) const {
+LatLng TransformState::pointToLatLng(const PrecisionPoint& point) const {
return coordinateToLatLng(pointToCoordinate(point));
}
@@ -245,7 +245,7 @@ LatLng TransformState::coordinateToLatLng(const TileCoordinate& coord) const {
return latLng;
}
-vec2<double> TransformState::coordinateToPoint(const TileCoordinate& coord) const {
+PrecisionPoint TransformState::coordinateToPoint(const TileCoordinate& coord) const {
mat4 mat = coordinatePointMatrix(coord.zoom);
matrix::vec4 p;
matrix::vec4 c = {{ coord.column, coord.row, 0, 1 }};
@@ -253,7 +253,7 @@ vec2<double> TransformState::coordinateToPoint(const TileCoordinate& coord) cons
return { p[0] / p[3], height - p[1] / p[3] };
}
-TileCoordinate TransformState::pointToCoordinate(const vec2<double> point) const {
+TileCoordinate TransformState::pointToCoordinate(const PrecisionPoint& point) const {
float targetZ = 0;
const double tileZoom = getZoom();