Very basic material system working. Need to test for different materials

Will move on after that
tomheeleynz · Jul 31, 2022 · 69486b5 · 69486b5
1 parent e7c5b4f
commit 69486b5
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 20 deletions.
diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanMaterial.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanMaterial.cpp
@@ -12,24 +12,16 @@ namespace Arcane
 		// Get Material descriptor, then add uniform buffer to it
 		m_UniformBuffer = UniformBuffer::Create(vulkanShader->GetMaterialSize());
 
-		// Create internal structure
-		m_UniformBufferMemory = new float[vulkanShader->GetMaterialSize()];
-	}
+		m_DescriptorSet = vulkanShader->GetMaterialDescriptor();
+		m_DescriptorSet->AddUniformBuffer(m_UniformBuffer, 2, 0);
 
-	void VulkanMaterial::WriteVec3(uint32_t offset, glm::vec3 value)
-	{
-		m_UniformBufferMemory[offset] = value.x;
-		m_UniformBufferMemory[offset + 1] = value.y;
-		m_UniformBufferMemory[offset + 2] = value.z;
+		// Create internal structure
+		m_UniformBufferMemory = new float[3];
 	}
 
-	glm::vec3 VulkanMaterial::GetVec3(uint32_t offset)
+	void VulkanMaterial::UpdateMaterialData()
 	{
-		return glm::vec3(
-			m_UniformBufferMemory[offset], 
-			m_UniformBufferMemory[offset + 1], 
-			m_UniformBufferMemory[offset + 2]
-		);
+		m_UniformBuffer->WriteData((void*)m_UniformBufferMemory, m_Shader->GetMaterialSize());
 	}
 
 	std::vector<ShaderVariable> VulkanMaterial::GetMaterialVariables()
@@ -48,4 +40,24 @@ namespace Arcane
 		return m_UniformBuffer;
 	}
 
+	//////////////////////////////////////////////////////////////////
+	////// Getters and Setters
+	//////////////////////////////////////////////////////////////////
+
+	void VulkanMaterial::WriteVec3(uint32_t offset, glm::vec3 value)
+	{
+		m_UniformBufferMemory[offset] = value.x;
+		m_UniformBufferMemory[offset + 1] = value.y;
+		m_UniformBufferMemory[offset + 2] = value.z;
+	}
+
+	glm::vec3 VulkanMaterial::GetVec3(uint32_t offset)
+	{
+		return glm::vec3(
+			m_UniformBufferMemory[offset],
+			m_UniformBufferMemory[offset + 1],
+			m_UniformBufferMemory[offset + 2]
+		);
+	}
+
 }
diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanMaterial.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanMaterial.h
@@ -19,7 +19,11 @@ namespace Arcane
 		// Write Material Variables to material buffer
 		virtual void WriteVec3(uint32_t offset, glm::vec3 value) override;
 
+		void UpdateMaterialData() override;
+
 		std::vector<ShaderVariable> GetMaterialVariables();
+
+
 	private:
 		Shader* m_Shader;
 		DescriptorSet* m_DescriptorSet;

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.cpp
@@ -272,6 +272,10 @@ namespace Arcane {
 		}
 	}
 
+	void VulkanRenderer::RenderMeshWithMaterial(VertexBuffer* buffer, Pipeline* pipeline, Material* material)
+	{
+	}
+
 	void VulkanRenderer::RenderQuad(VertexBuffer* buffer, Pipeline* pipeline, std::vector<DescriptorSet*> descriptorSets)
 	{
 		Application& app = Application::Get();

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.h
@@ -26,6 +26,7 @@ namespace Arcane {
 		void RenderQuad(VertexBuffer* buffer, Pipeline* pipeline, std::vector<DescriptorSet*> descriptorSets);
 
 		void RenderMesh(VertexBuffer* buffer, Pipeline* pipeline, std::vector<DescriptorSet*> descriptorSets) override;
+		void RenderMeshWithMaterial(VertexBuffer* buffer, Pipeline* pipeline, Material* material) override;
 	private:
 
 	};

diff --git a/Arcane/src/Arcane/Renderer/Material.h b/Arcane/src/Arcane/Renderer/Material.h
@@ -19,6 +19,9 @@ namespace Arcane
 		// Write Material Variables to material buffer
 		virtual void WriteVec3(uint32_t offset, glm::vec3 value) = 0;
 
+		// Update Material data from internal structures
+		virtual void UpdateMaterialData() = 0;
+
 		static Material* Create(Shader* shader);
 	private:
 	};

