Develop Merge

.gitignore

@@ -3,3 +3,8 @@
 /doc/*
 /doc
 /build/*
+/install/*
+.vs
+.vscode
+.qtcreator
+__pycache__

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
@@ -19,16 +21,23 @@
 cmake_minimum_required(VERSION 3.25)
 project(alpine-renderer LANGUAGES CXX)
 
-option(ALP_UNITTESTS "include unit test targets in the buildsystem" ON)
+option(ALP_UNITTESTS "include unit test targets in the buildsystem" OFF)
+option(ALP_GL_ENGINE "include the gl engine in the buildsystem" OFF)
+option(ALP_WEBGPU_ENGINE "include the webgpu engine in the buildsystem" ON)
+option(ALP_WEBGPU_APP "include the webgpu app in the buildsystem" ON)
+option(ALP_WEBIGEO_EVAL "include the webigeo eval cli in the buildsystem" OFF)
+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_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)
 option(ALP_ENABLE_TRACK_OBJECT_LIFECYCLE "enables debug cmd printout of constructors & deconstructors if implemented" OFF)
 option(ALP_ENABLE_APP_SHUTDOWN_AFTER_60S "Shuts down the app after 60S, used for CI testing with asan." OFF)
 option(ALP_ENABLE_LTO "Enable link time optimisation." OFF)
-option(ALP_ENABLE_GL_ENGINE "Enable OpenGL/WebGL engine" ON)
+option(ALP_ENABLE_GL_ENGINE "Enable OpenGL/WebGL engine" OFF)
 option(ALP_ENABLE_AVLANCHE_WARNING_LAYER "Enables avalanche warning layer (requires Qt Gui in nucleus)" OFF)
-option(ALP_ENABLE_LABELS "Enables label rendering" ON)
+option(ALP_ENABLE_LABELS "Enables label rendering" OFF)
 
 set(ALP_EXTERN_DIR "extern" CACHE STRING "name of the directory to store external libraries, fonts etc..")
 
@@ -38,8 +47,8 @@ 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_THREADING "Puts the scheduler into an extra thread." ON)
+    option(ALP_ENABLE_DEV_TOOLS "HotReload, Renderstats, .. (increases binary size)" 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)
@@ -82,13 +91,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 extern/doc)
 
 
 if (ANDROID)
@@ -109,6 +123,27 @@ if (ALP_ENABLE_GL_ENGINE)
     add_subdirectory(app)
 endif()
 
+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_UNITTESTS)
     add_subdirectory(unittests)
 endif()
+if (ALP_WEBGPU_APP OR ALP_WEBGPU_ENGINE)
+    add_subdirectory(webgpu)
+    if (ALP_WEBGPU_ENGINE)
+        add_subdirectory(webgpu_engine)
+    endif()
+    if (ALP_WEBGPU_APP)
+        add_subdirectory(webgpu_app)
+    endif()
+    if (ALP_WEBIGEO_EVAL)
+        add_subdirectory(webigeo_eval)
+    endif()
+endif()

CMakePresets.json

@@ -0,0 +1,146 @@
+{
+  "version": 6,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 25,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "msvc-base",
+      "hidden": true,
+      "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,
+      "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/webigeo/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"
+    }
+  ]
+}

README.md

@@ -1,62 +1,19 @@
-# AlpineMaps.org Renderer
-This is the software behind [alpinemaps.org](https://alpinemaps.org).
+![weBIGeo Sujet](https://github.com/weBIGeo/ressources/blob/main/for_md/webigeo_sujet_v3_github.png?raw=true)
 
-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!
+# weBIGeo
+WeBIGeo is a research project focused on real-time 3D computer graphics, large data visualization, and human-computer interaction. The goal is to offer a platform that is easy to use and allows for fast analysis and visualization of geographical datasets. (Further information can be found [here](https://www.netidee.at/webigeo).)
 
-[If looking at the issues, best to filter out projects!](https://github.com/AlpineMapsOrg/renderer/issues?q=is%3Aissue%20state%3Aopen%20no%3Aproject)
+To that end, WeBIGeo uses existing technologies from the [AlpineMaps.org Project](https://alpinemapsorg.github.io/renderer/) and introduces a new WebGPU rendering engine.
 
 We are in discord, talk to us!
 https://discord.gg/p8T9XzVwRa
 
-# Cloning and building
-`git clone git@github.com:AlpineMapsOrg/renderer.git`
+# [Demo](https://webigeo.alpinemaps.org/)
 
-After that it should be a normal cmake project. That is, you run cmake to generate a project or build file and then run your favourite tool. All dependencies should be pulled automatically while you run CMake. 
-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.8.0, or greater
-* g++ 12+, clang or msvc
-* OpenGL
-* Qt Positioning and Charts modules
-* Some other dependencies will be pulled automatically during building.
-
-## Building the native version
-* just run cmake and build
-
-## Building the android version
-* We are usually building with Qt Creator, because it works relatively out of the box. However, it should also work on the command line or other IDEs if you set it up correctly.
-* You need a Java JDK before you can do anything else. Not all Java versions work, and the error messages might be surprising (or non-existant). I'm running with Java 19, and I can compile for old devices. Iirc a newer version of Java caused issues. [Android documents the required Java version](https://developer.android.com/build/jdks), but as said, for me Java 19 works as well. It might change in the future.
-* Once you have Java, go to Qt Creator Preferences -> Devices -> Android. There click "Set Up SDK" to automatically download and install an Android SDK.
-* Finally, you might need to click on SDK Manager to install a fitting SDK Platform (take the newest, it also works for older devices), and ndk (newest as well).
-* Then Google the internet to find out how to enable the developer mode on Android.
-* On linux, you'll have to setup some udev rules. Run `Android/SDK/platform-tools/adb devices` and you should get instructions.
-* If there are problems, check out the [documentation from Qt](https://doc.qt.io/qt-6/android-getting-started.html) 
-* Finally, you are welcome to ask in discord if something is not working! 
-
-## Building the WebAssembly version:
-* [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)
+# Documentation
+- [Setup](docs/Setup.md)
+- [Usage](docs/Usage.md)
+- [Technical documentation](docs/Technical.md)
 
 # Code style
-* class names are CamelCase, method, function and variable names are snake_case.
-* class attributes have an m_ prefix and are usually private, struct attributes don't and are usually public.
-* use `void set_attribute(int value)` and `int attribute() const` for setters and getters (that is, avoid the get_). Use [the Qt recommendations](https://wiki.qt.io/API_Design_Principles#Naming_Boolean_Getters,_Setters,_and_Properties) for naming boolean getters.
-* structs are usually small, simple, and have no or only few methods. they never have inheritance.
-* files are CamelCase if the content is a CamelCase class. otherwise they are snake_case, and have a snake_case namespace with stuff.
-* the folder/structure.h is reflected in namespace folder::structure{ .. }
-* indent with space only, indent 4 spaces
-* ideally, use the clang-format file provided with the project
-  (in case you use Qt Creator, go to Preferences -> C++ -> Code Style: Formatting mode: Full, Format while typing, Format edited code on file save, don't override formatting)
-* follow the [Qt recommendations](https://wiki.qt.io/API_Design_Principles) and the [c++ core guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) everywhere else.
-
-# Developer workflow
-* Fork this repository.
-* Enable github pages from actions (Repository Settings -> Pages -> Source -> GitHub Actions)
-* Work in branches or your main.
-* Make pull requests from your main branch.
-* Github Actions will run the unit tests and create packages for the browser and Android and deploy them to your_username.github.io/your_clone_name/.
-* Make sure that the unit tests run through.
-* We will also look at the browser version during the pull request.
-* Ideally you'll also setup the signing keys for Android packages ([instructions](https://github.com/AlpineMapsOrg/renderer/blob/main/creating_apk_keys.md)).
+We adhere to the coding guidelines of [AlpineMaps.org](https://github.com/AlpineMapsOrg/renderer?tab=readme-ov-file#code-style).

app/TerrainRendererItem.cpp

@@ -164,6 +164,7 @@ QQuickFramebufferObject::Renderer* TerrainRendererItem::createRenderer() const
     return r;
 }
 
+
 void TerrainRendererItem::touchEvent(QTouchEvent* e)
 {
     this->setFocus(true);