Header Reorganization and submodule upgrade

- Remove Pre-Compiled Headers
- Updated the version of Submodules to remove bugs and compiler errors
  already solved by the upstream projects such as Assimp and GLM.
- The newer packages improve cross-platform compilation, particularly on
  linux

Author: MathewBensonCode

.clang-format

@@ -120,7 +120,7 @@ PenaltyBreakTemplateDeclaration: 100
 PenaltyReturnTypeOnItsOwnLine: 300
 PointerAlignment: Left
 ReflowComments: true
-SortIncludes: true
+SortIncludes: false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false

.github/workflows/Engine-CI.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ master, develop, arena-integration ]
+    branches: [ master, develop, arena-integration, no-pch ]
   pull_request:
     branches: [ master, develop, arena-integration ]
 

.gitmodules

@@ -5,7 +5,7 @@
 	path = __externals/stb
 	url = https://github.com/nothings/stb
 [submodule "__externals/imgui/src"]
-	path = __externals/imgui/src
+	path = __externals/imgui/imgui
 	url = https://github.com/ocornut/imgui
 [submodule "__externals/spdlog"]
 	path = __externals/spdlog
@@ -59,11 +59,11 @@
 	path = __externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "__externals/tlsf/src"]
-	path = __externals/tlsf/src
+	path = __externals/tlsf/tlsf
 	url = https://github.com/mattconte/tlsf
 [submodule "__externals/CLI11"]
 	path = __externals/CLI11
 	url = https://github.com/CLIUtils/CLI11
 [submodule "__externals/rapidhash/src"]
-	path = __externals/rapidhash/src
+	path = __externals/rapidhash/rapidhash
 	url = https://github.com/Nicoshev/rapidhash

CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required (VERSION 3.17 FATAL_ERROR)
 
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set	(CMAKE_CXX_STANDARD 20)
+set (CMAKE_CXX_EXTENSIONS OFF)
+
 project (RendererEngine
 	VERSION 1.0
 	DESCRIPTION "Renderer Engine is an open-source 2D - 3D rendering engine written in C/C++"
@@ -42,30 +46,10 @@ endif()
 # Externals dependencies
 #
 if (NOT LAUNCHER_ONLY)
-	add_subdirectory (${EXTERNAL_DIR}/fmt)
-	add_subdirectory (${EXTERNAL_DIR}/imgui)
-	add_subdirectory (${EXTERNAL_DIR}/glfw)
-	add_subdirectory (${EXTERNAL_DIR}/spdlog)
-	add_subdirectory (${EXTERNAL_DIR}/glm)
-	add_subdirectory (${EXTERNAL_DIR}/entt)
-	add_subdirectory (${EXTERNAL_DIR}/assimp)
-	add_subdirectory (${EXTERNAL_DIR}/stduuid)
-	add_subdirectory (${EXTERNAL_DIR}/yaml-cpp)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-headers)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Tools)
-	add_subdirectory (${EXTERNAL_DIR}/glslang)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Cross)
-	add_subdirectory (${EXTERNAL_DIR}/gtest)
-	add_subdirectory (${EXTERNAL_DIR}/VulkanMemoryAllocator)
-	add_subdirectory (${EXTERNAL_DIR}/tlsf)
-	add_subdirectory (${EXTERNAL_DIR}/rapidhash)
-	add_subdirectory (${EXTERNAL_DIR}/CLI11)
-
-	set (CMAKE_PREFIX_PATH
-		${CMAKE_PREFIX_PATH}
-		${EXTERNAL_DIR}/Vulkan-Headers/build/install/share/cmake
-	)
-	add_subdirectory (${EXTERNAL_DIR}/Vulkan-Loader)
+
+    ## Setup Dependencies
+
+    include(${EXTERNAL_DIR}/externals.cmake)
 
 	# Core engine lib is here
 	#

Scripts/BuildEngine.ps1

@@ -113,7 +113,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     # Check the system name
     if ($IsLinux) {
         $systemName = "Linux"
-        $cMakeGenerator
     }
     elseif ($IsMacOS) {
         $systemName = "Darwin"
@@ -152,7 +151,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         'SPIRV_TOOLS' = @("-DSPIRV_SKIP_EXECUTABLES=ON", "-DSPIRV_SKIP_TESTS=ON")
         'SPIRV_CROSS' = @("-DSPIRV_CROSS_ENABLE_TESTS=OFF")
         'LAUNCHER_ONLY' = @("-DLAUNCHER_ONLY=ON")
-        'GLM'       = @("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
     }
 
     $cMakeCacheVariableOverride = $cMakeOptions -join ' '
@@ -171,11 +169,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
             $cMakeCacheVariableOverride += ' -DCMAKE_CONFIGURATION_TYPES=Debug;Release '
         }
         "Linux" {
-            $cMakeGenerator = "-G `"Unix Makefiles`""
-
-            # Set Linux build compiler
-            $env:CC = '/usr/bin/gcc-11'
-            $env:CXX = '/usr/bin/g++-11'
+            $cMakeGenerator = "-G Ninja"
         }
         "Darwin" {
             $cMakeGenerator = "-G `"Xcode`""

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")]
@@ -103,7 +103,7 @@ $ContentsToProcess = @(
                     }
                 }
                 "Linux" {
-                    @{ From = "$OuputBuildDirectory\Tetragrama\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\$TargetFramework\Editor"}
+                    @{ From = "$OuputBuildDirectory\Tetragrama\"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\$TargetFramework\Editor"}
                 }
                 Default {
                     throw 'This system is not supported'
@@ -133,4 +133,4 @@ foreach ($item in $ContentsToProcess) {
         [string]$ToDirectory = $content.To
         Write-Host "Copied $name --> $ToDirectory"
     }
-}
+}