diff --git a/Arcane/src/Arcane/Renderer/Renderer.cpp b/Arcane/src/Arcane/Renderer/Renderer.cpp
@@ -68,4 +68,9 @@ namespace Arcane {
 	{
 		s_RendererAPI->RenderMesh(buffer, pipeline, descriptorSets);
 	}
+
+	void Renderer::RenderMeshWithMaterial(VertexBuffer* buffer, Pipeline* pipeline, Material* material)
+	{
+
+	}
 }
diff --git a/Arcane/src/Arcane/Renderer/Renderer.h b/Arcane/src/Arcane/Renderer/Renderer.h
@@ -6,6 +6,7 @@
 #include "Pipeline.h"
 #include "RendererAPI.h"
 #include "RenderPass.h"
+#include "Material.h"
 
 namespace Arcane {
 
@@ -28,6 +29,7 @@ namespace Arcane {
 
 		// Render Mesh
 		static void RenderMesh(VertexBuffer* buffer, Pipeline* pipeline, std::vector<DescriptorSet*> descriptorSets);
+		static void RenderMeshWithMaterial(VertexBuffer* buffer, Pipeline* pipeline, Material* material);
 	private:
 	};
 }
diff --git a/Arcane/src/Arcane/Renderer/RendererAPI.h b/Arcane/src/Arcane/Renderer/RendererAPI.h
@@ -6,6 +6,7 @@
 #include "RenderPass.h"
 #include "UniformBuffer.h"
 #include "DescriptorSet.h"
