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 /src/mbgl/util/tile_cover.cpp | |
| parent | 1ce99d2d7b1921dfac1d302553160184ceac7d3e (diff) | |
| download | qtlocation-mapboxgl-4994b3dc574443ad6e24ea1d715e0ebcdbb0f124.tar.gz | |
[core] PrecisionPoint is now ScreenCoordinate
Diffstat (limited to 'src/mbgl/util/tile_cover.cpp')
| -rw-r--r-- | src/mbgl/util/tile_cover.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp index e77ea469a7..7af3ebd8b1 100644 --- a/src/mbgl/util/tile_cover.cpp +++ b/src/mbgl/util/tile_cover.cpp @@ -14,8 +14,8 @@ struct edge { double x1 = 0, y1 = 0; double dx = 0, dy = 0; - edge(vec2<double> a, vec2<double> b) { - if (a.y > b.y) { std::swap(a, b); } + edge(ScreenCoordinate a, ScreenCoordinate b) { + if (a.y > b.y) std::swap(a, b); x0 = a.x; y0 = a.y; x1 = b.x; @@ -52,7 +52,7 @@ static void scanSpans(edge e0, edge e1, int32_t ymin, int32_t ymax, ScanLine sca } // scan-line conversion -static void scanTriangle(const mbgl::vec2<double> a, const mbgl::vec2<double> b, const mbgl::vec2<double> c, int32_t ymin, int32_t ymax, ScanLine& scanLine) { +static void scanTriangle(const ScreenCoordinate& a, const ScreenCoordinate& b, const ScreenCoordinate& c, int32_t ymin, int32_t ymax, ScanLine& scanLine) { edge ab = edge(a, b); edge bc = edge(b, c); edge ca = edge(c, a); @@ -76,7 +76,7 @@ int32_t coveringZoomLevel(double zoom, SourceType type, uint16_t tileSize) { } } -static mbgl::vec2<double> zoomTo(const TileCoordinate& c, double z) { +static ScreenCoordinate zoomTo(const TileCoordinate& c, double z) { double scale = std::pow(2, z - c.zoom); return { c.column * scale, c.row * scale }; } @@ -100,11 +100,11 @@ std::vector<TileID> tileCover(const TileCoordinate& tl_, } }; - mbgl::vec2<double> tl = zoomTo(tl_, z); - mbgl::vec2<double> tr = zoomTo(tr_, z); - mbgl::vec2<double> br = zoomTo(br_, z); - mbgl::vec2<double> bl = zoomTo(bl_, z); - mbgl::vec2<double> c = zoomTo(center, z); + const ScreenCoordinate tl(zoomTo(tl_, z)); + const ScreenCoordinate tr(zoomTo(tr_, z)); + const ScreenCoordinate br(zoomTo(br_, z)); + const ScreenCoordinate bl(zoomTo(bl_, z)); + const ScreenCoordinate c(zoomTo(center, z)); // Divide the screen up in two triangles and scan each of them: // \---+ |