Merge pull request #1 from warriormaster12/refactor

SpeedEngineVk has been refactored

Author: warriormaster12

EngineAssets/Shaders/Shader.frag

@@ -3,9 +3,13 @@
 
 layout(location = 0) in vec3 fragColor;
 layout(location = 1) in vec2 fragTexCoord;
-layout(binding = 1) uniform sampler2D texSampler;
+
 layout(location = 0) out vec4 outColor;
+layout(binding = 1) uniform sampler2D texSampler;
+
 
 void main() {
-    outColor = texture(texSampler, fragTexCoord * 1.0);
+    outColor = texture(texSampler, fragTexCoord);
 }
+
+

EngineAssets/Shaders/Shader.vert

@@ -19,3 +19,4 @@ void main() {
     fragColor = inColor;
     fragTexCoord = inTexCoord;
 }
+

Include/Engine/ModelLoader/ModelLoader.h

@@ -0,0 +1,25 @@
+#pragma once 
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkMemory.h"
+
+
+
+
+namespace VkRenderer
+{
+    class VkBufferCreation
+    {
+    public:     
+        void createBuffer(VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags properties, VkBuffer& buffer, VkDeviceMemory& bufferMemory);
+        void copyBuffer(VkCommandPool& commandPool, VkBuffer srcBuffer, VkBuffer dstBuffer, VkDeviceSize size);
+
+        VkCommandBuffer beginSingleTimeCommands(VkCommandPool& commandPool);
+        void endSingleTimeCommands(VkCommandBuffer commandBuffer, VkCommandPool& commandPool);
+
+        VkSetup *setup_ref;
+        VkMemory *memory_ref;
+        
+    };
+}

Include/Engine/Renderer/Buffers/VkBufferCreation.h

@@ -0,0 +1,25 @@
+#pragma once 
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkGraphicsPipeline.h"
+#include "VkIndexbuffers.h"
+
+
+
+namespace VkRenderer
+{
+    class VkcommandBuffer
+    {
+    public: 
+        VkCommandPool commandPool;
+        void createCommandPool(VkSurfaceKHR& surface);
+        void createCommandBuffers(std::vector<VkFramebuffer> swapChainFramebuffers, VkExtent2D& swapChainExtent,std::vector<VkDescriptorSet> descriptorSets, VkBuffer& vertexBuffer, VkBuffer& indexBuffer);
+        std::vector<VkCommandBuffer> commandBuffers;
+
+        VkSetup *setup_ref;
+        VkGPipeline *gpipeline_ref;
+        VkindexBuffer *Ibuffer_ref;
+
+    };
+}

Include/Engine/Renderer/Buffers/VkCommandbuffers.h

@@ -1,18 +1,24 @@
 #pragma once 
 
-#include "VkIncludes.h"
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkTextureManager.h"
 
 namespace VkRenderer
 {
     class VkDepthBuffer
     {
-    public:
-        
-        VkFormat findSupportedFormat(const std::vector<VkFormat>& candidates, VkImageTiling tiling, VkFormatFeatureFlags features, VkPhysicalDevice physicalDevice);
-        VkFormat findDepthFormat(VkPhysicalDevice physicalDevice);
+    public: 
         VkImage depthImage;
         VkDeviceMemory depthImageMemory;
         VkImageView depthImageView;
+
+        VkSetup *setup_ref;
+        VkTextureManager *texture_m_ref;
+
+        void createDepthResources(VkExtent2D& swapChainExtent);
+        VkFormat findSupportedFormat(const std::vector<VkFormat>& candidates, VkImageTiling tiling, VkFormatFeatureFlags features);
+        VkFormat findDepthFormat();
         bool hasStencilComponent(VkFormat format);
     };
 }

Include/Engine/Renderer/VkDepthBuffer.h …/Engine/Renderer/Buffers/VkDepthBuffer.hInclude/Engine/Renderer/VkDepthBuffer.h renamed to Include/Engine/Renderer/Buffers/VkDepthBuffer.h Include/Engine/Renderer/VkDepthBuffer.h renamed to Include/Engine/Renderer/Buffers/VkDepthBuffer.h

@@ -0,0 +1,22 @@
+#pragma once 
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkGraphicsPipeline.h"
+#include "../VkSwapChain.h"
+#include "VkDepthBuffer.h"
+
+namespace VkRenderer
+{
+    class VkframeBuffer
+    {
+    public: 
+        std::vector<VkFramebuffer> swapChainFramebuffers;
+        void createFramebuffers();
+
+        VkSetup *setup_ref;
+        VkSwapChain *swap_ref;
+        VkGPipeline *gpipeline_ref;
+        VkDepthBuffer *Dbuffer_ref;
+    };
+}

