Merge with upstream/main

Author: LucasDworschak

.github/workflows/windows.yml

@@ -65,10 +65,18 @@ jobs:
     - name: Build
       run: cmake --build ./build --config Debug
 
+    - name: List .exe files in ./build
+      shell: pwsh
+      run: |
+        Write-Host "Searching for .exe files in ./build..."
+        Get-ChildItem -Path "./build" -Filter "*.exe" -Recurse | ForEach-Object {
+          Write-Host "Found: $($_.FullName)"
+        }
+
     - name: Unittests on Windows
       env:
         MESA_GL_VERSION_OVERRIDE: 3.3
       run: |
-        ./build/alp_external/radix/unittests/unittests_radix.exe
-        ./build/unittests/unittests_nucleus.exe
+        ./build/unittests_radix.exe
+        ./build/unittests_nucleus.exe
         

CMakeLists.txt

@@ -83,9 +83,7 @@ endif()
 
 ########################################### dependencies #################################################
 find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Network Quick QuickControls2 LinguistTools)
-qt_policy(
-    SET QTP0002 NEW
-)
+qt_standard_project_setup(REQUIRES 6.8)
 
 include(cmake/alp_add_git_repository.cmake)
 alp_add_git_repository(renderer_static_data URL https://github.com/AlpineMapsOrg/renderer_static_data.git COMMITISH v23.11 DO_NOT_ADD_SUBPROJECT)

README.md

@@ -1,8 +1,10 @@
-# alpine-renderer
+# AlpineMaps.org Renderer
 This is the software behind [alpinemaps.org](https://alpinemaps.org).
 
 A developer version (trunk) is released [here](https://alpinemapsorg.github.io/renderer/), including APKs for android. Be aware that it can break at any time!
 
+[If looking at the issues, best to filter out projects!](https://github.com/AlpineMapsOrg/renderer/issues?q=is%3Aissue%20state%3Aopen%20no%3Aproject)
+
 We are in discord, talk to us!
 https://discord.gg/p8T9XzVwRa
 
@@ -13,7 +15,7 @@ After that it should be a normal cmake project. That is, you run cmake to genera
 We use Qt Creator (with mingw on Windows), which is the only tested setup atm and makes setup of Android and WebAssembly builds reasonably easy. If you have questions, please go to Discord.
 
 ## Dependencies
-* Qt 6.6.0, or greater
+* Qt 6.8.0, or greater
 * g++ 12+, clang or msvc
 * OpenGL
 * Qt Positioning and Charts modules
@@ -33,11 +35,9 @@ We use Qt Creator (with mingw on Windows), which is the only tested setup atm an
 * Finally, you are welcome to ask in discord if something is not working! 
 
 ## Building the WebAssembly version:
-* Atm, none of the Qt versions works perfectly in all browsers
-* In Qt 6.6 touch doesn't work on Firefox (issues #33)
-* [The Qt documentation is quite good on how to get it to run](https://doc-snapshots.qt.io/qt6-dev/wasm.html#installing-emscripten). Be aware that only specific versions of emscripten work for specific versions of Qt, and the error messages are not helpfull.
-* The threaded version doesn't seem to work atm, so use the non-threaded (bug reported)!
-* There are a number of other bugs, we track them with the upstream tag.
+* [The Qt documentation is quite good on how to get it to run](https://doc-snapshots.qt.io/qt6-dev/wasm.html#installing-emscripten).
+* Be aware that only specific versions of emscripten work for specific versions of Qt, and the error messages are not helpfull.
+* [More info on building and getting Hotreload to work](https://github.com/AlpineMapsOrg/documentation/blob/main/WebAssembly_local_build.md)
 
 # Code style
 * class names are CamelCase, method, function and variable names are snake_case.

app/CMakeLists.txt

@@ -19,6 +19,8 @@
 
 project(alpine-renderer-app LANGUAGES CXX)
 
+option(ALP_ENABLE_QML_HOT_RELOAD "Enables hot-reloading of qml files (which slows down compilation)" OFF)
+
 qt_add_executable(alpineapp
     main.cpp
     RenderThreadNotifier.h RenderThreadNotifier.cpp
@@ -100,6 +102,7 @@ qt_add_qml_module(alpineapp
         picker/Default.qml
         picker/PoiAlpineHut.qml
         picker/PoiSettlement.qml
+        SOURCES TileStatistics.h TileStatistics.cpp
 )
 
 qt_add_resources(alpineapp "fonts"
@@ -119,18 +122,24 @@ set_target_properties(alpineapp PROPERTIES
     QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android
 )
 target_link_libraries(alpineapp PUBLIC gl_engine Qt::Quick Qt::QuickControls2)
-if (ALP_ENABLE_DEV_TOOLS)
-    message(WARNING "building alpine app with dev tools. this will increase the build size")
+
+if (ALP_ENABLE_QML_HOT_RELOAD)
+    message(WARNING "building alpine app with qml-hot-reload. It'll slow incremental building due to a fix for hotreload.")
 
     # change prefer to project dir, as per https://bugreports.qt.io/browse/QTBUG-120435
     # otherwise we can't hotreload files in app when there is "import app" in the qml file.
     # but we need import app, if we want to use the new approach of registering qml types (directly in the class, not in main).
-
     add_custom_command(
         TARGET alpineapp POST_BUILD
-        COMMAND sed -i "s@^prefer .*@prefer ${CMAKE_CURRENT_SOURCE_DIR}/@" ${CMAKE_CURRENT_BINARY_DIR}/app/qmldir
+        COMMAND ${CMAKE_COMMAND}
+          -DBUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/app"
+          -DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+          -P "${CMAKE_SOURCE_DIR}/cmake/alp_fix_qmldir_for_hotreload.cmake"
     )
+endif()
 
+if (ALP_ENABLE_DEV_TOOLS)
+    message(WARNING "building alpine app with dev tools. this will increase the build size.")
     qt_target_qml_sources(alpineapp
         QML_FILES
             StatsWindow.qml

app/RenderingContext.cpp

@@ -35,6 +35,7 @@
 #include <nucleus/map_label/setup.h>
 #include <nucleus/picker/PickerManager.h>
 #include <nucleus/tile/GeometryScheduler.h>
+#include <nucleus/tile/SchedulerDirector.h>
 #include <nucleus/tile/TextureScheduler.h>
 #include <nucleus/tile/TileLoadService.h>
 #include <nucleus/tile/setup.h>
@@ -63,6 +64,7 @@ struct RenderingContext::Data {
     std::shared_ptr<nucleus::map_label::Filter> label_filter;
     std::shared_ptr<nucleus::picker::PickerManager> picker_manager;
     std::shared_ptr<nucleus::tile::utils::AabbDecorator> aabb_decorator;
+    std::unique_ptr<nucleus::tile::SchedulerDirector> scheduler_director;
 };
 
 RenderingContext::RenderingContext(QObject* parent)
@@ -77,6 +79,8 @@ RenderingContext::RenderingContext(QObject* parent)
     m->scheduler_thread->setObjectName("scheduler_thread");
 #endif
 
+    m->scheduler_director = std::make_unique<nucleus::tile::SchedulerDirector>();
+
     //    m->ortho_service.reset(new TileLoadService("https://tiles.bergfex.at/styles/bergfex-osm/", TileLoadService::UrlPattern::ZXY_yPointingSouth,
     //    ".jpeg")); m->ortho_service.reset(new TileLoadService("https://alpinemaps.cg.tuwien.ac.at/tiles/ortho/",
     //    TileLoadService::UrlPattern::ZYX_yPointingSouth, ".jpeg"));
@@ -85,32 +89,27 @@ RenderingContext::RenderingContext(QObject* parent)
     //                                           ".jpeg",
     //                                           {"", "1", "2", "3", "4"}));
     m->aabb_decorator = nucleus::tile::setup::aabb_decorator();
-    m->geometry = nucleus::tile::setup::geometry_scheduler("geometry",
-        std::make_unique<TileLoadService>("https://alpinemaps.cg.tuwien.ac.at/tiles/at_dtm_alpinemaps/", TilePattern::ZXY, ".png"),
-        m->aabb_decorator,
-        m->scheduler_thread.get()); // TODO currently hardcoded change to dtm model, but probably need to change this dynamically
-    // "geometry", std::make_unique<TileLoadService>("https://alpinemaps.cg.tuwien.ac.at/tiles/alpine_png/", TilePattern::ZXY, ".png"), m->aabb_decorator, m->scheduler_thread.get());
-    m->data_querier = std::make_shared<DataQuerier>(&m->geometry.scheduler->ram_cache());
-
-    m->ortho_texture = nucleus::tile::setup::texture_scheduler(
-        "ortho", std::make_unique<TileLoadService>("https://gataki.cg.tuwien.ac.at/raw/basemap/tiles/", TilePattern::ZYX_yPointingSouth, ".jpeg"), m->aabb_decorator, m->scheduler_thread.get());
-
-    m->map_label = nucleus::map_label::setup::scheduler("map_label",
-        std::make_unique<TileLoadService>("https://osm.cg.tuwien.ac.at/vector_tiles/poi_v1/", TilePattern::ZXY_yPointingSouth, ""),
-        m->aabb_decorator,
-        m->data_querier,
-        m->scheduler_thread.get());
-    m->map_label.scheduler->set_geometry_ram_cache(&m->geometry.scheduler->ram_cache());
-    m->geometry.scheduler->set_dataquerier(m->data_querier);
 
-    m->vector_layer = nucleus::vector_layer::setup::scheduler("vector_layer",
-        std::make_unique<TileLoadService>("https://osm.cg.tuwien.ac.at/vector_tiles/vector_layer_v1/", TilePattern::ZXY_yPointingSouth, ""),
-        // std::make_unique<TileLoadService>("http://localhost:3000/getmvt/", TilePattern::ZXY_yPointingSouth, ""),
-        // std::make_unique<TileLoadService>("http://localhost:8080/data/openmaptiles/", TilePattern::ZXY_yPointingSouth, ".pbf"),
-        // std::make_unique<TileLoadService>("https://mapsneu.wien.gv.at/basemapv/bmapv/3857/tile/", TilePattern::ZYX_yPointingSouth, ".pbf"),
-        m->aabb_decorator,
-        m->scheduler_thread.get());
+    {
+        auto geometry_service = std::make_unique<TileLoadService>("https://alpinemaps.cg.tuwien.ac.at/tiles/at_dtm_alpinemaps/", TilePattern::ZXY, ".png");
+        // auto geometry_service = std::make_unique<TileLoadService>("https://alpinemaps.cg.tuwien.ac.at/tiles/alpine_png/", TilePattern::ZXY, ".png");
+        m->geometry = nucleus::tile::setup::geometry_scheduler(std::move(geometry_service), m->aabb_decorator, m->scheduler_thread.get());
+        m->scheduler_director->check_in("geometry", m->geometry.scheduler);
+        m->data_querier = std::make_shared<DataQuerier>(&m->geometry.scheduler->ram_cache());
+        auto ortho_service = std::make_unique<TileLoadService>("https://gataki.cg.tuwien.ac.at/raw/basemap/tiles/", TilePattern::ZYX_yPointingSouth, ".jpeg");
+        m->ortho_texture = nucleus::tile::setup::texture_scheduler(std::move(ortho_service), m->aabb_decorator, m->scheduler_thread.get());
+        m->scheduler_director->check_in("ortho", m->ortho_texture.scheduler);
+        auto map_label_service = std::make_unique<TileLoadService>("https://osm.cg.tuwien.ac.at/vector_tiles/poi_v1/", TilePattern::ZXY_yPointingSouth, "");
+        m->map_label = nucleus::map_label::setup::scheduler(std::move(map_label_service), m->aabb_decorator, m->data_querier, m->scheduler_thread.get());
+        m->scheduler_director->check_in("map_label", m->map_label.scheduler);
+
+        auto vector_layer_service = std::make_unique<TileLoadService>("https://osm.cg.tuwien.ac.at/vector_tiles/vector_layer_v1/", TilePattern::ZXY_yPointingSouth, "");
+        m->vector_layer = nucleus::vector_layer::setup::scheduler(std::move(vector_layer_service), m->aabb_decorator, m->scheduler_thread.get());
+        m->scheduler_director->check_in("map_label", m->map_label.scheduler);
+    }
+    m->map_label.scheduler->set_geometry_ram_cache(&m->geometry.scheduler->ram_cache());
     m->vector_layer.scheduler->set_geometry_ram_cache(&m->geometry.scheduler->ram_cache());
+    m->geometry.scheduler->set_dataquerier(m->data_querier);
 
     m->picker_manager = std::make_shared<PickerManager>();
     m->label_filter = std::make_shared<Filter>();
@@ -281,3 +280,9 @@ nucleus::tile::TextureScheduler* RenderingContext::ortho_scheduler() const
     QMutexLocker locker(&m->shared_ptr_mutex);
     return m->ortho_texture.scheduler.get();
 }
+
+SchedulerDirector* RenderingContext::scheduler_director() const
+{
+    QMutexLocker locker(&m->shared_ptr_mutex);
+    return m->scheduler_director.get();
+}

app/RenderingContext.h

@@ -43,6 +43,7 @@ class Scheduler;
 namespace nucleus::tile {
 class GeometryScheduler;
 class TextureScheduler;
+class SchedulerDirector;
 }
 namespace nucleus::tile::utils {
 class AabbDecorator;
@@ -80,6 +81,7 @@ class RenderingContext : public QObject {
     [[nodiscard]] nucleus::map_label::Scheduler* map_label_scheduler() const;
     [[nodiscard]] nucleus::vector_layer::Scheduler* vector_layer_scheduler() const;
     [[nodiscard]] nucleus::tile::TextureScheduler* ortho_scheduler() const;
+    [[nodiscard]] nucleus::tile::SchedulerDirector* scheduler_director() const;
 
 signals:
     void initialised();