update master

.clang-format

@@ -1,11 +1,11 @@
 ---
 BasedOnStyle: LLVM
 Language: Cpp
-Standard: Cpp11
+Standard: c++17
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortBlocksOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: true
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakTemplateDeclarations: Yes
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterClass: true

.gitattributes

@@ -21,3 +21,4 @@
 *.pvm binary
 *.exr binary
 *.pfm binary
+*.webp binary

.github/workflows/build-matrix.yml

@@ -50,14 +50,6 @@ on:
         required: false
         type: string
         default: "false"
-      qt5:
-        required: false
-        type: string
-        default: "true"
-      qt6:
-        required: false
-        type: string
-        default: "true"
 
 env:
   ext-dir: $GITHUB_WORKSPACE/external/install/
@@ -78,7 +70,7 @@ jobs:
           [[ "true" == "${{ inputs.windows }}" && "true" == "${{inputs.linux}}" ]] && echo ','
           [[ "true" == "${{ inputs.linux }}" ]] && echo '{ "name": "Ubuntu gcc", "os": "ubuntu-latest", "cc": "gcc-10", "cxx": "g++-10", "icon": "Linux", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DRADIUM_ENABLE_GL_TESTING=ON" }'
           [[ "true" == "${{ inputs.windows }}" || "true" == "${{inputs.linux}}" ]] && [[ "true" == "${{inputs.macos}}" ]] && echo ','
-          [[ "true" == "${{ inputs.macos }}" ]] && echo '{ "name": "MacOS clang", "os": "macos-latest", "cc": "clang", "cxx": "clang++", "icon": "Apple", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations" }'
+          [[ "true" == "${{ inputs.macos }}" ]] && echo '{ "name": "MacOS clang", "os": "macos-13", "cc": "clang", "cxx": "clang++", "icon": "Apple", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations" }'
           echo '],'
           echo '"build-type" : ['
           [[ "true" == "${{ inputs.build-debug }}" ]] && echo '"Debug"'
@@ -89,11 +81,7 @@ jobs:
           echo '{ "name": "float", "value": "OFF"}'
           [[ "true" == "${{ inputs.use-double }}" ]] && echo ', { "name": "double", "value": "ON" }'
           echo '],'
-          echo '"qtversion" : ['
-          [[ "true" == "${{ inputs.qt5 }}" ]] && echo '{ "name" : "qt5", "value" : "5.15.1"}'
-          [[ "true" == "${{ inputs.qt5 }}" && "true" == "${{ inputs.qt6 }}" ]] && echo ','
-          [[ "true" == "${{ inputs.qt6 }}" ]] && echo '{ "name" : "qt6", "value" : "6.2.0"}'
-          echo '],'
+          echo '"qtversion" : [ { "name" : "qt6", "value" : "6.2.0"}],'
           echo '"coverage" : ['
           [[ "true" == "${{ inputs.coverage }}" ]] && echo '{ "value" : "ON", "extra-flags" : "-DRADIUM_ENABLE_GL_TESTING=ON" }' || echo '{ "value" : "OFF", "extra-flags" : "" }'
           echo "]"
@@ -124,7 +112,9 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJSON(needs.create-matrix.outputs.matrix) }}
     steps:
-      - uses: seanmiddleditch/gha-setup-ninja@master
+      - name: Install Ninja
+        shell: bash
+        run: ${{ runner.os == 'macOS' && 'brew install ninja' || runner.os == 'Windows' && 'choco install ninja' || 'sudo apt-get install ninja-build' }}
       - name: Add msbuild to PATH
         uses: seanmiddleditch/gha-setup-vsdevenv@master
         if: runner.os == 'Windows'
@@ -172,6 +162,7 @@ jobs:
           echo "${{ env.ext-dir }}/bin" >> $GITHUB_PATH
           echo "${{ env.ext-dir }}/glbinding" >> $GITHUB_PATH
           echo "${{ env.ext-dir }}/globjects" >> $GITHUB_PATH
