Merge branch 'develop' into user/kernel/fix-command-buffer-manager

Author: JeanPhilippeKernel

CMakeLists.txt

@@ -43,6 +43,10 @@ if (NOT LAUNCHER_ONLY)
     ## Setup Dependencies
     include(dependencies.cmake)
 
+    ## Compile Shaders
+
+    add_subdirectory (Resources)
+
 	# Core engine lib is here
 	#
 	add_subdirectory (ZEngine)

Obelisk/CMakeLists.txt

@@ -49,13 +49,4 @@ target_link_libraries(${TARGET_NAME} PUBLIC
 
 set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
-install(TARGETS ${TARGET_NAME} 
-    DESTINATION bin
-)
-
-install(DIRECTORY ../Resources/Editor/Settings DESTINATION bin)
-
-install(DIRECTORY ../Resources/Shaders DESTINATION bin)
-
-
-
+install(TARGETS ${TARGET_NAME} DESTINATION bin)

Obelisk/EntryPoint.cpp

@@ -1,11 +1,10 @@
 #include <CLI/CLI.hpp>
+#include <Tetragrama/Editor.h>
+#include <ZEngine/Applications/GameApplication.h>
 #include <ZEngine/Core/Memory/MemoryManager.h>
 #include <ZEngine/EngineConfiguration.h>
-#include <ZEngine/Logging/Logger.h>
-#include <ZEngine/Applications/GameApplication.h>
 #include <ZEngine/Helpers/ThreadPool.h>
-
-#include <Tetragrama/Editor.h>
+#include <ZEngine/Logging/Logger.h>
 
 #ifdef ZENGINE_PLATFORM
 
@@ -28,8 +27,7 @@ int applicationEntryPoint(int argc, char* argv[])
 
     GameApplicationPtr app = nullptr;
 
-
-    CLI::App cli{"ObeliskCLI"};
+    CLI::App           cli{"ObeliskCLI"};
     argv                      = cli.ensure_utf8(argv);
 
     std::string config_file   = "";
@@ -39,10 +37,9 @@ int applicationEntryPoint(int argc, char* argv[])
 
     CLI11_PARSE(cli, argc, argv);
 
-
     if (launch_editor)
     {
-        app = ZPushStructCtor(arena, Tetragrama::Editor);    
+        app                      = ZPushStructCtor(arena, Tetragrama::Editor);
         app->EnableRenderOverlay = true;
     }
 

Resources/CMakeLists.txt

@@ -0,0 +1,45 @@
+set(ShaderPath ${CMAKE_CURRENT_SOURCE_DIR}/Shaders)
+set(ShaderOutputPath "${ShaderPath}/Cache")
+
+set(Flags)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(Flags "-g")
+else()
+  set(Flags "-Os")
+endif()
+
+file (MAKE_DIRECTORY "${ShaderOutputPath}")
+
+file (GLOB VertexShaders CONFIGURE_DEPENDS "${ShaderPath}/*.vert")
+file (GLOB FragmentShaders CONFIGURE_DEPENDS "${ShaderPath}/*.frag")
+
+foreach(VertexShader ${VertexShaders})
+
+      cmake_path(GET VertexShader STEM shaderfilename)
+      cmake_path(APPEND_STRING shaderfilename "_vertex.spv" OUTPUT_VARIABLE VertexShaderOutputFileName )
+      cmake_path(APPEND ShaderOutputPath ${VertexShaderOutputFileName} OUTPUT_VARIABLE VertexShaderOutputPath)
+
+      add_custom_target("Compile-${shaderfilename}-vertex" ALL COMMAND glslang-standalone "-I${ShaderPath}" "-V" ${Flags} "-o" "${VertexShaderOutputPath}" "${VertexShader}")
+
+    
+endforeach()
+
+foreach(FragmentShader ${FragmentShaders})
+
+    cmake_path(GET FragmentShader STEM shaderfilename)
+    cmake_path(APPEND_STRING shaderfilename "_fragment.spv" OUTPUT_VARIABLE FragmentShaderOutputFileName )
+    cmake_path(APPEND ShaderOutputPath ${FragmentShaderOutputFileName} OUTPUT_VARIABLE FragmentShaderOutputPath)
+
+
+    add_custom_target("Compile-${shaderfilename}-fragment" ALL COMMAND glslang-standalone "-I${ShaderPath}" "-V" ${Flags}  "-o" "${FragmentShaderOutputPath}" "${FragmentShader}")
+
+endforeach()
+
+install(DIRECTORY Editor/Settings DESTINATION bin)
+install(DIRECTORY Shaders/Cache DESTINATION bin/Shaders)
+
+# This helps for debugging and development
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  install(DIRECTORY Editor/Settings DESTINATION Obelisk/${CMAKE_BUILD_TYPE})
+  install(DIRECTORY Shaders/Cache DESTINATION Obelisk/${CMAKE_BUILD_TYPE}/Shaders)
+endif()

Resources/Shaders/fragment_common.glsl

@@ -61,7 +61,8 @@ layout(std140, set = 0, binding = 5) readonly buffer MatSB
 }
 MaterialDataBuffer;
 
-layout(set = 1, binding = 0) uniform sampler2D TextureArray[];
+layout(set = 1, binding = 0) uniform Texture2D TextureArray[];
+layout(set = 1, binding = 1) uniform sampler LinearWrapSampler;
 
 MaterialData FetchMaterial(uint dataIndex)
 {

Scripts/BuildEngine.ps1

@@ -174,15 +174,15 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     }
 }
 
-
 if(-Not $LauncherOnly) {
 
     # Run Clang format
     if ($RunClangFormat) {
         [string]$clangFormatScript = Join-Path $PSScriptRoot -ChildPath "ClangFormat.ps1"
         [string[]]$srcDirectories = @(
             (Join-Path $repositoryRootPath -ChildPath "ZEngine"),
-            (Join-Path $repositoryRootPath -ChildPath "Tetragrama")
+            (Join-Path $repositoryRootPath -ChildPath "Obelisk"),
+            (Join-Path $repositoryRootPath -ChildPath "Tetragrama"),
             (Join-Path $repositoryRootPath -ChildPath "Resources/Shaders")
         )
 
@@ -195,13 +195,6 @@ if(-Not $LauncherOnly) {
         }
     }
 
-
-    # Run Shader Compilation
-    foreach ($config in $Configurations) {
-        $shaderCompileScript = Join-Path $PSScriptRoot -ChildPath "ShaderCompile.ps1"
-        & pwsh -File $shaderCompileScript -Configuration:$config -ForceRebuild:$true
-    }
-
     if ($LASTEXITCODE -ne 0) {
         Write-Error "Stopped build process..." -ErrorAction Stop
     }