move files to src/; add SonarCloud analysis

WinteryFox · Nov 9, 2023 · 843941e · 843941e
1 parent 302772f
commit 843941e
Show file tree

Hide file tree

Showing 92 changed files with 62 additions and 28 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -5,18 +5,19 @@ on:
     branches: [ "main", "staging" ]
   pull_request:
     branches: [ "main", "staging" ]
+    types: [ "opened", "synchronize", "reopened" ]
 
 jobs:
   build:
-    runs-on: [self-hosted]
+    runs-on: [ self-hosted ]
 
     strategy:
       fail-fast: false
 
       matrix:
-        os: [ubuntu-latest]
-        build_type: [Release]
-        c_compiler: [gcc, clang]
+        os: [ ubuntu-latest ]
+        build_type: [ Release ]
+        c_compiler: [ gcc, clang ]
         include:
           - os: ubuntu-latest
             c_compiler: gcc
@@ -26,25 +27,41 @@ jobs:
             cpp_compiler: clang++
 
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Set reusable strings
-      id: strings
-      shell: bash
-      run: |
-        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
-
-    - name: Configure CMake
-      run: >
-        cmake -B ${{ steps.strings.outputs.build-output-dir }}
-        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -S ${{ github.workspace }}
-
-    - name: Build
-      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
-
-    - name: Test
-      working-directory: ${{ steps.strings.outputs.build-output-dir }}
-      run: ctest --build-config ${{ matrix.build_type }}
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set reusable strings
+        id: strings
+        shell: bash
+        run: |
+          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+      - name: Configure CMake
+        run: >
+          cmake -B ${{ steps.strings.outputs.build-output-dir }}
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -S ${{ github.workspace }}
+
+      - name: Build
+        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+      - name: Test
+        working-directory: ${{ steps.strings.outputs.build-output-dir }}
+        run: ctest --build-config ${{ matrix.build_type }}
+
+  analyze:
+    runs-on: [ self-hosted ]
+
+    steps:
+      - name: Install sonar-scanner and build-wrapper
+        uses: SonarSource/sonarcloud-github-c-cpp@v2
+
+      - name: Run sonar-scanner
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          sonar-scanner --define sonar.cfamily.compile-commands="${{ steps.strings.outputs.build-output-dir }}/compile_commands.json"
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,7 @@ Makefile*
 *build-*
 *.qm
 *.prl
+QtSettings.qml
 
 # Qt unit tests
 target_wrapper.*

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # Statically linking to libstd with C++23 causes a linker bug
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110572
 # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc -static")
@@ -28,8 +29,8 @@ if (CMAKE_BUILD_TYPE MATCHES "Debug")
     add_definitions(-DDEBUG)
 endif ()
 
-add_subdirectory(engine)
+add_subdirectory(src/engine)
 
 if (ENABLE_EDITOR)
