Now trying to render triangle

tomheeleynz · Nov 14, 2022 · 00be11c · 00be11c
1 parent 974fe04
commit 00be11c
Show file tree

Hide file tree

Showing 17 changed files with 265 additions and 17 deletions.
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLBuffer.cpp b/Arcane/src/Arcane/Platform/OpenGL/OpenGLBuffer.cpp
@@ -25,6 +25,16 @@ namespace Arcane
 		return m_IndexBuffer;
 	}
 
+	void OpenGLVertexBuffer::Bind()
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, m_VBO);
+	}
+
+	void OpenGLVertexBuffer::UnBind()
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+	}
+
 	////////////////////////////////////////////////////////
 	//// Index Buffer
 	////////////////////////////////////////////////////////
@@ -42,4 +52,14 @@ namespace Arcane
 	{
 		return m_Count;
 	}
+
+	void OpenGLIndexBuffer::Bind()
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_EBO);
+	}
+
+	void OpenGLIndexBuffer::UnBind()
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	}
 }
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLBuffer.h b/Arcane/src/Arcane/Platform/OpenGL/OpenGLBuffer.h
@@ -13,6 +13,9 @@ namespace Arcane
 
 		void AddIndexBuffer(IndexBuffer* _indexBuffer) override;
 		IndexBuffer* GetIndexBuffer() override;
+
+		void Bind();
+		void UnBind();
 	private:
 		IndexBuffer* m_IndexBuffer;
 		uint32_t m_VBO;
@@ -27,6 +30,9 @@ namespace Arcane
 		OpenGLIndexBuffer(void* data, uint32_t count);
 
 		uint32_t GetCount();
+
+		void Bind();
+		void UnBind();
 	private:
 		uint32_t m_EBO;
 		uint32_t m_Count;

diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLPipeline.cpp b/Arcane/src/Arcane/Platform/OpenGL/OpenGLPipeline.cpp
@@ -1,8 +1,36 @@
 #include "OpenGLPipeline.h"
 
+#include "OpenGLShader.h"
+#include "OpenGLVertexDescriptor.h"
+
 namespace Arcane
 {
 	OpenGLPipeline::OpenGLPipeline(PipelineSpecification& spec)
 	{
+		m_Spec = spec;
+	}
+
+	void OpenGLPipeline::BindShader()
+	{
+		OpenGLShader* shader = static_cast<OpenGLShader*>(m_Spec.shader);
+		shader->Bind();
+	}
+
+	void OpenGLPipeline::BindVertexDescriptor()
+	{
+		OpenGLVertexDescriptor* vertexDescriptor = static_cast<OpenGLVertexDescriptor*>(m_Spec.descriptor);
+		vertexDescriptor->Bind();
+	}
+
+	void OpenGLPipeline::UnbindShader()
+	{
+		OpenGLShader* shader = static_cast<OpenGLShader*>(m_Spec.shader);
+		shader->UnBind();
+	}
+
+	void OpenGLPipeline::UnbindVertexDescriptor()
+	{
+		OpenGLVertexDescriptor* vertexDescriptor = static_cast<OpenGLVertexDescriptor*>(m_Spec.descriptor);
+		vertexDescriptor->UnBind();
 	}
 }
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLPipeline.h b/Arcane/src/Arcane/Platform/OpenGL/OpenGLPipeline.h
@@ -7,7 +7,13 @@ namespace Arcane
 	{
 	public:
 		OpenGLPipeline(PipelineSpecification& spec);
+
+		void BindShader();
+		void BindVertexDescriptor();
+
+		void UnbindShader();
+		void UnbindVertexDescriptor();
 	private:
-
+		PipelineSpecification m_Spec;
 	};
 }
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLRenderer.cpp b/Arcane/src/Arcane/Platform/OpenGL/OpenGLRenderer.cpp
@@ -27,11 +27,28 @@ namespace Arcane
 
 	void OpenGLRenderer::BeginRenderPass(RenderPass* renderPass)
 	{
-		if (renderPass->GetRenderPassSpecs().SwapchainFramebuffer)
-			return;
-
-		OpenGLFramebuffer* framebuffer = static_cast<OpenGLFramebuffer*>(renderPass->GetRenderPassSpecs().TargetFramebuffer);
-		framebuffer->Bind();
+		if (renderPass->GetRenderPassSpecs().SwapchainFramebuffer) {
+			OpenGLFramebuffer* framebuffer = static_cast<OpenGLFramebuffer*>(renderPass->GetRenderPassSpecs().TargetFramebuffer);
+			glClear(GL_COLOR_BUFFER_BIT);
+			glClearColor(
+				framebuffer->GetSpecs().ClearColor.x,
+				framebuffer->GetSpecs().ClearColor.y,
+				framebuffer->GetSpecs().ClearColor.z,
+				framebuffer->GetSpecs().ClearColor.w
+			);
+		}
+		else {
+			OpenGLFramebuffer* framebuffer = static_cast<OpenGLFramebuffer*>(renderPass->GetRenderPassSpecs().TargetFramebuffer);
+			framebuffer->Bind();
+
+			glClear(GL_COLOR_BUFFER_BIT);
+			glClearColor(
+				framebuffer->GetSpecs().ClearColor.x,
+				framebuffer->GetSpecs().ClearColor.y,
+				framebuffer->GetSpecs().ClearColor.z,
+				framebuffer->GetSpecs().ClearColor.w
+			);
+		}
 	}
 
 	void OpenGLRenderer::EndRenderPass(RenderPass* renderPass)

diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLShader.cpp b/Arcane/src/Arcane/Platform/OpenGL/OpenGLShader.cpp
@@ -40,6 +40,7 @@ namespace Arcane
 			auto vertexSpirv = readFile(vertexShader);
 			spirv_cross::CompilerGLSL glsl(std::move(vertexSpirv));
 			std::string source = glsl.compile();
+			std::cout << source << std::endl;
 
 			GLuint vertexShaderProgram = glCreateShader(GL_VERTEX_SHADER);
 			const GLchar* shaderSource = (const GLchar*)source.c_str();
@@ -66,12 +67,15 @@ namespace Arcane
 			}
 		}
 
+		std::cout << std::endl;
+
 		GLuint fragmentProgram = 0;
 		// Setup Fragment Source 
 		{
 			auto fragmentSpirv = readFile(fragmentShader);
 			spirv_cross::CompilerGLSL glsl(std::move(fragmentSpirv));
 			std::string source = glsl.compile();
+			std::cout << source << std::endl;
 
 			GLuint fragmentShaderProgram = glCreateShader(GL_FRAGMENT_SHADER);
 			const GLchar* shaderSource = (const GLchar*)source.c_str();
@@ -145,5 +149,15 @@ namespace Arcane
 	{
 		return uint32_t();
 	}
+
+	void OpenGLShader::Bind()
+	{
+		glUseProgram(m_ShaderProgram);
+	}
+
+	void OpenGLShader::UnBind()
+	{
+		glUseProgram(0);
+	}
 
 }
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLShader.h b/Arcane/src/Arcane/Platform/OpenGL/OpenGLShader.h
@@ -15,6 +15,9 @@ namespace Arcane
 		DescriptorSet* GetMaterialDescriptor() override;
 		std::vector<ShaderVariable> GetMaterialVariables() override;
 		uint32_t GetMaterialSize() override;
+
+		void Bind();
+		void UnBind();
 	private:
 		uint32_t m_ShaderProgram;
 	};

diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLVertexDescriptor.cpp b/Arcane/src/Arcane/Platform/OpenGL/OpenGLVertexDescriptor.cpp
@@ -0,0 +1,89 @@
+#include "OpenGLVertexDescriptor.h"
+
+namespace Arcane
+{
+	OpenGLVertexDescriptor::OpenGLVertexDescriptor(std::initializer_list<VertexType> vertexTypes)
+	{
+		// Generate VAO
+		glGenVertexArrays(1, &m_VAO);
+		glBindVertexArray(m_VAO);
+
+		// Calculate Stride
+		uint32_t stride = 0;
+		for (auto element : vertexTypes)
+		{
+			switch (element)
+			{
+			case VertexType::float1:
+			{
+				stride += sizeof(float);
+				break;
+			}
+			case VertexType::float2:
+			{
+				stride += sizeof(float) * 2;
+				break;
+			}
+			case VertexType::float3:
+			{
+				stride += sizeof(float) * 3;
+				break;
+			}
+			case VertexType::float4:
+			{
+				stride += sizeof(float) * 4;
+				break;
+			}
+			default:
+				break;
+			}
+		}
+
+		// Attribute Arrays
+		uint32_t count = 0;
+		uint32_t offset = 0;
+		for (auto element : vertexTypes)
+		{
+			switch (element)
+			{
+			case VertexType::float1:
+			{
+				stride += sizeof(float);
+				break;
+			}
+			case VertexType::float2:
+			{
+				stride += sizeof(float) * 2;
+				break;
+			}
+			case VertexType::float3:
+			{
+				glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, stride, (void*)offset);
+				glEnableVertexAttribArray(count);
+				offset += 3 * sizeof(float);
+				count += 1;
+				break;
+			}
+			case VertexType::float4:
+			{
+				stride += sizeof(float) * 4;
+				break;
+			}
+			default:
+				break;
+			}
+		}
+
+		glBindVertexArray(0);
+	}
+
+	void OpenGLVertexDescriptor::Bind()
+	{
+		glBindVertexArray(m_VAO);
+	}
+
+	void OpenGLVertexDescriptor::UnBind()
+	{
+		glBindVertexArray(0);
+	}
+}
diff --git a/Arcane/src/Arcane/Platform/OpenGL/OpenGLVertexDescriptor.h b/Arcane/src/Arcane/Platform/OpenGL/OpenGLVertexDescriptor.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Arcane/Renderer/VertexDescriptor.h"
+
+#include <glad/glad.h>
+#include <iostream>
+
+namespace Arcane
+{
+	class OpenGLVertexDescriptor : public VertexDescriptor
+	{
+	public:
+		OpenGLVertexDescriptor(std::initializer_list<VertexType> vertexTypes);
+
+		void Bind();
+		void UnBind();
+	private:
+		uint32_t m_VAO;
+
+	};
+}
diff --git a/Arcane/src/Arcane/Renderer/Buffer.cpp b/Arcane/src/Arcane/Renderer/Buffer.cpp
@@ -5,6 +5,9 @@
 // -- Vulkan
 #include "Arcane/Platform/Vulkan/VulkanBuffer.h"
 
+// -- OpenGL
+#include "Arcane/Platform/OpenGL/OpenGLBuffer.h"
+
 namespace Arcane {
 
 	////////////////////////////////////////////////////////
@@ -15,6 +18,7 @@ namespace Arcane {
 		switch (RendererAPI::Current())
 		{
 		case RendererAPIType::Vulkan: return new VulkanVertexBuffer(data, size);
+		case RendererAPIType::OpenGL: return new OpenGLVertexBuffer(data, size);
 		default: return nullptr;
 		}
 	}
@@ -27,6 +31,7 @@ namespace Arcane {
 		switch (RendererAPI::Current())
 		{
 		case RendererAPIType::Vulkan: return new VulkanIndexBuffer(data, count);
+		case RendererAPIType::OpenGL: return new OpenGLIndexBuffer(data, count);
 		default: return nullptr;
 		}
 	}

diff --git a/Arcane/src/Arcane/Renderer/VertexDescriptor.cpp b/Arcane/src/Arcane/Renderer/VertexDescriptor.cpp
@@ -5,12 +5,16 @@
 // -- Vulkan
 #include "Arcane/Platform/Vulkan/VulkanVertexDescriptor.h"
 
+// -- OpenGL
+#include "Arcane/Platform/OpenGL/OpenGLVertexDescriptor.h"
+
 namespace Arcane {
 	VertexDescriptor* VertexDescriptor::Create(std::initializer_list<VertexType> vertexTypes)
 	{
 		switch (RendererAPI::Current())
 		{
 		case RendererAPIType::Vulkan: return new VulkanVertexDescriptor(vertexTypes);
+		case RendererAPIType::OpenGL: return new OpenGLVertexDescriptor(vertexTypes);
 		default: return nullptr;
 		}
 

diff --git a/EnchantingTable/src/EditorAssets/Shaders/Triangle.frag b/EnchantingTable/src/EditorAssets/Shaders/Triangle.frag
@@ -0,0 +1,7 @@
+#version 330
+layout (location = 0) out vec4 FragColor;
+
+void main()
+{
+    FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
+} 
diff --git a/EnchantingTable/src/EditorAssets/Shaders/Triangle.vert b/EnchantingTable/src/EditorAssets/Shaders/Triangle.vert
@@ -0,0 +1,7 @@
+#version 330
+layout (location = 0) in vec3 aPos;
+
+void main()
+{
+    gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0);
+}
diff --git a/EnchantingTable/src/EditorAssets/Shaders/TriangleFrag.spv b/EnchantingTable/src/EditorAssets/Shaders/TriangleFrag.spv
diff --git a/EnchantingTable/src/EditorAssets/Shaders/TriangleVert.spv b/EnchantingTable/src/EditorAssets/Shaders/TriangleVert.spv