Merge weBIGeo

.github/workflows/linux.yml

@@ -86,8 +86,8 @@ jobs:
         CXX: ${{ matrix.CXX }}
         CMAKE_PREFIX_PATH: ${{env.QT_ROOT_DIR}}/lib/cmake
       run: >
-        cmake -G Ninja 
-        -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} 
+        cmake -G Ninja
+        -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}}
         -DALP_ENABLE_ASSERTS=ON
         -DALP_ENABLE_ADDRESS_SANITIZER=ON
         -DALP_ENABLE_APP_SHUTDOWN_AFTER_60S=ON
@@ -115,7 +115,7 @@ jobs:
         QT_QPA_PLATFORM: offscreen
         DISPLAY: :1
         LD_PRELOAD: ./libdlclose.so
-        LSAN_OPTIONS: suppressions=./sanitizer_supressions/linux_leak.supp
+        LSAN_OPTIONS: suppressions=./misc/sanitizer_suppressions/linux_leak.supp
         ASAN_OPTIONS: verify_asan_link_order=0
         # QSG_RENDER_LOOP: basic
       run: |

.gitignore

@@ -1,7 +1,11 @@
 /CMakeLists.txt.user
 /extern/*
-/doc/*
-/doc
+/docs/binary
 /build/*
+/install/*
+.vs
+.vscode
+.qtcreator
+__pycache__
 /.qtcreator/CMakeLists.txt.user
 **/.qmlls.ini

CMakeLists.txt

@@ -1,6 +1,8 @@
 #############################################################################
 # Alpine Terrain Renderer
 # Copyright (C) 2023 Adam Celarek <family name at cg tuwien ac at>
+# Copyright (C) 2024 Gerald Kimmersdorfer
+# Copyright (C) 2024 Patrick Komon
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +19,21 @@
 #############################################################################
 
 cmake_minimum_required(VERSION 3.25)
-project(alpine-renderer LANGUAGES CXX)
+project(alpine-renderer LANGUAGES C CXX)
 
 option(ALP_UNITTESTS "include unit test targets in the buildsystem" ON)
+option(ALP_GL_ENGINE "include the gl engine in the buildsystem" OFF)
+set(ALP_WEBGPU_DEFAULT OFF)
+if (EMSCRIPTEN OR (UNIX AND NOT APPLE AND NOT ANDROID))
+    set(ALP_WEBGPU_DEFAULT ON)
+endif()
+option(ALP_WEBGPU_ENGINE "include the webgpu engine in the buildsystem" ${ALP_WEBGPU_DEFAULT})
+option(ALP_WEBGPU_APP "include the webgpu app in the buildsystem" ${ALP_WEBGPU_DEFAULT})
+option(ALP_PLAIN_RENDERER "include the plain renderer in the buildsystem" OFF)
+option(ALP_QML_APP "include the qml app in the buildsystem" OFF)
+
+option(ALP_WEBGPU_APP_ENABLE_COMPUTE "Build the webgpu_compute graph into the app" ON)
+
 option(ALP_ENABLE_ADDRESS_SANITIZER "compiles atb with address sanitizer enabled (only debug, works only on g++ and clang)" OFF)
 option(ALP_ENABLE_THREAD_SANITIZER "compiles atb with thread sanitizer enabled (only debug, works only on g++ and clang)" OFF)
 option(ALP_ENABLE_ASSERTS "enable asserts (do not define NDEBUG)" ON)
@@ -41,14 +55,14 @@ if(ALP_ENABLE_TRACK_OBJECT_LIFECYCLE)
     add_definitions(-DALP_ENABLE_TRACK_OBJECT_LIFECYCLE)
 endif()
 