+          echo "${{ env.ext-dir }}/cpplocate" >> $GITHUB_PATH
       - name: Prepare directories
         run: |
           mkdir -p install/
@@ -183,12 +174,15 @@ jobs:
         uses: actions/checkout@master
         with:
           path: src/Radium-Engine
+          submodules: 'recursive'
       - name: pull updated repo (e.g. with new VERSION)
         if: ${{ github.event_name == 'push' }}
-        run: git -C src/Radium-Engine pull origin ${{ github.event.ref }}
+        run: |
+          git -C src/Radium-Engine pull origin ${{ github.event.ref }}
+          git -C src/Radium-Engine submodule update --init --recursive
       - name: Cache externals
         id: cache-external
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: external
           key: ${{ matrix.config.name }}-${{ matrix.build-type }}-${{ matrix.qtversion.name }}-external-v1-${{ hashFiles('src/Radium-Engine/external/**/CMakeLists.txt') }}
@@ -259,11 +253,6 @@ jobs:
         if: ${{ inputs.coverage == 'true' }}
         run: |
           cd build/Radium-Engine
-          cmake --build . --config Debug --target lcov_init
-          cmake --build . --config Debug --target lcov_zerocounter
-          cmake --build . --config Debug --target check
-          cmake --build . --config Debug --target lcov_capture
-          # show report for debug
-          cmake --build . --config Debug --target lcov_list
+          cmake --build . --config Debug --target coverage
           # Uploading report to CodeCov
