Remove clang-format header reordering

MathewBensonCode · MathewBensonCode · commit 74f5fb01907c · 2025-07-25T23:47:07.000+03:00
diff --git a/.clang-format b/.clang-format
@@ -120,7 +120,7 @@ PenaltyBreakTemplateDeclaration: 100
 PenaltyReturnTypeOnItsOwnLine: 300
 PointerAlignment: Left
 ReflowComments: true
-SortIncludes: true
+SortIncludes: false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
diff --git a/.github/workflows/job-cmakebuild-windows-test.yml b/.github/workflows/job-cmakebuild-windows-test.yml
@@ -0,0 +1,32 @@
+# CMake build of ZEngine for Windows
+#
+name: Windows Build Workflow
+
+on:
+  push:
+    branches: [ header-reorganization ]
+
+jobs:
+  cmake-build:
+    name: cmake-build-windows-Debug-Test
+    runs-on: windows-2022
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Vcpkg
+        run: git clone --depth=1 https://github.com/Microsoft/vcpkg; bootstrap-vcpkg.bat
+        shell: pwsh
+       
+      - name: Install Vulkan
+        run: vcpkg install vulkan
+        shell: pwsh
+
+      - name: CMake Build
+        run: $env:CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"; .\Scripts\BuildEngine.ps1 -Configurations Debug -RunClangFormat 0
+        shell: pwsh
+
+      - name: Run Tests
+        shell: pwsh
+        run: .\Scripts\RunTests.ps1 -Configurations Debug
+
diff --git a/Scripts/PostBuild.ps1 b/Scripts/PostBuild.ps1
@@ -28,7 +28,7 @@ param (
     [string[]] $SystemName = 'Windows',
 
     [Parameter(HelpMessage="Architecture type to build, default to x64")]
-    [ValidateSet('win-x64', 'arm64', 'osx-x64', 'osx-arm64')]
+    [ValidateSet('win-x64', 'arm64', 'osx-x64', 'osx-arm64', 'linux-x64')]
     [string[]] $Architectures = 'win-x64',
 
     [Parameter(HelpMessage="Configuration type to build, default to Debug")]
@@ -133,4 +133,4 @@ foreach ($item in $ContentsToProcess) {
         [string]$ToDirectory = $content.To
         Write-Host "Copied $name --> $ToDirectory"
     }
-}
+}
diff --git a/Scripts/Shared.ps1 b/Scripts/Shared.ps1
@@ -214,6 +214,9 @@ function Find-ClangFormat () {
 }
 
 function Setup-ShaderCCompilerTool () {
+    if ($IsLinux) {
+        return
+    }
     $repoConfiguration = Get-RepositoryConfiguration
     $repositoryToolPath = $repoConfiguration.Paths.Tools
 
diff --git a/Tetragrama/Components/DockspaceUIComponent.cpp b/Tetragrama/Components/DockspaceUIComponent.cpp
@@ -7,7 +7,6 @@
 #include <Tetragrama/Messengers/Messenger.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
 #include <fmt/format.h>
-#include <imgui.h>
 #include <ImGuizmo/ImGuizmo.h>
 
 namespace fs = std::filesystem;
diff --git a/Tetragrama/Components/InspectorViewUIComponent.cpp b/Tetragrama/Components/InspectorViewUIComponent.cpp
@@ -1,4 +1,5 @@
 #include <Tetragrama/Components/InspectorViewUIComponent.h>
+#include <Tetragrama/Editor.h>
 #include <Tetragrama/Helpers/UIComponentDrawerHelper.h>
 #include <ZEngine/Core/Coroutine.h>
 #include <ZEngine/Helpers/MeshHelper.h>
@@ -7,7 +8,6 @@
 #include <ZEngine/Rendering/Components/MaterialComponent.h>
 #include <ZEngine/Rendering/Textures/Texture2D.h>
 #include <glm/gtx/matrix_decompose.hpp>
-#include <Tetragrama/Editor.h>
 
 using namespace ZEngine::Rendering::Materials;
 using namespace ZEngine::Rendering::Textures;
diff --git a/Tetragrama/Components/LogUIComponent.h b/Tetragrama/Components/LogUIComponent.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <Tetragrama/Components/UIComponent.h>
 #include <ZEngine/Core/Memory/Allocator.h>
+#include <ZEngine/Helpers/ThreadSafeQueue.h>
 #include <ZEngine/Logging/Logger.h>
 #include <atomic>
-#include <ZEngine/Helpers/ThreadSafeQueue.h>
 
 namespace Tetragrama::Components
 {
diff --git a/Tetragrama/Components/SceneViewportUIComponent.cpp b/Tetragrama/Components/SceneViewportUIComponent.cpp
@@ -5,8 +5,8 @@
 #include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
 #include <ZEngine/Windows/Inputs/KeyCodeDefinition.h>
 /**/
-#include <Tetragrama/Editor.h>
 #include <ImGuizmo/ImGuizmo.h>
+#include <Tetragrama/Editor.h>
 
 using namespace Tetragrama::Components::Event;
 using namespace ZEngine::Rendering::Renderers;
diff --git a/Tetragrama/Components/SceneViewportUIComponent.h b/Tetragrama/Components/SceneViewportUIComponent.h
@@ -1,10 +1,10 @@
 #pragma once
-#include <ZEngine/Rendering/Textures/Texture.h>
 #include <Tetragrama/Components/Events/SceneViewportFocusedEvent.h>
 #include <Tetragrama/Components/Events/SceneViewportResizedEvent.h>
 #include <Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h>
 #include <Tetragrama/Components/UIComponent.h>
 #include <Tetragrama/Messengers/Message.h>
+#include <ZEngine/Rendering/Textures/Texture.h>
 #include <imgui.h>
 #include <vulkan/vulkan.h>
 
diff --git a/Tetragrama/Editor.cpp b/Tetragrama/Editor.cpp
@@ -1,11 +1,11 @@
+#include <Tetragrama/Controllers/EditorCameraController.h>
 #include <Tetragrama/Editor.h>
+#include <Tetragrama/Managers/AssetManager.h>
 #include <Tetragrama/MessageToken.h>
 #include <Tetragrama/Messengers/Messenger.h>
-#include <Tetragrama/Controllers/EditorCameraController.h>
-#include <Tetragrama/Managers/AssetManager.h>
-#include <nlohmann/json.hpp>
 #include <ZEngine/ZEngineDef.h>
 #include <fmt/format.h>
+#include <nlohmann/json.hpp>
 
 using namespace ZEngine;
 using namespace ZEngine::Core::Containers;
diff --git a/Tetragrama/EntryPoint.cpp b/Tetragrama/EntryPoint.cpp
@@ -1,8 +1,8 @@
 #include <CLI/CLI.hpp>
+#include <Tetragrama/Editor.h>
 #include <ZEngine/Core/Memory/MemoryManager.h>
 #include <ZEngine/EngineConfiguration.h>
 #include <ZEngine/Logging/Logger.h>
-#include <Tetragrama/Editor.h>
 
 #ifdef ZENGINE_PLATFORM
 
diff --git a/Tetragrama/Layers/RenderLayer.h b/Tetragrama/Layers/RenderLayer.h
@@ -4,10 +4,10 @@
 #include <Tetragrama/Components/Events/SceneViewportResizedEvent.h>
 #include <Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h>
 #include <Tetragrama/Controllers/EditorCameraController.h>
+#include <Tetragrama/EditorScene.h>
 #include <Tetragrama/Messengers/Message.h>
 #include <ZEngine/Serializers/GraphicSceneSerializer.h>
 #include <ZEngine/Windows/Layers/Layer.h>
-#include <Tetragrama/EditorScene.h>
 
 namespace Tetragrama::Layers
 {
diff --git a/Tetragrama/Managers/AssetManager.cpp b/Tetragrama/Managers/AssetManager.cpp
@@ -1,5 +1,5 @@
-#include <Tetragrama/Managers/AssetManager.h>
 #include <Tetragrama/Importers/IAssetImporter.h>
+#include <Tetragrama/Managers/AssetManager.h>
 #include <ZEngine/Helpers/MemoryOperations.h>
 #include <ZEngine/Helpers/ThreadPool.h>
 #include <ZEngine/Rendering/Meshes/Mesh.h>
diff --git a/Tetragrama/pch.h b/Tetragrama/pch.h
@@ -6,6 +6,7 @@
 #include <filesystem>
 #include <fstream>
 #include <functional>
+#include <future>
 #include <iostream>
 #include <memory>
 #include <regex>
@@ -16,4 +17,3 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <future>
diff --git a/ZEngine/ZEngine/Core/Containers/Array.h b/ZEngine/ZEngine/Core/Containers/Array.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <ZEngine/Core/Memory/Allocator.h>
 #include <ZEngine/Core/Containers/InitializerList.h>
+#include <ZEngine/Core/Memory/Allocator.h>
 
 using namespace ZEngine::Core::Memory;
 
diff --git a/ZEngine/ZEngine/Core/IRenderable.h b/ZEngine/ZEngine/Core/IRenderable.h
@@ -1,10 +1,12 @@
 #pragma once
 
-namespace ZEngine::Rendering::Renderers{
+namespace ZEngine::Rendering::Renderers
+{
     struct GraphicRenderer;
 }
 
-namespace ZEngine::Hardwares{
+namespace ZEngine::Hardwares
+{
     struct CommandBuffer;
 }
 
diff --git a/ZEngine/ZEngine/Engine.h b/ZEngine/ZEngine/Engine.h
@@ -1,22 +1,27 @@
 #pragma once
 
-namespace ZEngine::Hardwares{
+namespace ZEngine::Hardwares
+{
     struct VulkanDevice;
 }
 
-namespace ZEngine::Rendering::Renderers{
+namespace ZEngine::Rendering::Renderers
+{
     struct AsyncResourceLoader;
 }
 
-namespace ZEngine::Windows{
+namespace ZEngine::Windows
+{
     struct CoreWindow;
 }
 
-namespace ZEngine::Core::Memory{
+namespace ZEngine::Core::Memory
+{
     struct ArenaAllocator;
 }
 
-namespace ZEngine::Event{
+namespace ZEngine::Event
+{
     struct EngineClosedEvent;
 }
 
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp b/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
@@ -1,12 +1,11 @@
-#include <ZEngine/ZEngineDef.h>
 #include <ZEngine/Rendering/Renderers/RenderPasses/RenderPass.h>
+#include <ZEngine/ZEngineDef.h>
 
 /*
  * We define those Macros before inclusion of VulkanDevice.h so we can enable impl from VMA header
  */
 #define VMA_IMPLEMENTATION
 #define VMA_VULKAN_VERSION 1003000 // Vulkan 1.3
-#include <vk_mem_alloc.h>
 #include <ZEngine/Hardwares/VulkanDevice.h>
 #include <ZEngine/Helpers/MemoryOperations.h>
 #include <ZEngine/Helpers/ThreadPool.h>
@@ -15,6 +14,7 @@
 #include <ZEngine/Rendering/Renderers/RenderPasses/Attachment.h>
 #include <ZEngine/Rendering/Shaders/Shader.h>
 #include <ZEngine/Windows/CoreWindow.h>
+#include <vk_mem_alloc.h>
 
 using namespace std::chrono_literals;
 using namespace ZEngine::Rendering::Primitives;
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.h b/ZEngine/ZEngine/Hardwares/VulkanDevice.h
@@ -553,7 +553,7 @@ namespace ZEngine::Hardwares
         VkPhysicalDeviceFeatures                                                            PhysicalDeviceFeature              = {};
         VkPhysicalDeviceMemoryProperties                                                    PhysicalDeviceMemoryProperties     = {};
         VkSwapchainKHR                                                                      SwapchainHandle                    = VK_NULL_HANDLE;
-        VmaAllocator                                                                        VmaAllocatorValue                       = nullptr;
+        VmaAllocator                                                                        VmaAllocatorValue                  = nullptr;
         Core::Containers::Array<VkFormat>                                                   DefaultDepthFormats                = {};
         Rendering::Renderers::RenderPasses::Attachment*                                     SwapchainAttachment                = {};
         Core::Containers::Array<VkImageView>                                                SwapchainImageViews                = {};
diff --git a/ZEngine/ZEngine/Helpers/HandleManager.h b/ZEngine/ZEngine/Helpers/HandleManager.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <ZEngine/Helpers/MemoryOperations.h>
 #include <ZEngine/Core/Containers/Array.h>
 #include <ZEngine/Core/Memory/Allocator.h>
+#include <ZEngine/Helpers/MemoryOperations.h>
 #include <ZEngine/ZEngineDef.h>
 #include <shared_mutex>
 
diff --git a/ZEngine/ZEngine/Rendering/Renderers/GraphicRenderer.cpp b/ZEngine/ZEngine/Rendering/Renderers/GraphicRenderer.cpp
@@ -1,11 +1,10 @@
 #include <ZEngine/Helpers/ThreadPool.h>
-#include <ZEngine/Rendering/Renderers/ImGUIRenderer.h>
-#include <ZEngine/Rendering/Renderers/RendererPasses.h>
-#include <ZEngine/Rendering/Specifications/FormatSpecification.h>
-#include <ZEngine/Helpers/ThreadPool.h>
 #include <ZEngine/Rendering/Buffers/Bitmap.h>
 #include <ZEngine/Rendering/Renderers/Contracts/RendererDataContract.h>
 #include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
+#include <ZEngine/Rendering/Renderers/ImGUIRenderer.h>
+#include <ZEngine/Rendering/Renderers/RendererPasses.h>
+#include <ZEngine/Rendering/Specifications/FormatSpecification.h>
 
 #define STB_IMAGE_IMPLEMENTATION
 #ifdef __GNUC__
diff --git a/ZEngine/ZEngine/Rendering/Renderers/GraphicRenderer.h b/ZEngine/ZEngine/Rendering/Renderers/GraphicRenderer.h
@@ -1,13 +1,13 @@
 #pragma once
+#include <ZEngine/Hardwares/VulkanDevice.h>
+#include <ZEngine/Helpers/ThreadSafeQueue.h>
 #include <ZEngine/Rendering/Cameras/Camera.h>
-#include <ZEngine/Rendering/Renderers/ImGUIRenderer.h>
 #include <ZEngine/Rendering/Primitives/Fence.h>
 #include <ZEngine/Rendering/Primitives/Semaphore.h>
+#include <ZEngine/Rendering/Renderers/ImGUIRenderer.h>
+#include <ZEngine/Rendering/Renderers/RenderGraph.h>
 #include <ZEngine/Rendering/Renderers/RenderPasses/RenderPass.h>
 #include <ZEngine/Rendering/Textures/Texture.h>
-#include <ZEngine/Hardwares/VulkanDevice.h>
-#include <ZEngine/Helpers/ThreadSafeQueue.h>
-#include <ZEngine/Rendering/Renderers/RenderGraph.h>
 #include <vulkan/vulkan.h>
 #include <span>
 
diff --git a/ZEngine/ZEngine/Rendering/Renderers/ImGUIRenderer.cpp b/ZEngine/ZEngine/Rendering/Renderers/ImGUIRenderer.cpp
@@ -1,5 +1,5 @@
-#include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
 #include <ZEngine/Hardwares/VulkanDevice.h>
+#include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
 #include <ZEngine/Rendering/Renderers/ImGUIRenderer.h>
 #include <ZEngine/Windows/CoreWindow.h>
 #include <backends/imgui_impl_glfw.h>
diff --git a/ZEngine/ZEngine/Rendering/Renderers/RenderGraph.h b/ZEngine/ZEngine/Rendering/Renderers/RenderGraph.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <ZEngine/Rendering/Buffers/Framebuffer.h>
 #include <ZEngine/Core/Containers/Array.h>
 #include <ZEngine/Core/Containers/HashMap.h>
 #include <ZEngine/Hardwares/VulkanDevice.h>
+#include <ZEngine/Rendering/Buffers/Framebuffer.h>
 #include <ZEngine/Rendering/Renderers/RenderPasses/RenderPass.h>
 #include <ZEngine/Rendering/Scenes/GraphicScene.h>
 #include <ZEngine/Rendering/Specifications/TextureSpecification.h>
diff --git a/ZEngine/ZEngine/Rendering/Renderers/RendererPasses.h b/ZEngine/ZEngine/Rendering/Renderers/RendererPasses.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <ZEngine/Rendering/Renderers/RenderGraph.h>
 #include <ZEngine/Core/Containers/Array.h>
+#include <ZEngine/Rendering/Renderers/RenderGraph.h>
 #include <ZEngine/Rendering/Renderers/RenderPasses/RenderPass.h>
 #include <ZEngine/Rendering/Scenes/GraphicScene.h>
 #include <ZEngine/ZEngineDef.h>
diff --git a/ZEngine/ZEngine/Rendering/Scenes/GraphicScene.cpp b/ZEngine/ZEngine/Rendering/Scenes/GraphicScene.cpp
@@ -157,7 +157,7 @@ namespace ZEngine::Rendering::Scenes
         SceneData->Indices       = {0};
         SceneData->Materials     = {Meshes::MeshMaterial{}};
         SceneData->MaterialFiles = {Meshes::MaterialFile{}};
-        SceneData->DrawDataValue      = {
+        SceneData->DrawDataValue = {
             DrawData{.TransformIndex = 0, .VertexOffset = 0, .IndexOffset = 0, .VertexCount = 1, .IndexCount = 1}
         };
     }
diff --git a/ZEngine/ZEngine/Rendering/Scenes/GraphicScene.h b/ZEngine/ZEngine/Rendering/Scenes/GraphicScene.h
@@ -1,8 +1,8 @@
 ﻿#pragma once
-#include <ZEngine/Rendering/Textures/Texture.h>
 #include <ZEngine/Hardwares/VulkanDevice.h>
 #include <ZEngine/Rendering/Lights/Light.h>
 #include <ZEngine/Rendering/Meshes/Mesh.h>
+#include <ZEngine/Rendering/Textures/Texture.h>
 #include <ZEngine/ZEngineDef.h>
 #include <entt/entt.hpp>
 #include <uuid.h>
@@ -75,7 +75,7 @@ namespace ZEngine::Rendering::Scenes
          */
         std::vector<float>                         Vertices                     = {};
         std::vector<uint32_t>                      Indices                      = {};
-        std::vector<DrawData>                      DrawDataValue                     = {};
+        std::vector<DrawData>                      DrawDataValue                = {};
         std::vector<std::string>                   Names                        = {};
         std::vector<std::string>                   MaterialNames                = {};
         std::unordered_map<uint32_t, uint32_t>     NodeMeshes                   = {};
diff --git a/ZEngine/ZEngine/Rendering/Specifications/GraphicRendererPipelineSpecification.h b/ZEngine/ZEngine/Rendering/Specifications/GraphicRendererPipelineSpecification.h
@@ -29,7 +29,7 @@ namespace ZEngine::Rendering::Specifications
         uint32_t                                                   DepthCompareOp                     = VK_COMPARE_OP_LESS_OR_EQUAL;
         bool                                                       EnableStencilTest                  = false;
         const char*                                                DebugName                          = {};
-        ShaderSpecification                                        ShaderSpecificationValue                = {};
+        ShaderSpecification                                        ShaderSpecificationValue           = {};
         Rendering::Buffers::FramebufferVNext*                      TargetFrameBuffer                  = {};
         Renderers::RenderPasses::Attachment*                       Attachment                         = {};
         Core::Containers::Array<VertexInputBindingSpecification>   VertexInputBindingSpecifications   = {};
diff --git a/ZEngine/ZEngine/Rendering/Specifications/TextureSpecification.h b/ZEngine/ZEngine/Rendering/Specifications/TextureSpecification.h
@@ -40,7 +40,7 @@ namespace ZEngine::Rendering::Specifications
         VkFormat              ImageFormat;
         VkImageUsageFlags     ImageUsage;
         VkImageAspectFlagBits ImageAspectFlag;
-        uint32_t              LayerCount      = 1U;
+        uint32_t              LayerCount           = 1U;
         ImageCreateFlag       ImageCreateFlagValue = ImageCreateFlag::NONE;
     };
 
diff --git a/ZEngine/ZEngine/Rendering/Textures/Texture.h b/ZEngine/ZEngine/Rendering/Textures/Texture.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <ZEngine/Rendering/Specifications/TextureSpecification.h>
 #include <ZEngine/Helpers/HandleManager.h>
 #include <ZEngine/Helpers/IntrusivePtr.h>
+#include <ZEngine/Rendering/Specifications/TextureSpecification.h>
 #include <vulkan/vulkan.h>
 
 namespace ZEngine::Hardwares
diff --git a/ZEngine/ZEngine/Windows/CoreWindow.cpp b/ZEngine/ZEngine/Windows/CoreWindow.cpp
@@ -1,6 +1,6 @@
 #include <ZEngine/Windows/CoreWindow.h>
-#include <ZEngine/Windows/WindowConfiguration.h>
 #include <ZEngine/Windows/Layers/Layer.h>
+#include <ZEngine/Windows/WindowConfiguration.h>
 
 using namespace ZEngine::Windows::Layers;
 using namespace ZEngine::Helpers;
diff --git a/ZEngine/ZEngine/Windows/Events/KeyEvent.h b/ZEngine/ZEngine/Windows/Events/KeyEvent.h
diff --git a/ZEngine/ZEngine/Windows/Inputs/KeyCode.h b/ZEngine/ZEngine/Windows/Inputs/KeyCode.h
diff --git a/ZEngine/ZEngine/pch.h b/ZEngine/ZEngine/pch.h
diff --git a/ZEngine/tests/Memory/IntrusivePtr_test.cpp b/ZEngine/tests/Memory/IntrusivePtr_test.cpp
diff --git a/ZEngine/tests/Memory/IntrusiveWeakPtr_test.cpp b/ZEngine/tests/Memory/IntrusiveWeakPtr_test.cpp
diff --git a/ZEngine/tests/Memory/MemoryOperation_test.cpp b/ZEngine/tests/Memory/MemoryOperation_test.cpp
diff --git a/ZEngine/tests/Misc/ThreadPool_test.cpp b/ZEngine/tests/Misc/ThreadPool_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,9 @@ function Find-ClangFormat () {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`function Setup-ShaderCCompilerTool () {`
	`217`	`+ if ($IsLinux) {`
	`218`	`+ return`
	`219`	`+ }`
`217`	`220`	`$repoConfiguration = Get-RepositoryConfiguration`
`218`	`221`	`$repositoryToolPath = $repoConfiguration.Paths.Tools`
`219`	`222`