Fix shader Specification and paths

MathewBensonCode · MathewBensonCode · commit c0f5ce8012c7 · 2025-10-27T12:31:34.000+03:00
diff --git a/Obelisk/CMakeLists.txt b/Obelisk/CMakeLists.txt
@@ -50,12 +50,12 @@ target_link_libraries(${TARGET_NAME} PUBLIC
 set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
 install(TARGETS ${TARGET_NAME} 
-    DESTINATION bin/Editor
+    DESTINATION bin
 )
 
-install(DIRECTORY ../Resources/Editor DESTINATION bin)
+install(DIRECTORY ../Resources/Editor/Settings DESTINATION bin)
 
-install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)
+install(DIRECTORY ../Resources/Shaders DESTINATION bin)
 
 
 
diff --git a/Panzerfaust/Service/EngineService.cs b/Panzerfaust/Service/EngineService.cs
@@ -24,8 +24,8 @@ public EngineService()
 #if _WIN32
             engineExtension = ".exe";
 #endif
-            _enginePath = Path.Combine(Environment.CurrentDirectory, "Editor", $"{_launcherCLIAppName}{engineExtension}");
-            _workingDirectory = Path.Combine(Environment.CurrentDirectory, "Editor");
+            _enginePath = Path.Combine(Environment.CurrentDirectory, $"{_launcherCLIAppName}{engineExtension}");
+            _workingDirectory = Environment.CurrentDirectory;
         }
 
         public async Task StartAsync(string path)
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp b/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
@@ -1478,7 +1478,7 @@ namespace ZEngine::Hardwares
 
     Helpers::Handle<Rendering::Shaders::Shader> VulkanDevice::CompileShader(Rendering::Specifications::ShaderSpecification& spec)
     {
-        const char* base_dir           = "Editor/Shaders/Cache/";
+        const char* base_dir           = "Shaders/Cache/";
         const char* vertex_name_part   = "_vertex.spv";
         const char* fragment_name_part = "_fragment.spv";
 
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.h b/ZEngine/ZEngine/Hardwares/VulkanDevice.h
@@ -77,7 +77,7 @@ namespace ZEngine::Hardwares
         VkBuffer      Handle     = VK_NULL_HANDLE;
         VmaAllocation Allocation = nullptr;
 
-        operator bool() const
+                      operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
@@ -91,7 +91,7 @@ namespace ZEngine::Hardwares
         VkSampler     Sampler{VK_NULL_HANDLE};
         VmaAllocation Allocation{nullptr};
 
-        operator bool() const
+                      operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
diff --git a/ZEngine/ZEngine/Rendering/Shaders/Shader.cpp b/ZEngine/ZEngine/Rendering/Shaders/Shader.cpp
@@ -98,7 +98,7 @@ namespace ZEngine::Rendering::Shaders
                     LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);
                 }
 
-                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name, .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::VERTEX});
+                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::VERTEX});
             }
 
             for (const auto& SB_resource : vertex_resources.storage_buffers)
@@ -111,7 +111,7 @@ namespace ZEngine::Rendering::Shaders
                     LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);
                 }
 
-                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name, .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::VERTEX});
+                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::VERTEX});
             }
 
             for (const auto& pushConstant_resource : vertex_resources.push_constant_buffers)
@@ -127,7 +127,7 @@ namespace ZEngine::Rendering::Shaders
                         uint32_t memberSize  = spirv_compiler->get_declared_struct_member_size(type, i);
                         struct_total_size   += memberSize;
                     }
-                    PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name, .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::VERTEX});
+                    PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name.c_str(), .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::VERTEX});
                     /*
                      * We update the offset for next iteration
                      */
@@ -167,7 +167,7 @@ namespace ZEngine::Rendering::Shaders
                     LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);
                 }
 
-                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name, .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});
+                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});
             }
 
             for (const auto& SB_resource : fragment_resources.storage_buffers)
@@ -180,7 +180,7 @@ namespace ZEngine::Rendering::Shaders
                     LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);
                 }
 
-                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name, .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});
+                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});
             }
 
             for (const auto& pushConstant_resource : fragment_resources.push_constant_buffers)
@@ -196,7 +196,7 @@ namespace ZEngine::Rendering::Shaders
                         uint32_t memberSize  = spirv_compiler->get_declared_struct_member_size(type, i);
                         struct_total_size   += memberSize;
                     }
-                    PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name, .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::FRAGMENT});
+                    PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name.c_str(), .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::FRAGMENT});
                     /*
                      * We update the offset for next iteration
                      */
@@ -225,7 +225,7 @@ namespace ZEngine::Rendering::Shaders
                     LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);
                 }
 
-                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Count = count, .Name = SI_resource.name, .DescriptorTypeValue = DescriptorType::COMBINED_IMAGE_SAMPLER, .Flags = ShaderStageFlags::FRAGMENT});
+                LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Count = count, .Name = SI_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::COMBINED_IMAGE_SAMPLER, .Flags = ShaderStageFlags::FRAGMENT});
             }
         }
     }
diff --git a/ZEngine/ZEngine/Rendering/Specifications/ShaderSpecification.h b/ZEngine/ZEngine/Rendering/Specifications/ShaderSpecification.h
@@ -38,14 +38,14 @@ namespace ZEngine::Rendering::Specifications
         uint32_t         Set{0xFFFFFFFF};
         uint32_t         Binding{0xFFFFFFFF};
         uint32_t         Count{1};