-    add_subdirectory(editor)
+    add_subdirectory(src/editor)
 endif ()
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,13 @@
+# Project settings
+sonar.projectKey=WinteryFox_Vixen
+sonar.organization=winteryfox
+
+# Sonar web UI settings
+sonar.projectName=Vixen
+sonar.projectVersion=1.0
+
+# Analysis settings
+sonar.sources=src
+sonar.cfamily.analysisCache.mode=fs
+sonar.cfamily.analysisCache.path=.sonarcache
+sonar.sourceEncoding=UTF-8
diff --git a/editor/CMakeLists.txt → src/editor/CMakeLists.txt b/editor/CMakeLists.txt → src/editor/CMakeLists.txt
diff --git a/editor/main.cpp → src/editor/main.cpp b/editor/main.cpp → src/editor/main.cpp
diff --git a/editor/shaders/triangle.frag → src/editor/shaders/triangle.frag b/editor/shaders/triangle.frag → src/editor/shaders/triangle.frag
diff --git a/editor/shaders/triangle.vert → src/editor/shaders/triangle.vert b/editor/shaders/triangle.vert → src/editor/shaders/triangle.vert
diff --git a/editor/ui/Dock.qml → src/editor/ui/Dock.qml b/editor/ui/Dock.qml → src/editor/ui/Dock.qml
diff --git a/editor/ui/Viewport.qml → src/editor/ui/Viewport.qml b/editor/ui/Viewport.qml → src/editor/ui/Viewport.qml
diff --git a/editor/ui/main.qml → src/editor/ui/main.qml b/editor/ui/main.qml → src/editor/ui/main.qml
diff --git a/engine/Blending.h → src/engine/Blending.h b/engine/Blending.h → src/engine/Blending.h
diff --git a/engine/Buffer.cpp → src/engine/Buffer.cpp b/engine/Buffer.cpp → src/engine/Buffer.cpp
diff --git a/engine/Buffer.h → src/engine/Buffer.h b/engine/Buffer.h → src/engine/Buffer.h
diff --git a/engine/CMakeLists.txt → src/engine/CMakeLists.txt b/engine/CMakeLists.txt → src/engine/CMakeLists.txt
diff --git a/engine/Camera.cpp → src/engine/Camera.cpp b/engine/Camera.cpp → src/engine/Camera.cpp
diff --git a/engine/Camera.h → src/engine/Camera.h b/engine/Camera.h → src/engine/Camera.h
diff --git a/engine/Context.h → src/engine/Context.h b/engine/Context.h → src/engine/Context.h
diff --git a/engine/Entity.h → src/engine/Entity.h b/engine/Entity.h → src/engine/Entity.h
diff --git a/engine/Framebuffer.h → src/engine/Framebuffer.h b/engine/Framebuffer.h → src/engine/Framebuffer.h
diff --git a/engine/Material.h → src/engine/Material.h b/engine/Material.h → src/engine/Material.h
diff --git a/engine/Mesh.h → src/engine/Mesh.h b/engine/Mesh.h → src/engine/Mesh.h
diff --git a/engine/Monitor.h → src/engine/Monitor.h b/engine/Monitor.h → src/engine/Monitor.h
diff --git a/engine/RenderPass.h → src/engine/RenderPass.h b/engine/RenderPass.h → src/engine/RenderPass.h
diff --git a/engine/Renderer.h → src/engine/Renderer.h b/engine/Renderer.h → src/engine/Renderer.h
diff --git a/engine/ShaderModule.h → src/engine/ShaderModule.h b/engine/ShaderModule.h → src/engine/ShaderModule.h
diff --git a/engine/ShaderProgram.h → src/engine/ShaderProgram.h b/engine/ShaderProgram.h → src/engine/ShaderProgram.h
diff --git a/engine/Util.h → src/engine/Util.h b/engine/Util.h → src/engine/Util.h
diff --git a/engine/Vixen.h → src/engine/Vixen.h b/engine/Vixen.h → src/engine/Vixen.h
diff --git a/engine/Window.cpp → src/engine/Window.cpp b/engine/Window.cpp → src/engine/Window.cpp
diff --git a/engine/Window.h → src/engine/Window.h b/engine/Window.h → src/engine/Window.h
diff --git a/engine/gl/CMakeLists.txt → src/engine/gl/CMakeLists.txt b/engine/gl/CMakeLists.txt → src/engine/gl/CMakeLists.txt
diff --git a/engine/gl/GlBuffer.cpp → src/engine/gl/GlBuffer.cpp b/engine/gl/GlBuffer.cpp → src/engine/gl/GlBuffer.cpp
diff --git a/engine/gl/GlBuffer.h → src/engine/gl/GlBuffer.h b/engine/gl/GlBuffer.h → src/engine/gl/GlBuffer.h
diff --git a/engine/gl/GlRenderer.cpp → src/engine/gl/GlRenderer.cpp b/engine/gl/GlRenderer.cpp → src/engine/gl/GlRenderer.cpp
diff --git a/engine/gl/GlRenderer.h → src/engine/gl/GlRenderer.h b/engine/gl/GlRenderer.h → src/engine/gl/GlRenderer.h
diff --git a/engine/gl/GlShaderModule.cpp → src/engine/gl/GlShaderModule.cpp b/engine/gl/GlShaderModule.cpp → src/engine/gl/GlShaderModule.cpp
diff --git a/engine/gl/GlShaderModule.h → src/engine/gl/GlShaderModule.h b/engine/gl/GlShaderModule.h → src/engine/gl/GlShaderModule.h
diff --git a/engine/gl/GlShaderProgram.cpp → src/engine/gl/GlShaderProgram.cpp b/engine/gl/GlShaderProgram.cpp → src/engine/gl/GlShaderProgram.cpp
diff --git a/engine/gl/GlShaderProgram.h → src/engine/gl/GlShaderProgram.h b/engine/gl/GlShaderProgram.h → src/engine/gl/GlShaderProgram.h
diff --git a/engine/gl/GlVertexArrayObject.cpp → src/engine/gl/GlVertexArrayObject.cpp b/engine/gl/GlVertexArrayObject.cpp → src/engine/gl/GlVertexArrayObject.cpp
diff --git a/engine/gl/GlVertexArrayObject.h → src/engine/gl/GlVertexArrayObject.h b/engine/gl/GlVertexArrayObject.h → src/engine/gl/GlVertexArrayObject.h
diff --git a/engine/gl/GlVixen.cpp → src/engine/gl/GlVixen.cpp b/engine/gl/GlVixen.cpp → src/engine/gl/GlVixen.cpp
diff --git a/engine/gl/GlVixen.h → src/engine/gl/GlVixen.h b/engine/gl/GlVixen.h → src/engine/gl/GlVixen.h
diff --git a/engine/gl/GlWindow.cpp → src/engine/gl/GlWindow.cpp b/engine/gl/GlWindow.cpp → src/engine/gl/GlWindow.cpp
diff --git a/engine/gl/GlWindow.h → src/engine/gl/GlWindow.h b/engine/gl/GlWindow.h → src/engine/gl/GlWindow.h
diff --git a/engine/gl/test/main.cpp → src/engine/gl/test/main.cpp b/engine/gl/test/main.cpp → src/engine/gl/test/main.cpp
diff --git a/engine/vk/CMakeLists.txt → src/engine/vk/CMakeLists.txt b/engine/vk/CMakeLists.txt → src/engine/vk/CMakeLists.txt
diff --git a/engine/vk/Device.cpp → src/engine/vk/Device.cpp b/engine/vk/Device.cpp → src/engine/vk/Device.cpp
diff --git a/engine/vk/Device.h → src/engine/vk/Device.h b/engine/vk/Device.h → src/engine/vk/Device.h
diff --git a/engine/vk/GraphicsCard.h → src/engine/vk/GraphicsCard.h b/engine/vk/GraphicsCard.h → src/engine/vk/GraphicsCard.h
diff --git a/engine/vk/Instance.cpp → src/engine/vk/Instance.cpp b/engine/vk/Instance.cpp → src/engine/vk/Instance.cpp
diff --git a/engine/vk/Instance.h → src/engine/vk/Instance.h b/engine/vk/Instance.h → src/engine/vk/Instance.h
diff --git a/engine/vk/Swapchain.cpp → src/engine/vk/Swapchain.cpp b/engine/vk/Swapchain.cpp → src/engine/vk/Swapchain.cpp
diff --git a/engine/vk/Swapchain.h → src/engine/vk/Swapchain.h b/engine/vk/Swapchain.h → src/engine/vk/Swapchain.h
diff --git a/engine/vk/VkBuffer.cpp → src/engine/vk/VkBuffer.cpp b/engine/vk/VkBuffer.cpp → src/engine/vk/VkBuffer.cpp
diff --git a/engine/vk/VkBuffer.h → src/engine/vk/VkBuffer.h b/engine/vk/VkBuffer.h → src/engine/vk/VkBuffer.h
diff --git a/engine/vk/VkCommandBuffer.cpp → src/engine/vk/VkCommandBuffer.cpp b/engine/vk/VkCommandBuffer.cpp → src/engine/vk/VkCommandBuffer.cpp
diff --git a/engine/vk/VkCommandBuffer.h → src/engine/vk/VkCommandBuffer.h b/engine/vk/VkCommandBuffer.h → src/engine/vk/VkCommandBuffer.h
diff --git a/engine/vk/VkCommandPool.cpp → src/engine/vk/VkCommandPool.cpp b/engine/vk/VkCommandPool.cpp → src/engine/vk/VkCommandPool.cpp
diff --git a/engine/vk/VkCommandPool.h → src/engine/vk/VkCommandPool.h b/engine/vk/VkCommandPool.h → src/engine/vk/VkCommandPool.h
diff --git a/engine/vk/VkFence.cpp → src/engine/vk/VkFence.cpp b/engine/vk/VkFence.cpp → src/engine/vk/VkFence.cpp
diff --git a/engine/vk/VkFence.h → src/engine/vk/VkFence.h b/engine/vk/VkFence.h → src/engine/vk/VkFence.h
diff --git a/engine/vk/VkFramebuffer.cpp → src/engine/vk/VkFramebuffer.cpp b/engine/vk/VkFramebuffer.cpp → src/engine/vk/VkFramebuffer.cpp
diff --git a/engine/vk/VkFramebuffer.h → src/engine/vk/VkFramebuffer.h b/engine/vk/VkFramebuffer.h → src/engine/vk/VkFramebuffer.h
diff --git a/engine/vk/VkImage.cpp → src/engine/vk/VkImage.cpp b/engine/vk/VkImage.cpp → src/engine/vk/VkImage.cpp
diff --git a/engine/vk/VkImage.h → src/engine/vk/VkImage.h b/engine/vk/VkImage.h → src/engine/vk/VkImage.h
diff --git a/engine/vk/VkImageView.cpp → src/engine/vk/VkImageView.cpp b/engine/vk/VkImageView.cpp → src/engine/vk/VkImageView.cpp
diff --git a/engine/vk/VkImageView.h → src/engine/vk/VkImageView.h b/engine/vk/VkImageView.h → src/engine/vk/VkImageView.h
diff --git a/engine/vk/VkPipeline.cpp → src/engine/vk/VkPipeline.cpp b/engine/vk/VkPipeline.cpp → src/engine/vk/VkPipeline.cpp
diff --git a/engine/vk/VkPipeline.h → src/engine/vk/VkPipeline.h b/engine/vk/VkPipeline.h → src/engine/vk/VkPipeline.h
diff --git a/engine/vk/VkPipelineLayout.cpp → src/engine/vk/VkPipelineLayout.cpp b/engine/vk/VkPipelineLayout.cpp → src/engine/vk/VkPipelineLayout.cpp
diff --git a/engine/vk/VkPipelineLayout.h → src/engine/vk/VkPipelineLayout.h b/engine/vk/VkPipelineLayout.h → src/engine/vk/VkPipelineLayout.h
diff --git a/engine/vk/VkRenderPass.cpp → src/engine/vk/VkRenderPass.cpp b/engine/vk/VkRenderPass.cpp → src/engine/vk/VkRenderPass.cpp
diff --git a/engine/vk/VkRenderPass.h → src/engine/vk/VkRenderPass.h b/engine/vk/VkRenderPass.h → src/engine/vk/VkRenderPass.h
diff --git a/engine/vk/VkRenderer.cpp → src/engine/vk/VkRenderer.cpp b/engine/vk/VkRenderer.cpp → src/engine/vk/VkRenderer.cpp
diff --git a/engine/vk/VkRenderer.h → src/engine/vk/VkRenderer.h b/engine/vk/VkRenderer.h → src/engine/vk/VkRenderer.h
diff --git a/engine/vk/VkSemaphore.cpp → src/engine/vk/VkSemaphore.cpp b/engine/vk/VkSemaphore.cpp → src/engine/vk/VkSemaphore.cpp
diff --git a/engine/vk/VkSemaphore.h → src/engine/vk/VkSemaphore.h b/engine/vk/VkSemaphore.h → src/engine/vk/VkSemaphore.h
diff --git a/engine/vk/VkShaderModule.cpp → src/engine/vk/VkShaderModule.cpp b/engine/vk/VkShaderModule.cpp → src/engine/vk/VkShaderModule.cpp
diff --git a/engine/vk/VkShaderModule.h → src/engine/vk/VkShaderModule.h b/engine/vk/VkShaderModule.h → src/engine/vk/VkShaderModule.h
diff --git a/engine/vk/VkShaderProgram.cpp → src/engine/vk/VkShaderProgram.cpp b/engine/vk/VkShaderProgram.cpp → src/engine/vk/VkShaderProgram.cpp
diff --git a/engine/vk/VkShaderProgram.h → src/engine/vk/VkShaderProgram.h b/engine/vk/VkShaderProgram.h → src/engine/vk/VkShaderProgram.h
diff --git a/engine/vk/VkVixen.cpp → src/engine/vk/VkVixen.cpp b/engine/vk/VkVixen.cpp → src/engine/vk/VkVixen.cpp
diff --git a/engine/vk/VkVixen.h → src/engine/vk/VkVixen.h b/engine/vk/VkVixen.h → src/engine/vk/VkVixen.h
diff --git a/engine/vk/VkWindow.cpp → src/engine/vk/VkWindow.cpp b/engine/vk/VkWindow.cpp → src/engine/vk/VkWindow.cpp
diff --git a/engine/vk/VkWindow.h → src/engine/vk/VkWindow.h b/engine/vk/VkWindow.h → src/engine/vk/VkWindow.h
diff --git a/engine/vk/Vulkan.h → src/engine/vk/Vulkan.h b/engine/vk/Vulkan.h → src/engine/vk/Vulkan.h
diff --git a/engine/vk/test/main.cpp → src/engine/vk/test/main.cpp b/engine/vk/test/main.cpp → src/engine/vk/test/main.cpp
diff --git a/engine/vk/test/texture.jpg → src/engine/vk/test/texture.jpg b/engine/vk/test/texture.jpg → src/engine/vk/test/texture.jpg
diff --git a/engine/vk/test/vikingroom.glb → src/engine/vk/test/vikingroom.glb b/engine/vk/test/vikingroom.glb → src/engine/vk/test/vikingroom.glb