[merge] Merge pull request #554 from inexorgame/hanni/maintenance

Maintenance

Author: IAmNotHanni

.github/workflows/build.yml

@@ -104,7 +104,7 @@ jobs:
           rm -rf ${{ env.INEXOR_VULKAN_SDK_PATH }}/${{ env.INEXOR_VULKAN_VERSION }}/x86_64/lib/cmake/volk/
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure CMake
         shell: bash
@@ -137,7 +137,7 @@ jobs:
           tar -zcvf "../build_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz" *
 
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz
           path: build_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz
@@ -155,7 +155,7 @@ jobs:
           tar -zcvf "../nightly_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz" *
 
       - name: Upload Nightly Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nightly_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz
           path: nightly_linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz
@@ -208,7 +208,7 @@ jobs:
           pip3 install wheel setuptools
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure LLVM
         if: matrix.config.compiler == 'clang'
@@ -251,7 +251,7 @@ jobs:
           7z a -tzip "build_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}" ./build/*
 
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}
           path: build_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.zip
@@ -268,7 +268,7 @@ jobs:
           7z a -tzip "nightly_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}" ./artifacts/*
 
       - name: Upload Nightly Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nightly_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}
           path: nightly_windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.zip

.github/workflows/build_documentation.yml

@@ -49,7 +49,7 @@ jobs:
           tar cfz documentation.tar.xz build/html/*
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/documentation/documentation.tar.xz
           name: documentation.tar.xz

.github/workflows/code_style.yml

@@ -21,7 +21,7 @@ jobs:
             git
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Fetch ${{ github.base_ref }}
         shell: bash

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         uses: styfle/cancel-workflow-action@0.11.0
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download artifacts
         uses: actions/github-script@v6

.github/workflows/static_analysis.yml

@@ -71,7 +71,7 @@ jobs:
           rm -rf ${{ env.INEXOR_VULKAN_SDK_PATH }}/${{ env.INEXOR_VULKAN_VERSION }}/x86_64/lib/cmake/volk/
   
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure CMake
         run: |

documentation/source/conf.py

@@ -49,7 +49,7 @@
     r"https://github.com/.*#"  # do not check anchors from GitHub, JS magic
 ]
 
-mermaid_version = "8.9.2"
+mermaid_version = "11.4.1"
 
 # Setup the breathe extension
 breathe_projects = {

include/inexor/vulkan-renderer/bezier_curve.hpp

@@ -3,7 +3,6 @@
 #include "inexor/vulkan-renderer/camera.hpp"
 #include "inexor/vulkan-renderer/fps_counter.hpp"
 #include "inexor/vulkan-renderer/imgui.hpp"
-#include "inexor/vulkan-renderer/msaa_target.hpp"
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/time_step.hpp"
 #include "inexor/vulkan-renderer/wrapper/instance.hpp"

include/inexor/vulkan-renderer/msaa_target.hpp

@@ -1,6 +1,5 @@
 set(INEXOR_SOURCE_FILES
     vulkan-renderer/application.cpp
-    vulkan-renderer/bezier_curve.cpp
     vulkan-renderer/camera.cpp
     vulkan-renderer/exception.cpp
     vulkan-renderer/fps_counter.cpp