-        std::string      Name;
+        const char*      Name;
         DescriptorType   DescriptorTypeValue;
         ShaderStageFlags Flags;
     };
 
     struct PushConstantSpecification
     {
-        std::string      Name;
+        const char*      Name;
         uint32_t         Size;
         uint32_t         Offset;
         ShaderStageFlags Flags;
diff --git a/ZEngine/ZEngine/Windows/GameWindow.h b/ZEngine/ZEngine/Windows/GameWindow.h
@@ -1,5 +1,4 @@
 #pragma once
-#define GLFW_INCLUDE_VULKAN
 #include <Core/Memory/Allocator.h>
 #include <CoreWindow.h>
 #include <GLFW/glfw3.h>

Original file line number	Diff line number	Diff line change
`@@ -1478,7 +1478,7 @@ namespace ZEngine::Hardwares`
`1478`	`1478`
`1479`	`1479`	`Helpers::Handle<Rendering::Shaders::Shader> VulkanDevice::CompileShader(Rendering::Specifications::ShaderSpecification& spec)`
`1480`	`1480`	`{`
`1481`		`- const char* base_dir = "Editor/Shaders/Cache/";`
	`1481`	`+ const char* base_dir = "Shaders/Cache/";`
`1482`	`1482`	`const char* vertex_name_part = "_vertex.spv";`
`1483`	`1483`	`const char* fragment_name_part = "_fragment.spv";`
`1484`	`1484`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ namespace ZEngine::Hardwares`
`77`	`77`	`VkBuffer Handle = VK_NULL_HANDLE;`
`78`	`78`	`VmaAllocation Allocation = nullptr;`
`79`	`79`
`80`		`- operator bool() const`
	`80`	`+ operator bool() const`
`81`	`81`	`{`
`82`	`82`	`return (Handle != VK_NULL_HANDLE);`
`83`	`83`	`}`
`@@ -91,7 +91,7 @@ namespace ZEngine::Hardwares`
`91`	`91`	`VkSampler Sampler{VK_NULL_HANDLE};`
`92`	`92`	`VmaAllocation Allocation{nullptr};`
`93`	`93`
`94`		`- operator bool() const`
	`94`	`+ operator bool() const`
`95`	`95`	`{`
`96`	`96`	`return (Handle != VK_NULL_HANDLE);`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ namespace ZEngine::Rendering::Shaders`
`98`	`98`	`LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);`
`99`	`99`	`}`
`100`	`100`
`101`		`- LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name, .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::VERTEX});`
	`101`	`+ LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::VERTEX});`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`for (const auto& SB_resource : vertex_resources.storage_buffers)`
`@@ -111,7 +111,7 @@ namespace ZEngine::Rendering::Shaders`
`111`	`111`	`LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);`
`112`	`112`	`}`
`113`	`113`
`114`		`- LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name, .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::VERTEX});`
	`114`	`+ LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::VERTEX});`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`for (const auto& pushConstant_resource : vertex_resources.push_constant_buffers)`
`@@ -127,7 +127,7 @@ namespace ZEngine::Rendering::Shaders`
`127`	`127`	`uint32_t memberSize = spirv_compiler->get_declared_struct_member_size(type, i);`
`128`	`128`	`struct_total_size += memberSize;`
`129`	`129`	`}`
`130`		`- PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name, .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::VERTEX});`
	`130`	`+ PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name.c_str(), .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::VERTEX});`
`131`	`131`	`/*`
`132`	`132`	`* We update the offset for next iteration`
`133`	`133`	`*/`
`@@ -167,7 +167,7 @@ namespace ZEngine::Rendering::Shaders`
`167`	`167`	`LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);`
`168`	`168`	`}`
`169`	`169`
`170`		`- LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name, .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});`
	`170`	`+ LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = UB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::UNIFORM_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`for (const auto& SB_resource : fragment_resources.storage_buffers)`
`@@ -180,7 +180,7 @@ namespace ZEngine::Rendering::Shaders`
`180`	`180`	`LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);`
`181`	`181`	`}`
`182`	`182`
`183`		`- LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name, .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});`
	`183`	`+ LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Name = SB_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::STORAGE_BUFFER, .Flags = ShaderStageFlags::FRAGMENT});`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`for (const auto& pushConstant_resource : fragment_resources.push_constant_buffers)`
`@@ -196,7 +196,7 @@ namespace ZEngine::Rendering::Shaders`
`196`	`196`	`uint32_t memberSize = spirv_compiler->get_declared_struct_member_size(type, i);`
`197`	`197`	`struct_total_size += memberSize;`
`198`	`198`	`}`
`199`		`- PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name, .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::FRAGMENT});`
	`199`	`+ PushConstantSpecifications.push(PushConstantSpecification{.Name = pushConstant_resource.name.c_str(), .Size = struct_total_size, .Offset = struct_offset, .Flags = ShaderStageFlags::FRAGMENT});`
`200`	`200`	`/*`
`201`	`201`	`* We update the offset for next iteration`
`202`	`202`	`*/`
`@@ -225,7 +225,7 @@ namespace ZEngine::Rendering::Shaders`
`225`	`225`	`LayoutBindingSpecificationMap[set].init(m_device->Arena, 10);`
`226`	`226`	`}`
`227`	`227`
`228`		`- LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Count = count, .Name = SI_resource.name, .DescriptorTypeValue = DescriptorType::COMBINED_IMAGE_SAMPLER, .Flags = ShaderStageFlags::FRAGMENT});`
	`228`	`+ LayoutBindingSpecificationMap[set].push(LayoutBindingSpecification{.Set = set, .Binding = binding, .Count = count, .Name = SI_resource.name.c_str(), .DescriptorTypeValue = DescriptorType::COMBINED_IMAGE_SAMPLER, .Flags = ShaderStageFlags::FRAGMENT});`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-#define GLFW_INCLUDE_VULKAN`
`3`	`2`	`#include <Core/Memory/Allocator.h>`
`4`	`3`	`#include <CoreWindow.h>`
`5`	`4`	`#include <GLFW/glfw3.h>`