cmake + tile loading

src/map/map.cpp

@@ -1,31 +1,20 @@
 #include <llmr/map/map.hpp>
 #include <llmr/map/tile.hpp>
+#include <llmr/util/vec2.hpp>
 
 #include <iostream>
 #include <thread>
 
+#include <cmath>
+
 using namespace llmr;
 
-map::map(class platform *platform)
-    : platform(platform),
-      transform(new class transform()),
-      painter(new class painter(platform, transform)) {
-
-    transform->setLonLat(13, 50);
-    transform->setZoom(3);
-
-    tiles.push_back(new class tile(1, 0, 0));
-    platform->request(tiles.back());
-
-    tiles.push_back(new class tile(1, 1, 0));
-    platform->request(tiles.back());
-
-    tiles.push_back(new class tile(1, 0, 1));
-    platform->request(tiles.back());
-
-    tiles.push_back(new class tile(1, 1, 1));
-    platform->request(tiles.back());
+map::map()
+    : transform(new class transform()),
+      painter(new class painter(transform)) {
 
+    // transform->setLonLat(13, 50);
+    // transform->setZoom(3);
 }
 
 map::~map() {
@@ -39,24 +28,83 @@ void map::setup() {
 void map::resize(uint32_t width, uint32_t height) {
     transform->width = width;
     transform->height = height;
-    platform->restart();
+    updateTiles();
+    platform::restart(this);
 }
 
 void map::moveBy(double dx, double dy) {
     transform->moveBy(dx, dy);
-    platform->restart();
+    updateTiles();
+    platform::restart(this);
 }
 
 void map::scaleBy(double ds, double cx, double cy) {
     transform->scaleBy(ds, cx, cy);
-    platform->restart();
+    updateTiles();
+    platform::restart(this);
 }
 
 void map::rotateBy(double cx, double cy, double sx, double sy, double ex, double ey) {
     transform->rotateBy(cx, cy, sx, sy, ex, ey);
-    platform->restart();
+    updateTiles();
+    platform::restart(this);
 }
 
+void map::updateTiles() {
+    // Figure out what tiles we need to load
+    int32_t zoom = transform->getZoom();
+    int32_t max_dim = pow(2, zoom);
+
+    // Map four viewport corners to pixel coordinates
+    box box;
+    transform->mapCornersToBox(zoom, box);
+
+    vec2<int32_t> tl, br;
+    tl.x = fmax(0, floor(fmin(box.tl.x, box.bl.x)));
+    tl.y = fmax(0, floor(fmin(box.tl.y, box.tr.y)));
+    br.x = fmin(max_dim, ceil(fmax(box.tr.x, box.br.x)));
+    br.y = fmin(max_dim, ceil(fmax(box.bl.y, box.br.y)));
+
+    // TODO: Discard tiles that are outside the viewport
+    std::vector<uint64_t> required;
+    for (int32_t y = tl.y; y < br.y; y++) {
+        for (int32_t x = tl.x; x < br.x; x++) {
+            required.push_back(tile::toID(zoom, x, y));
+        }
+    }
+
+    // Add existing child/parent tiles if the actual tile is not yet loaded
+    // TODO
+
+
+    // Remove tiles that we definitely don't need, i.e. tiles that are not on
+    // the required list.
+    for (std::vector<tile *>::iterator it = tiles.begin(); it != tiles.end(); it++) {
+        tile *tile = *it;
+        uint64_t id = tile::toID(tile->z, tile->x, tile->y);
+        std::vector<uint64_t>::const_iterator required_it = std::find(required.begin(), required.end(), id);
+        bool retain = required_it != required.end();
+        if (retain) {
+            // We already have the tile; remove it from the list of required tiles.
+            required.erase(required_it);
+        } else {
+            // We don't need this tile, so we can remove it entirely.
+            std::vector<class tile *>::iterator to_remove = it - 1;
+            tile->cancel();
+            tiles.erase(it);
+            it = to_remove;
+        }
+    }
+
+    // Required now only contains those tiles that are not yet in the list of
+    // tiles, so we should add them all.
+    for (int64_t id : required) {
+        vec4<int32_t> tile_coord = tile::fromID(id);
+        tile *tile = new class tile(tile_coord.z, tile_coord.x, tile_coord.y);
+        tiles.push_back(tile);
+        platform::request(this, tile);
+    }
+}
 
 bool map::render() {
     painter->clear();
@@ -72,11 +120,7 @@ bool map::render() {
 }
 
 void map::tileLoaded(tile *tile) {
-    platform->restart();
-    // fprintf(stderr, "[%8zx] tile loaded %d/%d/%d\n",
-    //         std::hash<std::thread::id>()(std::this_thread::get_id()),
-    //         tile->z, tile->x, tile->y);
-    // schedule rerender
+    platform::restart(this);
 }
 
 void map::tileFailed(tile *tile) {