-if (EMSCRIPTEN)
-    set(ALP_WWW_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "path to the install directory (for webassembly files, i.e., www directory)")
-    option(ALP_ENABLE_THREADING "Puts the scheduler into an extra thread." OFF)
-    option(ALP_ENABLE_DEV_TOOLS "HotReload, Renderstats, .. (increases binary size)" OFF)
-    option(ALP_ENABLE_POSITIONING "enable qt positioning (gnss / gps)" ON)
-elseif(ANDROID)
-    option(ALP_ENABLE_THREADING "Puts the scheduler into an extra thread." ON)
-    option(ALP_ENABLE_DEV_TOOLS "HotReload, Renderstats, .. (increases binary size)" OFF)
+if (EMSCRIPTEN)
+    set(ALP_WWW_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "path to the install directory (for webassembly files, i.e., www directory)")
+    option(ALP_ENABLE_THREADING "Puts the scheduler into an extra thread." OFF)
+    option(ALP_ENABLE_DEV_TOOLS "HotReload, Renderstats, .. (increases binary size)" OFF)
+    option(ALP_ENABLE_POSITIONING "enable qt positioning (gnss / gps)" ON)
+elseif(ANDROID)
+    option(ALP_ENABLE_THREADING "Puts the scheduler into an extra thread." ON)
+    option(ALP_ENABLE_DEV_TOOLS "HotReload, Renderstats, .. (increases binary size)" OFF)
     option(ALP_ENABLE_POSITIONING "enable qt positioning (gnss / gps)" ON)
 else()
     option(ALP_ENABLE_THREADING "Puts the scheduler into an extra thread." ON)
@@ -88,13 +102,18 @@ if (ALP_USE_LLVM_LINKER)
     string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=lld")
 endif()
 
+# Disable Qt debug output in release builds
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    add_compile_definitions(QT_NO_DEBUG_OUTPUT)
+endif()
+
 ########################################### dependencies #################################################
 find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Network Quick QuickControls2 LinguistTools)
