[merge] Merge pull request #467 from inexorgame/iceflower/git-fox

[ci] Fix ci

Author: IAmNotHanni

.github/workflows/build.yml

@@ -81,7 +81,7 @@ jobs:
           tar xfz vulkansdk.tar.gz -C "${{ env.inexor_vulkan_sdk }}"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure CMake
         shell: bash
@@ -155,7 +155,7 @@ jobs:
           7z x vulkansdk.exe -o"${{ env.inexor_vulkan_sdk }}"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure CMake
         shell: pwsh

.github/workflows/build_documentation.yml

@@ -14,20 +14,10 @@ jobs:
           # Update package lists
           apt update -qq
           # Install build tools
-          apt install -y doxygen git python3 python3-pip python3-venv wget
-
-      - name: Update CMake
-        run: |
-          apt update -qq
-          apt install -y software-properties-common
-          apt remove --purge --auto-remove cmake
-          wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-          apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main'
-          apt update -qq
-          apt install -y cmake
+          apt install -y cmake doxygen git python3 python3-pip python3-venv wget
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure CMake
         working-directory: ${{ github.workspace }}/documentation

.github/workflows/code_style.yml

@@ -21,11 +21,12 @@ jobs:
             git
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Fetch ${{ github.base_ref }}
         shell: bash
         run: |
+          git config --global --add safe.directory $(pwd)
           git fetch --progress --depth=1 origin ${{ github.base_ref }}
           git log --pretty=oneline
 

.github/workflows/commit_naming.yml