Scripts/Shared.ps1

@@ -186,7 +186,6 @@ function Find-GlslangValidator () {
 function Find-ClangFormat () {
     $repoConfiguration = Get-RepositoryConfiguration
     $LLVMMinimumVersion = $repoConfiguration.Requirements.LLVM.Version
-    $LLVMMaximumVersion = $repoConfiguration.Requirements.LLVM.MaximumVersion
 
     $candidates = @(
         'clang-format'
@@ -204,7 +203,7 @@ function Find-ClangFormat () {
         if ($clangFormatCommand) {
             if ((& $clangFormatCommand --version | Out-String) -match "clang-format version ([\d\.]*)") {
                 [Version] $clangFormatVersion = $Matches[1]
-                if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion) -and (CompareVersion $LLVMMaximumVersion $clangFormatVersion)) {
+                if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion)) {
                     return $clangFormatCommand.Source
                 }
             }
@@ -215,6 +214,9 @@ function Find-ClangFormat () {
 }
 
 function Setup-ShaderCCompilerTool () {
+    if ($IsLinux) {
+        return
+    }
     $repoConfiguration = Get-RepositoryConfiguration
     $repositoryToolPath = $repoConfiguration.Paths.Tools
 

Tetragrama/CMakeLists.txt

@@ -6,9 +6,6 @@ project (Tetragrama
 	LANGUAGES CXX
 )
 
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-set	(CMAKE_CXX_STANDARD 20)
-
 file (GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 file (GLOB_RECURSE CPP_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
@@ -22,7 +19,7 @@ else()
     add_executable (${TARGET_NAME})
 endif()
 
-target_sources(${TARGET_NAME} PUBLIC ${HEADER_FILES} ${CPP_FILES})
+target_sources(${TARGET_NAME} PUBLIC ${CPP_FILES})
 
 # We set this debugger directory to find assets and resources file
 # after being copied to Debug and Release output directories 
@@ -31,25 +28,11 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     set_target_properties(${TARGET_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
 endif ()
 
-include(${EXTERNAL_DIR}/externals.cmake)
-
 target_include_directories (${TARGET_NAME}
 	PRIVATE
-        .
-        ./Components
-        ./Components/Events
-        ./Controllers
-        ./Inputs
-        ./Layers
-        ./Messengers
-        ./Helpers
-        ./Importers
-        ./Serializers
-        ./Managers
-		${ENLISTMENT_ROOT}/ZEngine
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
-target_precompile_headers(${TARGET_NAME} PRIVATE pch.h)
 target_compile_definitions(${TARGET_NAME}
     PRIVATE
         NOMINMAX
@@ -62,4 +45,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE
     imported::External_editorLibs
 )
 
-set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "zEngineEditor")
+set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "zEngineEditor")

Tetragrama/Components/DemoUIComponent.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
 #include <imgui.h>
 
 namespace Tetragrama::Components

Tetragrama/Components/DockspaceUIComponent.cpp

@@ -1,13 +1,13 @@
-#include <pch.h>
-#include <DockspaceUIComponent.h>
-#include <Editor.h>
-#include <Helpers/UIDispatcher.h>
-#include <Importers/AssimpImporter.h>
-#include <MessageToken.h>
-#include <Messengers/Messenger.h>
+#include <Tetragrama/Components/DockspaceUIComponent.h>
+#include <Tetragrama/Editor.h>
+#include <Tetragrama/Helpers/UIComponentDrawerHelper.h>
+#include <Tetragrama/Helpers/UIDispatcher.h>
+#include <Tetragrama/Importers/AssimpImporter.h>
+#include <Tetragrama/MessageToken.h>
+#include <Tetragrama/Messengers/Messenger.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
 #include <fmt/format.h>
-#include <imgui/src/imgui_internal.h>
+#include <ImGuizmo/ImGuizmo.h>
 
 namespace fs = std::filesystem;