-          bash <(curl -s https://codecov.io/bash) -f total.info -R ../../src/Radium-Engine || echo "Codecov did not collect coverage reports"
+          bash <(curl -s https://codecov.io/bash) -f coverage.info -R ../../src/Radium-Engine || echo "Codecov did not collect coverage reports"

.github/workflows/deploy-doc.yml

@@ -7,11 +7,17 @@ on:
   workflow_call:
     secrets:
        REPO_ACCESS_TOKEN:
-         required: true
+         required: false
+    inputs:
+      deploy-on-gh-pages:
+        required: false
+        type: string
+        default: "true"
 
 jobs:
   deploy-doc-index:
-    runs-on: ubuntu-20.04
+    if: ${{ inputs.deploy-on-gh-pages == 'true' }}
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout remote head
         uses: actions/checkout@master
@@ -22,53 +28,65 @@ jobs:
           publish_dir: 'doc/index'
           keep_files: true
 
-  deploy-doc:
-    runs-on: ubuntu-20.04
+  build-and-deploy-doc:
+    runs-on: ubuntu-24.04
     steps:
       - name: Prepare directories
         run: |
           mkdir -p src/Radium-Engine
           mkdir -p build/Radium-Engine
+          mkdir doxygen
       - name: Checkout remote head
         uses: actions/checkout@master
         with:
           path: src/Radium-Engine
           submodules: recursive
       - name: pull updated repo (e.g. with new VERSION)
+        if: ${{ inputs.deploy-on-gh-pages == 'true' }}
         run: git -C src/Radium-Engine pull origin ${{ github.event.ref }}
       - name: Install packages
         run : |
-          sudo apt-get install graphviz
-      - name: Fetch recent doxygen (1.9.1)
+          sudo apt-get install graphviz plantuml
+      - name: Fetch recent doxygen
         run: |
-          sudo apt-get install clang-9 libclang-9-dev
-          wget https://sourceforge.net/projects/doxygen/files/rel-1.9.1/doxygen-1.9.1.linux.bin.tar.gz
-          tar -xvzf doxygen-1.9.1.linux.bin.tar.gz
+          wget https://sourceforge.net/projects/doxygen/files/rel-1.12.0/doxygen-1.12.0.linux.bin.tar.gz -O doxygen.tar.gz
+          tar -zxvf doxygen.tar.gz -C doxygen --wildcards "*/bin"
+          mv doxygen/*/bin doxygen/
       - name: Extract ref for badges prefix
         if: always()
         shell: bash
         run: |
           GITHUB_REF=${{ github.ref }}
           echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
         id: extract-branch
-      - name: Configure Doc
+      - name: Configure and build doc
         run: |
           cd build/Radium-Engine
-          cmake ../../src/Radium-Engine/doc -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DDOXYGEN_EXECUTABLE=../../doxygen-1.9.1/bin/doxygen
-      - name: Build Doc
-        run: |
+          ls -lh ../../doxygen/bin/doxygen
+          ../../doxygen/bin/doxygen -v
+          cmake ../../src/Radium-Engine/doc -DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=STDOUT -DDOXYGEN_EXECUTABLE=../../doxygen/bin/doxygen
           export GITHUB_REF="${{ steps.extract-branch.outputs.branch }}"
-          cd build/Radium-Engine
           cmake --build . --target RadiumDoc
+      # upload doc as artifact if not deployed
+      - name: Archive doc
+        if: ${{ inputs.deploy-on-gh-pages == 'false' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: doc
+          path: build/Radium-Engine/html/
+          retention-days: 5
       - name: Fix badges github ref
+        if: ${{ inputs.deploy-on-gh-pages == 'true' }}
         run: |
           export GITHUB_REF="${{ steps.extract-branch.outputs.branch }}"
           cd build/Radium-Engine
           sed -i "s/\$(GITHUB_REF)/${GITHUB_REF}/g" html/index.html
       - name: Git branch name
+        if: ${{ inputs.deploy-on-gh-pages == 'true' }}
         id: git-branch-name
         uses: EthanSK/git-branch-name-action@v1
       - name: Deploy Doc
+        if: ${{ inputs.deploy-on-gh-pages == 'true' }}
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.REPO_ACCESS_TOKEN }}

.github/workflows/manual-doc-artifact-build.yml

@@ -0,0 +1,14 @@
+name: Build doc artifact (trigger manually)
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'The branch to build'
+        required: true
+
+jobs:
+  call-build-doc:
+    uses: ./.github/workflows/deploy-doc.yml
+    with:
+      deploy-on-gh-pages: "false"

.github/workflows/pull-request-ci.yml

@@ -29,4 +29,3 @@ jobs:
       macos: "false"
       build-release: "false"
       coverage: "true"
-      qt6: "false"

.github/workflows/push-master-ci.yml

@@ -37,7 +37,6 @@ jobs:
       macos: "false"
       build-release: "false"
       coverage: "true"
-      qt6: "false"
   call-notify:
     needs: [increase-version-number]
     uses: ./.github/workflows/notify-radium-releases.yml

.github/workflows/push-rc-ci.yml

@@ -37,4 +37,3 @@ jobs:
       macos: "false"
       build-release: "false"
       coverage: "true"
-      qt6: "false"

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "external/doxygen-awesome-css"]
 	path = external/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "cmake/cmake-message-helpers"]
+	path = cmake/cmake-message-helpers
+	url = https://github.com/dlyr/cmake-message-helpers.git

.pre-commit-config.yaml

@@ -5,7 +5,7 @@
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
     - id: trailing-whitespace
       exclude: ^tests/.*/data/.*$
@@ -26,12 +26,12 @@ repos:
 #      - id: cppcheck
 #        args: [--enable=all]
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.33.0
+  rev: v0.42.0
   hooks:
   - id: markdownlint
     args: [-f]
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v15.0.6
+  rev: v19.1.1
   hooks:
   - id: clang-format
     types_or: [c++, c, cuda]

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake
@@ -7,7 +7,8 @@ cmake_policy(SET CMP0092 NEW) # do not set /W3 for msvc
 
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-
+include(${CMAKE_SOURCE_DIR}/cmake/cmake-message-helpers/MessageHelpers.cmake)
+message_prefix_push("Main")
 # Project setup, versioning stuff here, change when changing the version
 # ~~~
 # Note: keep the project name lower case only for easy linux packaging support
@@ -162,13 +163,8 @@ else()
     set(GIT_CHANGESET "")
 endif()
 
-set(ENABLE_COVERAGE "")
-mark_as_advanced(ENABLE_COVERAGE)
 if(RADIUM_ENABLE_COVERAGE)
-    include(CoverageFunc)
-    # sets ENABLE_COVERAGE to ON if ok
-    setup_coverage()
-
+    set(RADIUM_ENABLE_TESTING "ON")
     include(CodeCoverage)
     append_coverage_compiler_flags()
 endif(RADIUM_ENABLE_COVERAGE)
@@ -177,6 +173,7 @@ endif(RADIUM_ENABLE_COVERAGE)
 # Installation utilities
 include(RadiumSetupFunctions)
 
+message_prefix_pop()
 # Documentation build
 add_subdirectory(doc)
 
@@ -222,11 +219,39 @@ if(RADIUM_ENABLE_TESTING)
     add_subdirectory(tests)
 endif()
 
-if(ENABLE_COVERAGE)
-    set(LCOV_REMOVES
-        "'/usr/*';'*examples*';'*external*';'*install*';'*/Catch2/*';'*_autogen/*';'*build*'"
+if(RADIUM_ENABLE_COVERAGE)
+    append_coverage_compiler_flags()
+    setup_target_for_coverage_lcov(
+        NAME
+        coverage
+        EXECUTABLE
+        ${CMAKE_CTEST_COMMAND}
+        --output-on-failure
+        -C
+        ${CMAKE_BUILD_TYPE}
+        -j
+        $ENV{CMAKE_BUILD_PARALLEL_LEVEL}
+        BASE_DIRECTORY
+        "/"
+        DEPENDENCIES
+        RadiumLibs
+        unittests
+        integration
+        EXCLUDE
+        "/*external*/"
+        "/*/glbinding/*"
+        "/*/globjects/*"
+        "/*/OpenMesh/*"
+        "/*/assimp/*"
+        "/*/eigen3/*"
+        "/*/nlohmann/*"
+        "/*/stb/*"
+        "/usr/*"
+        "${CMAKE_SOURCE_DIR}/examples*"
+        "${CMAKE_SOURCE_DIR}/*/Catch2/*"
+        "${CMAKE_BINARY_DIR}/*_autogen/*"
+        "${CMAKE_BINARY_DIR}/*mocs*"
     )
-    setup_coverage_targets(${ENABLE_COVERAGE} "${LCOV_REMOVES}")
 
     # Fastcov is not supported with gcov llvm: disabling for MacOS Source:
     # https://github.com/RPGillespie6/fastcov/issues/36
@@ -235,16 +260,28 @@ if(ENABLE_COVERAGE)
             NAME
             coverage_fastcov
             EXECUTABLE
-            ctest
+            ${CMAKE_CTEST_COMMAND}
+            --output-on-failure
+            -C
+            ${CMAKE_BUILD_TYPE}
             -j
             $ENV{CMAKE_BUILD_PARALLEL_LEVEL}
             DEPENDENCIES
             RadiumLibs
             unittests
             integration
+            BASE_DIRECTORY
+            "/"
             EXCLUDE
             "/usr/"
             "examples"
+            "glbinding"
+            "globjects"
+            "OpenMesh"
+            "assimp"
+            "eigen3"
+            "nlohmann"
+            "stb"
             "external"
             "install"
             "/Catch2/"
@@ -261,7 +298,7 @@ install(FILES LICENSE README.md TYPE DATA)
 
 # -------------------------------------------------------------------------------
 # Wrap up of settings printed on build
-include(MessageFunc)
+
 message(NOTICE "")
 message_title(" Final overview for ${PROJECT_NAME} ")
 message_info(" ")

README.md

@@ -1,6 +1,6 @@
 # Radium-Engine libraries
 
-![banner](doc/images/radium-banner.png)
+![banner](doc/images/radium-banner.webp)
 
 Radium is a research 3D Engine for rendering, animation and processing.
 It is developed and maintained by the [STORM research group](https://www.irit.fr/STORM/site/).