Per object diffuse texture support

Author: warriormaster12

Include/Engine/Components/Mesh.h

@@ -4,7 +4,10 @@
 #include "../Renderer/VkSetup.h"
 #include "../Renderer/Buffers/VkVertexbuffers.h"
 #include "../Renderer/Buffers/VkIndexbuffers.h"
+#include "../Renderer/Buffers/VkBufferCreation.h"
+#include "../Renderer/VkMemory.h"
 #include "../Math/Math3D.h"
+#include "../Renderer/VkTextureManager.h"
 
 
 
@@ -23,12 +26,16 @@ namespace VkRenderer
 
 
         VkSetup *setup_ref;
+        VkMemory *memory_ref;
+        VkBufferCreation *buffer_ref;
 
         Transform3D mesh_transform;
+        VkTextureManager texture;
         std::string TEXTURE_PATH = "EngineAssets/Textures/viking_room.png";
 
 
-
+        void BindTexture(VkCommandPool& commandPool);
+        void DestroyTexture();
         void InitMesh(VkCommandPool& commandPool);
         void update(uint32_t imageIndex);
         void DestroyMesh();

Include/Engine/Renderer/Buffers/VkUnfiormbuffers.h

@@ -23,7 +23,7 @@ namespace VkRenderer
     public: 
         void createDescriptorSetLayout();
         void createDescriptorPool();
-        void createDescriptorSets(VkImageView& textureImageView, VkSampler& textureSampler);
+        void createDescriptorSets();
         void createUniformBuffer();
         void updateUniformBuffer(uint32_t DescriptorSetIndex, VkExtent2D& swapChainExtent);
 

src/Engine/Components/Mesh.cpp

@@ -2,7 +2,16 @@
 
 namespace VkRenderer
 {
+    void Mesh::BindTexture(VkCommandPool& commandPool)
+    {
+        texture.setup_ref = setup_ref;
+        texture.buffer_ref = buffer_ref;
+        texture.memory_ref = memory_ref;
 
+        texture.createTextureImage(TEXTURE_PATH, commandPool);
+        texture.createTextureImageView();
+        texture.createTextureSampler();
+    }
 
     void Mesh::InitMesh(VkCommandPool& commandPool)
     {
@@ -19,6 +28,15 @@ namespace VkRenderer
 
     }
 
+    void Mesh::DestroyTexture()
+    {
+        vkDestroySampler(setup_ref->device, texture.textureSampler, nullptr);
+        vkDestroyImageView(setup_ref->device, texture.textureImageView, nullptr);
+        
+        vkDestroyImage(setup_ref->device, texture.textureImage, nullptr);
+        vkFreeMemory(setup_ref->device, texture.textureImageMemory, nullptr);
+    }
+
 
     void Mesh::DestroyMesh()
     {

src/Engine/Renderer/Buffers/VkUniformbuffers.cpp

@@ -58,7 +58,7 @@ namespace VkRenderer
             throw std::runtime_error("failed to create descriptor pool!");
         }   
     }
-    void VkUbuffer::createDescriptorSets(VkImageView& textureImageView, VkSampler& textureSampler)
+    void VkUbuffer::createDescriptorSets()
     {
         descriptorSets.resize(meshes.size());
         for (size_t i = 0; i < meshes.size(); i++) {
@@ -82,8 +82,8 @@ namespace VkRenderer
 
             VkDescriptorImageInfo imageInfo{};
             imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-            imageInfo.imageView = textureImageView;
-            imageInfo.sampler = textureSampler;
+            imageInfo.imageView = meshes[i]->texture.textureImageView;
+            imageInfo.sampler = meshes[i]->texture.textureSampler;
             std::vector<VkWriteDescriptorSet> descriptorWrites = {
                 writeDescriptorSet(descriptorSets[i], VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, nullptr, &bufferInfo, 1),
                 writeDescriptorSet(descriptorSets[i], VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &imageInfo, nullptr, 1),

src/Engine/Renderer/VkRenderer.cpp

@@ -26,11 +26,8 @@ namespace VkRenderer
         meshes.emplace_back();
 
 
-    
-        texture_m_ref.createTextureImage("EngineAssets/Textures/viking_room.png", Cbuffer_ref.commandPool);
-        texture_m_ref.createTextureImageView();
-        texture_m_ref.createTextureSampler();
 
+        meshes[2].TEXTURE_PATH = "EngineAssets/Textures/chapel_diffuse.tga";
         meshes[2].model_ref.MODEL_PATH = "EngineAssets/Models/chapel_obj.obj";
 
         for (int i = 0; i < meshes.size(); i++) {
@@ -44,7 +41,10 @@ namespace VkRenderer
 
             //Mesh
             meshes[i].setup_ref = &setup_ref;
+            meshes[i].memory_ref = &memory_ref;
+            meshes[i].buffer_ref = &buffer_ref;
 
+            meshes[i].BindTexture(Cbuffer_ref.commandPool);
             meshes[i].InitMesh(Cbuffer_ref.commandPool);
             meshes[i].mesh_transform.rotation = glm::vec3(-90.0f,0.0f,0.0f);
             Ubuffer_ref.meshes.push_back(&meshes[i]);
@@ -56,7 +56,7 @@ namespace VkRenderer
         Ubuffer_ref.createUniformBuffer(); 
 
         Ubuffer_ref.createDescriptorPool();
-        Ubuffer_ref.createDescriptorSets(texture_m_ref.textureImageView,  texture_m_ref.textureSampler);
+        Ubuffer_ref.createDescriptorSets();
 
 
 
@@ -65,8 +65,8 @@ namespace VkRenderer
 
         meshes[0].mesh_transform.translate=glm::vec3(0.0f,-1.0f,0.0f);
         meshes[1].mesh_transform.translate=glm::vec3(0.0f,1.0f,0.0f);
-        meshes[2].mesh_transform.translate=glm::vec3(0.0f,0.0f,1.0f);
-        meshes[2].mesh_transform.scale = glm::vec3(0.001f);
+        meshes[2].mesh_transform.translate=glm::vec3(0.0f,0.0f,3.0f);
+        meshes[2].mesh_transform.scale = glm::vec3(0.002f);
         meshes[2].mesh_transform.rotation = glm::vec3(0.0f, 90.0f, 0.0f);
 
     }
@@ -91,7 +91,7 @@ namespace VkRenderer
 
         Ubuffer_ref.createUniformBuffer();
         Ubuffer_ref.createDescriptorPool();
-        Ubuffer_ref.createDescriptorSets(texture_m_ref.textureImageView, texture_m_ref.textureSampler);
+        Ubuffer_ref.createDescriptorSets();
 
 
         Cbuffer_ref.createCommandBuffers(Fbuffer_ref.swapChainFramebuffers,swap_ref.swapChainExtent, Ubuffer_ref.descriptorSets);
@@ -128,15 +128,12 @@ namespace VkRenderer
     {  
         cleanupSwapChain();
 
-        vkDestroySampler(setup_ref.device, texture_m_ref.textureSampler, nullptr);
-        vkDestroyImageView(setup_ref.device, texture_m_ref.textureImageView, nullptr);
 
-        vkDestroyImage(setup_ref.device, texture_m_ref.textureImage, nullptr);
-        vkFreeMemory(setup_ref.device, texture_m_ref.textureImageMemory, nullptr);
 
         vkDestroyDescriptorSetLayout(setup_ref.device, Ubuffer_ref.descriptorSetLayout, nullptr);  
         for (int i=meshes.size()-1; i >= 0; i--)
         {
+            meshes[i].DestroyTexture();
             meshes[i].DestroyMesh();
         }