Include/Engine/Renderer/Buffers/VkFramebuffers.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "VkBufferCreation.h"
+#include "../VkMemory.h"
+
+namespace VkRenderer
+{
+    
+
+    class VkindexBuffer
+    {
+    public: 
+        VkBuffer indexBuffer;
+        VkDeviceMemory indexBufferMemory;
+        std::vector<uint32_t> indices;
+
+        void createIndexBuffer(VkCommandPool& commandPool);
+
+        VkSetup *setup_ref;
+        VkBufferCreation *buffer_ref;
+    };
+}

Include/Engine/Renderer/Buffers/VkIndexbuffers.h

@@ -0,0 +1,36 @@
+#pragma once 
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkMemory.h"
+#include "VkBufferCreation.h"
+
+
+
+namespace VkRenderer
+{
+    struct UniformBufferObject {
+        glm::mat4 model;
+        glm::mat4 view;
+        glm::mat4 proj;
+    };
+    class VkUbuffer
+    {
+    public: 
+        void createDescriptorSetLayout();
+        void createDescriptorPool(std::vector<VkImage>& swapChainImages);
+        void createDescriptorSets(std::vector<VkImage>& swapChainImages, VkImageView& textureImageView, VkSampler& textureSampler);
+        void createUniformBuffers(VkBufferCreation& buffer_ref, std::vector<VkImage>& swapChainImages);
+        void updateUniformBuffer(uint32_t currentImage, VkExtent2D& swapChainExtent);
+
+        VkDescriptorSetLayout descriptorSetLayout;
+        VkDescriptorPool descriptorPool;
+        std::vector<VkDescriptorSet> descriptorSets;
+        std::vector<VkBuffer> uniformBuffers;
+        std::vector<VkDeviceMemory> uniformBuffersMemory;
+
+        VkSetup *setup_ref;
+        VkMemory *memory_ref;
+        
+    };
+}

Include/Engine/Renderer/Buffers/VkUnfiormbuffers.h

@@ -0,0 +1,62 @@
+#pragma once 
+
+#include "../VkIncludes.h"
+#include "../VkSetup.h"
+#include "../VkMemory.h"
+#include "VkBufferCreation.h"
+
+namespace VkRenderer
+{
+    struct Vertex 
+    {
+        glm::vec3 pos;
+        glm::vec3 color;
+        glm::vec2 texCoord;
+
+        static VkVertexInputBindingDescription getBindingDescription() {
+            VkVertexInputBindingDescription bindingDescription{};
+            bindingDescription.binding = 0;
+            bindingDescription.stride = sizeof(Vertex);
+            bindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+
+            return bindingDescription;
+        }
+
+        static std::array<VkVertexInputAttributeDescription, 3> getAttributeDescriptions() {
+            std::array<VkVertexInputAttributeDescription, 3> attributeDescriptions{};
+
+            attributeDescriptions[0].binding = 0;
+            attributeDescriptions[0].location = 0;
+            attributeDescriptions[0].format = VK_FORMAT_R32G32B32_SFLOAT;
+            attributeDescriptions[0].offset = offsetof(Vertex, pos);
+
+            attributeDescriptions[1].binding = 0;
+            attributeDescriptions[1].location = 1;
+            attributeDescriptions[1].format = VK_FORMAT_R32G32B32_SFLOAT;
+            attributeDescriptions[1].offset = offsetof(Vertex, color);
+
+            attributeDescriptions[2].binding = 0;
+            attributeDescriptions[2].location = 2;
+            attributeDescriptions[2].format = VK_FORMAT_R32G32_SFLOAT;
+            attributeDescriptions[2].offset = offsetof(Vertex, texCoord);
+
+            return attributeDescriptions;
+        }
+        bool operator==(const Vertex& other) const {
+            return pos == other.pos && color == other.color && texCoord == other.texCoord;
+        }
+    };
+
+    
+    
+    class VkVbuffer
+    {
+    public: 
+        void createVertexBuffer(VkCommandPool& commandPool);
+        VkBuffer vertexBuffer;
+        VkDeviceMemory vertexBufferMemory;
+        VkSetup *setup_ref;
+        VkBufferCreation *buffer_ref;
+        std::vector<Vertex> vertices;
+    };
+}