-qt_standard_project_setup(REQUIRES 6.8)
+qt_standard_project_setup(REQUIRES 6.7)
 
 alp_add_git_repository(renderer_static_data URL https://github.com/AlpineMapsOrg/renderer_static_data.git COMMITISH v23.11 DO_NOT_ADD_SUBPROJECT)
 alp_add_git_repository(alpineapp_fonts URL https://github.com/AlpineMapsOrg/fonts.git COMMITISH v24.02 DO_NOT_ADD_SUBPROJECT)
-alp_add_git_repository(doc URL https://github.com/AlpineMapsOrg/documentation.git COMMITISH origin/main DO_NOT_ADD_SUBPROJECT DESTINATION_PATH doc)
+alp_add_git_repository(doc URL https://github.com/AlpineMapsOrg/documentation.git COMMITISH origin/main DO_NOT_ADD_SUBPROJECT DESTINATION_PATH docs/binary)
 
 
 if (ANDROID)
@@ -115,6 +134,29 @@ if (ALP_ENABLE_GL_ENGINE)
     add_subdirectory(app)
 endif()
 
-if (ALP_UNITTESTS)
-    add_subdirectory(unittests)
+if (ALP_GL_ENGINE)
+    add_subdirectory(gl_engine)
 endif()
+if (ALP_PLAIN_RENDERER)
+    add_subdirectory(plain_renderer)
+endif()
+if (ALP_QML_APP)
+    add_subdirectory(app)
+endif()
+if (ALP_WEBGPU_APP OR ALP_WEBGPU_ENGINE)
+    add_subdirectory(webgpu/base)
+    if (ALP_WEBGPU_ENGINE)
+        add_subdirectory(webgpu/engine)
+    endif()
+    if (ALP_WEBGPU_APP)
+        if (ALP_WEBGPU_APP_ENABLE_COMPUTE)
+            add_subdirectory(webgpu/compute)
+        endif()
+        add_subdirectory(apps/webgpu_app)
+    endif()
+
+endif()
+
+if (ALP_UNITTESTS)
+    add_subdirectory(unittests)
+endif()

CMakePresets.json

@@ -0,0 +1,162 @@
+{
+  "version": 6,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 25,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "alp-base",
+      "hidden": true,
+      "cacheVariables": {
+        "ALP_ENABLE_GL_ENGINE": "OFF",
+        "ALP_QML_APP": "OFF",
+        "ALP_ENABLE_LABELS": "OFF",
+        "ALP_UNITTESTS": "OFF",
+        "ALP_WEBGPU_ENGINE": "ON",
+        "ALP_WEBGPU_APP": "ON",
+        "ALP_ENABLE_THREADING": "ON",
+        "ALP_ENABLE_DEV_TOOLS": "ON"
+      }
+    },
+    {
+      "name": "msvc-base",
+      "hidden": true,
+      "inherits": "alp-base",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "installDir": "${sourceDir}/install/${presetName}",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "toolset": {
+        "value": "host=x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "cl.exe",
+        "CMAKE_CXX_COMPILER": "cl.exe",
+        "Qt6_DIR": "C:/Qt/6.10.1/msvc2022_64/lib/cmake/Qt6"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "msvc-debug",
+      "displayName": "MSVC Debug (Windows)",
+      "description": "Debug build using MSVC compiler",
+      "inherits": "msvc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_CXX_FLAGS": "/DQT_DEBUG"
+      }
+    },
+    {
+      "name": "msvc-release",
+      "displayName": "MSVC Release (Windows)",
+      "description": "Release build using MSVC compiler",
+      "inherits": "msvc-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "msvc-debug-test",
+      "displayName": "MSVC Debug Tests (Windows)",
+      "description": "Debug build for unit tests using MSVC compiler",
+      "inherits": "msvc-debug",
+      "cacheVariables": {
+        "ALP_UNITTESTS": "ON",
+        "ALP_WEBGPU_APP": "OFF"
+      }
+    },
+    {
+      "name": "msvc-release-test",
+      "displayName": "MSVC Release Tests (Windows)",
+      "description": "Release build for unit tests using MSVC compiler",
+      "inherits": "msvc-release",
+      "cacheVariables": {
+        "ALP_UNITTESTS": "ON",
+        "ALP_WEBGPU_APP": "OFF"
+      }
+    },
+    {
+      "name": "emscripten-base",
+      "hidden": true,
+      "inherits": "alp-base",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "installDir": "${sourceDir}/install/${presetName}",
+      "toolchainFile": "C:/Qt/6.10.1/wasm_multithread/lib/cmake/Qt6/qt.toolchain.cmake",
+      "environment": {
+        "PATH": "C:/Qt/Tools/Ninja;$penv{PATH}",
+        "EMSDK": "C:/tmp/alpinemaps/emsdk"
+      }
+    },
+    {
+      "name": "wasm-debug",
+      "displayName": "WebAssembly Debug",
+      "description": "Debug build for WebAssembly using Emscripten",
+      "inherits": "emscripten-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_CXX_FLAGS": "-DQT_DEBUG"
+      }
+    },
+    {
+      "name": "wasm-release",
+      "displayName": "WebAssembly Release",
+      "description": "Release build for WebAssembly using Emscripten",
+      "inherits": "emscripten-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "wasm-publish",
+      "displayName": "WebAssembly Publish",
+      "description": "Production build for WebAssembly using Emscripten",
+      "inherits": "emscripten-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_CXX_FLAGS": "-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DQT_NO_INFO_OUTPUT",
+        "ALP_ENABLE_WGSL_MINIFICATION": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "msvc-debug",
+      "configurePreset": "msvc-debug"
+    },
+    {
+      "name": "msvc-release",
+      "configurePreset": "msvc-release"
+    },
+    {
+      "name": "msvc-debug-test",
+      "configurePreset": "msvc-debug-test"
+    },
+    {
+      "name": "msvc-release-test",
+      "configurePreset": "msvc-release-test"
+    },
+    {
+      "name": "wasm-debug",
+      "configurePreset": "wasm-debug"
+    },
+    {
+      "name": "wasm-release",
+      "configurePreset": "wasm-release"
+    },
+    {
+      "name": "wasm-publish",
+      "configurePreset": "wasm-publish"
+    }
+  ]
+}