Simplify systems by inheriting from i_system

Add initial pbr system

Author: knapeczadam

VulkanTutorial.vcxproj

@@ -20,6 +20,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\app.cpp" />
+    <ClCompile Include="src\systems\i_system.cpp" />
+    <ClCompile Include="src\systems\pbr_system.cpp" />
     <ClCompile Include="src\texture.cpp" />
     <ClCompile Include="src\movement_controller.cpp" />
     <ClCompile Include="src\buffer.cpp" />
@@ -114,6 +116,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\app.h" />
+    <ClInclude Include="src\systems\i_system.h" />
+    <ClInclude Include="src\systems\pbr_system.h" />
     <ClInclude Include="src\texture.h" />
     <ClInclude Include="src\movement_controller.h" />
     <ClInclude Include="src\buffer.h" />
@@ -136,6 +140,8 @@
     <Content Include="CMakeLists.txt" />
     <Content Include="compile.bat" />
     <Content Include=".env.cmake" />
+    <Content Include="shaders\pbr.frag" />
+    <Content Include="shaders\pbr.vert" />
     <Content Include="shaders\shader_2d.frag" />
     <Content Include="shaders\shader_2d.vert" />
     <Content Include="shaders\point_light.frag" />

compile.bat

@@ -4,4 +4,6 @@ C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\shader_3d.vert -o shaders\shader_3d
 C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\shader_3d.frag -o shaders\shader_3d.frag.spv
 C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\point_light.vert -o shaders\point_light.vert.spv
 C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\point_light.frag -o shaders\point_light.frag.spv
+C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\pbr.vert -o shaders\pbr.vert.spv
+C:\VulkanSDK\1.3.261.1\Bin\glslc.exe shaders\pbr.frag -o shaders\pbr.frag.spv
 pause

shaders/pbr.frag

@@ -0,0 +1,6 @@
+#version 450
+
+void main()
+{
+    
+}

shaders/pbr.vert

@@ -0,0 +1,6 @@
+#version 450
+
+void main()
+{
+    
+}

src/pipeline.h

@@ -5,7 +5,6 @@
 #include <vector>
 #include <vulkan/vulkan_core.h>
 
-
 namespace dae
 {
     // Forward declarations

src/systems/i_system.cpp

@@ -0,0 +1,14 @@
+#include "i_system.h"
+
+namespace dae
+{
+    i_system::i_system(device &device)
+        : device_(device)
+    {
+    }
+
+    i_system::~i_system()
+    {
+        vkDestroyPipelineLayout(device_.get_logical_device(), pipeline_layout_, nullptr);
+    }
+}

src/systems/i_system.h

@@ -0,0 +1,33 @@
+#pragma once
+
+// Project includes
+#include "../frame_info.h"
+#include "../pipeline.h"
+
+// Standard includes
+#include <memory>
+
+namespace dae
+{
+    class i_system
+    {
+    public:
+        explicit i_system(device &device);
+        virtual ~i_system();
+
+        i_system(i_system const &other)            = delete;
+        i_system(i_system &&other)                 = delete;
+        i_system &operator=(i_system const &other) = delete;
+        i_system &operator=(i_system &&other)      = delete;
+
+    protected:
+        virtual void create_pipeline_layout(VkDescriptorSetLayout global_set_layout) = 0;
+        virtual void create_pipeline(VkRenderPass render_pass) = 0;
+
+    protected:
+        device                    &device_;
+
+        std::unique_ptr<pipeline> pipeline_;
+        VkPipelineLayout          pipeline_layout_ = VK_NULL_HANDLE;
+    };
+}

src/systems/pbr_system.cpp

@@ -0,0 +1,48 @@
+#include "pbr_system.h"
+
+// Standard includes
+#include <stdexcept>
+
+namespace dae
+{
+    pbr_system::pbr_system(device &device, VkRenderPass render_pass, VkDescriptorSetLayout global_set_layout)
+        : i_system{device}
+    {
+        create_pipeline_layout(global_set_layout);
+        create_pipeline(render_pass);
+    }
+
+    void pbr_system::create_pipeline_layout(VkDescriptorSetLayout global_set_layout)
+    {
+        std::vector<VkDescriptorSetLayout> descriptor_set_layouts{global_set_layout};
+        
+        VkPipelineLayoutCreateInfo pipeline_layout_info{};
+        pipeline_layout_info.sType                  = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+        pipeline_layout_info.setLayoutCount         = static_cast<uint32_t>(descriptor_set_layouts.size());
+        pipeline_layout_info.pSetLayouts            = descriptor_set_layouts.data();
+        pipeline_layout_info.pushConstantRangeCount = 0;
+        pipeline_layout_info.pPushConstantRanges    = VK_NULL_HANDLE;
+
+        if (vkCreatePipelineLayout(device_.get_logical_device(), &pipeline_layout_info, nullptr, &pipeline_layout_) != VK_SUCCESS)
+        {
+            throw std::runtime_error{"Failed to create pipeline layout!"};
+        }
+    }
+
+    void pbr_system::create_pipeline(VkRenderPass render_pass)
+    {
+        assert(pipeline_layout_ != nullptr and "Cannot create pipeline before pipeline layout");
+        
+        pipeline_config_info pipeline_config{};
+        pipeline::default_pipeline_config_info(pipeline_config);
+        pipeline_config.attribute_descriptions.clear();
+        pipeline_config.binding_descriptions.clear();
+        pipeline_config.render_pass = render_pass;
+        pipeline_config.pipeline_layout = pipeline_layout_;
+        pipeline_ = std::make_unique<pipeline>(
+            device_,
+            "shaders/pbr.vert.spv",
+            "shaders/pbr.frag.spv",
+            pipeline_config);
+    }
+}

src/systems/pbr_system.h

@@ -0,0 +1,23 @@
+#pragma once
+
+// Project includes
+#include "i_system.h"
+
+namespace dae
+{
+    class pbr_system final : public i_system
+    {
+    public:
+        pbr_system(device &device, VkRenderPass render_pass, VkDescriptorSetLayout global_set_layout);
+        ~pbr_system() override = default;
+
+        pbr_system(pbr_system const &other)            = delete;
+        pbr_system(pbr_system &&other)                 = delete;
+        pbr_system &operator=(pbr_system const &other) = delete;
+        pbr_system &operator=(pbr_system &&other)      = delete;
+
+    protected:
+        void create_pipeline_layout(VkDescriptorSetLayout global_set_layout) override;
+        void create_pipeline(VkRenderPass render_pass) override;
+    };
+}

src/systems/point_light_system.cpp

@@ -22,17 +22,12 @@ namespace dae
     };
 
     point_light_system::point_light_system(device& device, VkRenderPass render_pass, VkDescriptorSetLayout global_set_layout)
-        : device_{device}
+        : i_system{device}
     {
         create_pipeline_layout(global_set_layout);
         create_pipeline(render_pass);
     }
 
-    point_light_system::~point_light_system()
-    {
-        vkDestroyPipelineLayout(device_.get_logical_device(), pipeline_layout_, nullptr);
-    }
-
     void point_light_system::update(frame_info &frame_info, global_ubo &ubo)
     {
         auto rotate_light = glm::rotate(