@@ -20,19 +20,20 @@ jobs:
 
       - name: Checkout (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Shallow fetch (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
         run: |
+          git config --global --add safe.directory $(pwd)
           git fetch --progress --shallow-exclude ${{ github.base_ref }} origin +${{ github.sha }}:refs/remotes/origin/${{ github.head_ref }}
           git log --pretty=oneline
 
       - name: Checkout (Push)
         if: ${{ github.event_name == 'push' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install gitcc
         run: |
@@ -42,9 +43,11 @@ jobs:
       - name: Check commits (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
         run: |
+          git config --global --add safe.directory $(pwd)
           gitcc history --verbose ./
 
       - name: Check commit (Push)
         if: ${{ github.event_name == 'push' }}
         run: |
+          git config --global --add safe.directory $(pwd)
           gitcc commit ./

.github/workflows/static_analysis.yml

@@ -61,7 +61,7 @@ jobs:
           tar xfz vulkansdk.tar.gz -C "${{ env.inexor_vulkan_sdk }}"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure CMake
         run: |

documentation/requirements.txt

@@ -1,7 +1,7 @@
-sphinx==4.0.3
-sphinx_rtd_theme>=0.4.3
-exhale>=0.2.3
-sphinxcontrib-mermaid>=0.4.0
-plotly>=4.7.1
-pandas>=1.0.3
-recommonmark>=0.6.0
+sphinx>=4.5.0
+sphinx_rtd_theme>=1.0.0
+exhale>=0.3.1
+sphinxcontrib-mermaid>=0.7.1
+plotly>=5.7.0
+pandas>=1.4.2
+recommonmark>=0.7.1

include/inexor/vulkan-renderer/world/cube.hpp

@@ -86,7 +86,7 @@ class Cube : public std::enable_shared_from_this<Cube> {
     void remove_children();
 
     /// Get the root to this cube.
-    [[nodiscard]] std::shared_ptr<Cube> root() noexcept;
+    [[nodiscard]] std::shared_ptr<Cube> root();
     /// Get the vertices of this cube. Use only on geometry cubes.
     [[nodiscard]] std::array<glm::vec3, 8> vertices() const noexcept;
 

include/inexor/vulkan-renderer/wrapper/mesh_buffer.hpp

@@ -38,7 +38,7 @@ class Device;
 template <typename VertexType, typename IndexType = std::uint32_t>
 class MeshBuffer {
     const Device &m_device;
-    std::string m_name;
+    const std::string &m_name;
 
     GPUMemoryBuffer m_vertex_buffer;
 
@@ -64,7 +64,7 @@ class MeshBuffer {
           m_index_buffer(std::make_optional<GPUMemoryBuffer>(
               device, name, sizeof(IndexType) * index_count,
               VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VMA_MEMORY_USAGE_CPU_ONLY)),
-          m_device(device) {
+          m_device(device), m_name(name) {
         assert(device.device());
         assert(device.allocator());
         assert(!name.empty());
@@ -89,8 +89,7 @@ class MeshBuffer {
         : m_vertex_buffer(device, name, sizeof(VertexType) * vertex_count,
                           VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
                           VMA_MEMORY_USAGE_CPU_ONLY),
-          m_index_buffer(std::nullopt), m_number_of_vertices(vertex_count), m_device(device) {
-
+          m_index_buffer(std::nullopt), m_number_of_vertices(vertex_count), m_device(device), m_name(name) {
         assert(device.device());
         assert(device.allocator());
         assert(!name.empty());
@@ -167,11 +166,12 @@ class MeshBuffer {
 
     MeshBuffer(const MeshBuffer &) = delete;
 
-    MeshBuffer(MeshBuffer &&other) noexcept
-        : m_name(std::move(other.m_name)), m_vertex_buffer(std::move(other.m_vertex_buffer)),
-          m_index_buffer(std::exchange(other.m_index_buffer, std::nullopt)),
-          m_number_of_vertices(other.m_number_of_vertices), m_number_of_indices(other.m_number_of_indices),
-          m_device(other.m_device) {}
+    MeshBuffer(MeshBuffer &&other) noexcept : m_device(other.m_device), m_name(other.m_name) {
+        m_vertex_buffer = std::move(other.m_vertex_buffer);
+        m_index_buffer = std::exchange(other.m_index_buffer, std::nullopt);
+        m_number_of_vertices = other.m_number_of_vertices;
+        m_number_of_indices = other.m_number_of_indices;
+    }
 
     ~MeshBuffer() = default;
 
@@ -204,7 +204,7 @@ class MeshBuffer {
 
     [[nodiscard]] auto get_index_buffer_address() const {
         if (!m_index_buffer) {
-            throw std::runtime_error(std::string("Error: No index buffer for mesh " + m_name + "!"));
+            throw std::runtime_error("Error: No index buffer for mesh available");
         }
 
         return m_index_buffer.value().allocation_info().pMappedData;
@@ -217,7 +217,7 @@ class MeshBuffer {
 
     void update_indices(const std::vector<IndexType> &indices) {
         if (!m_index_buffer) {
-            throw std::runtime_error(std::string("Error: No index buffer for mesh " + m_name + "!"));
+            throw std::runtime_error("Error: No index buffer for mesh available");
         }
 
         std::memcpy(m_index_buffer.value().allocation_info().pMappedData, indices.data(),

src/vulkan-renderer/io/nxoc_parser.cpp

@@ -76,7 +76,7 @@ ByteStream NXOCParser::serialize(const std::shared_ptr<const world::Cube> cube,
 
 std::shared_ptr<world::Cube> NXOCParser::deserialize(const ByteStream &stream) {
     ByteStreamReader reader(stream);
-    if (reader.read<std::string>(std::size_t(13)) != "Inexor Octree") {
+    if (reader.read<std::string>(13ull) != "Inexor Octree") {
         throw IoException("Wrong identifier.");
     }
     const auto version = reader.read<std::uint32_t>();

src/vulkan-renderer/world/cube.cpp

@@ -23,7 +23,7 @@ void Cube::remove_children() {
     }
 }
 
-std::shared_ptr<Cube> Cube::root() noexcept {
+std::shared_ptr<Cube> Cube::root() {
     std::shared_ptr<Cube> new_parent = m_parent.lock();
     if (!new_parent) {
         return shared_from_this();