+#include "Material.h"
 
 namespace Arcane {
 
@@ -36,6 +37,7 @@ namespace Arcane {
 
 		// Mesh
 		virtual void RenderMesh(VertexBuffer* buffer, Pipeline* pipeline, std::vector<DescriptorSet*> descriptorSets) = 0;
+		virtual void RenderMeshWithMaterial(VertexBuffer* buffer, Pipeline* pipeline, Material* materal) = 0;
 
 		// Static Renderer Functions
 		static void SetAPI(RendererAPIType api);

diff --git a/Arcane/src/Arcane/Renderer/SceneRenderer.cpp b/Arcane/src/Arcane/Renderer/SceneRenderer.cpp
@@ -56,6 +56,9 @@ namespace Arcane
 		// Transform for meshes
 		std::vector<TransformComponent> MeshTransforms;
 
+		// Materials for meshses
+		std::vector<Material*> materials;
+
 		// Camera to render with
 		Camera* SceneCamera;
 	};
@@ -256,12 +259,15 @@ namespace Arcane
 
 	void SceneRenderer::GeometryPass()
 	{
+
 		// Update any per pass resources
 		Renderer::BeginRenderPass(s_Data.GeometryRenderPass);
 		{	
 			for (int i = 0; i < s_Data.Meshes.size(); i++)
 			{
 				Mesh* currentMesh = s_Data.Meshes[i];
+				Material* material = s_Data.materials[i];
+				material->UpdateMaterialData();
 
 				// Create Transform Component
 				TransformComponent& currentMeshComponent = s_Data.MeshTransforms[i];
@@ -277,7 +283,7 @@ namespace Arcane
 
 				for (int j = 0; j < currentMesh->GetSubMeshes().size(); j++) {
 					SubMesh* currentSubMesh = currentMesh->GetSubMeshes()[j];
-					Renderer::RenderMesh(currentSubMesh->GetVertexBuffer(), s_Data.GeometryPipeline, {s_Data.GlobalDescriptorSet, s_Data.ObjectDescriptorSet});
+					Renderer::RenderMesh(currentSubMesh->GetVertexBuffer(), s_Data.GeometryPipeline, {s_Data.GlobalDescriptorSet, s_Data.ObjectDescriptorSet, material->GetDescriptorSet()});
 				}
 
 			}
@@ -304,12 +310,14 @@ namespace Arcane
 
 		s_Data.Meshes.clear();
 		s_Data.MeshTransforms.clear();
+		s_Data.materials.clear();
 	}
 
-	void SceneRenderer::SubmitMesh(Mesh* mesh, TransformComponent& transform) 
+	void SceneRenderer::SubmitMesh(Mesh* mesh, TransformComponent& transform, Material* material) 
 	{
 		s_Data.Meshes.push_back(mesh);
 		s_Data.MeshTransforms.push_back(transform);
+		s_Data.materials.push_back(material);
 	}
 
 	void SceneRenderer::SetCamera(Camera* camera)

diff --git a/Arcane/src/Arcane/Renderer/SceneRenderer.h b/Arcane/src/Arcane/Renderer/SceneRenderer.h
@@ -12,6 +12,7 @@
 #include "UniformBuffer.h"
 #include "Camera.h"
 #include "DescriptorSet.h"
+#include "Material.h"
 
 namespace Arcane
 {
@@ -25,7 +26,8 @@ namespace Arcane
 		void RenderScene();
 
 		void SetCamera(Camera* camera);
-		void SubmitMesh(Mesh* mesh, TransformComponent& component);
+		void SubmitMesh(Mesh* mesh, TransformComponent& component, Material* material);
+
 
 		void ResizeScene(uint32_t width, uint32_t height);
 	private:

diff --git a/Arcane/src/Arcane/Scene/Scene.cpp b/Arcane/src/Arcane/Scene/Scene.cpp
@@ -21,12 +21,13 @@ namespace Arcane
 	{
 		// Render Mesh
 		{
-			auto view = m_Registry.view<MeshComponent, TransformComponent>();
+			auto view = m_Registry.view<MeshComponent, TransformComponent, MeshRendererComponent>();
 			for (auto& entity : view) 
 			{
 				auto& mesh = view.get<MeshComponent>(entity);
 				auto& transform = view.get<TransformComponent>(entity);
-				m_SceneRenderer->SubmitMesh(mesh.mesh, transform);
+				auto& meshRenderer = view.get<MeshRendererComponent>(entity);
+				m_SceneRenderer->SubmitMesh(mesh.mesh, transform, meshRenderer.material);
 			}
 		}
 		m_SceneRenderer->RenderScene();

diff --git a/EnchantingTable/src/Assets/Shaders/Mesh.frag b/EnchantingTable/src/Assets/Shaders/Mesh.frag
@@ -34,7 +34,7 @@ void main() {
 	vec3 specular = specularStrength * spec * lightColor; 
 
 	// Calculate Result
-	vec3 result = (ambient + diffuse + specular) * vec3(1.0f, 0.0f, 0.0f);
+	vec3 result = (ambient + diffuse + specular) * material.color;
 
 	// Final Color
 	Color = vec4(result, 1.0f);

diff --git a/EnchantingTable/src/Assets/Shaders/MeshFrag.spv b/EnchantingTable/src/Assets/Shaders/MeshFrag.spv
diff --git a/EnchantingTable/src/Panels/EntityPanel.cpp b/EnchantingTable/src/Panels/EntityPanel.cpp
@@ -74,6 +74,7 @@ void EntityPanel::DrawComponents(Arcane::Entity& entity)
 				if (variable.Type == Arcane::ShaderVariableType::Vec3)
 				{
 					glm::vec3 currentValue = material->GetVec3(variable.offset);
+
 					if (currentValue.x < 0)
 						currentValue = {0.0f, 0.0f, 0.0f};