Not Crashing Currently

Arcane/src/Arcane/Platform/Vulkan/VulkanContext.cpp

@@ -61,6 +61,7 @@ namespace Arcane {
 
 	void VulkanContext::SwapBuffers()
 	{
+		// printf("Swapchain Image index: %d\n", m_SwapChain->GetImageIndex());
 		m_SwapChain->SwapBuffers();
 	}
 }

Arcane/src/Arcane/Platform/Vulkan/VulkanPipeline.h

@@ -9,6 +9,7 @@ namespace Arcane {
 	public:
 		VulkanPipeline(PipelineSpecification& spec);
 
+		VkPipelineLayout GetLayout() { return m_PipelineLayout; }
 		VkPipeline GetPipeline() { return m_Pipeline; }
 	private:
 		VkPipelineLayout m_PipelineLayout;

Arcane/src/Arcane/Platform/Vulkan/VulkanSwapChain.cpp

@@ -227,6 +227,7 @@ namespace Arcane {
 
         uint32_t imageIndex;
         vkAcquireNextImageKHR(_context->GetDevice().GetLogicalDevice(), m_SwapChain, UINT64_MAX, m_ImageAvailableSemaphores[m_CurrentFrameIndex], VK_NULL_HANDLE, &imageIndex);
+        m_CurrentImageIndex = imageIndex;
 
         if (m_ImagesInFlight[imageIndex] != VK_NULL_HANDLE) {
             vkWaitForFences(_context->GetDevice().GetLogicalDevice(), 1, &m_ImagesInFlight[imageIndex], VK_TRUE, UINT64_MAX);

Arcane/src/Arcane/Platform/Vulkan/VulkanSwapChain.h

@@ -19,6 +19,8 @@ namespace Arcane {
 		std::vector<VkFramebuffer> GetSwapChainFramebuffers() { return m_SwapChainFramebuffers; }
 		uint32_t GetSwapChainImagesSize() { return m_SwapChainImages.size(); }
 
+		uint32_t GetImageIndex() { return m_CurrentImageIndex; }
+
 		void SwapBuffers();
 	private:
 		VkSurfaceFormatKHR ChooseSwapSurfaceFormat(const std::vector<VkSurfaceFormatKHR>& availableFormats);
@@ -47,5 +49,6 @@ namespace Arcane {
 
 		int m_MaxFramesInFlight = 2;
 		size_t m_CurrentFrameIndex = 0;
+		uint32_t m_CurrentImageIndex = 0;
 	};
 }

Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.cpp

@@ -23,6 +23,8 @@ namespace Arcane {
 
 	VulkanUniformBuffer::VulkanUniformBuffer(uint32_t size)
 	{
+		m_Size = size;
+
 		Application& app = Application::Get();
 		VulkanContext* context = static_cast<VulkanContext*>(app.GetWindow().GetContext());
 		VkDevice logicalDevice = context->GetDevice().GetLogicalDevice();
@@ -141,6 +143,13 @@ namespace Arcane {
 
 	void VulkanUniformBuffer::WriteData(void* data)
 	{
+		Application& app = Application::Get();
+		VulkanContext* context = static_cast<VulkanContext*>(app.GetWindow().GetContext());
+		VkDevice logicalDevice = context->GetDevice().GetLogicalDevice();
 
+		// Copy data into uniform buffer memory
+		vkMapMemory(logicalDevice, m_UniformBuffersMemory[context->GetSwapChain().GetImageIndex()], 0, m_Size, 0, &data);
+		memcpy(data, data, m_Size);
+		vkUnmapMemory(logicalDevice, m_UniformBuffersMemory[context->GetSwapChain().GetImageIndex()]);
 	}
 }

Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.h

@@ -34,5 +34,8 @@ namespace Arcane {
 		std::vector<VkBuffer> m_UniformBuffers;
 		std::vector<VkDeviceMemory> m_UniformBuffersMemory;
 		std::vector<VkDescriptorSet> m_DescriptorSets;
+
+		// Uniform Buffer Size
+		uint32_t m_Size;
 	};
 }

EnchantingTable/src/Assets/Shaders/Basic.vert

@@ -1,6 +1,6 @@
 #version 450
 
-layout (location = 0) uniform UniformBufferObject {
+layout (binding = 0) uniform UniformBufferObject {
 	mat4 model;
 	mat4 view;
 	mat4 proj;
@@ -12,6 +12,6 @@ layout (location = 1) in vec3 aColor;
 layout(location = 0) out vec3 fragColor;
 
 void main() {
-	gl_Position = vec4(aPos, 1.0);
+	gl_Position = ubo.proj * ubo.view * ubo.model * vec4(aPos, 1.0);
 	fragColor = aColor;
 }

EnchantingTable/src/EditorLayer.cpp

@@ -35,12 +35,14 @@ void EditorLayer::OnAttach()
 		Arcane::VertexType::float3
 	});
 
+	m_UniformBuffer = Arcane::UniformBuffer::Create(sizeof(UniformBufferObject));
+
 	// Test Pipeline
 	Arcane::PipelineSpecification spec;
 	spec.descriptor = m_VertexDescriptor;
 	spec.renderPass = m_RenderPass;
 	spec.shader = m_Shader;
-	spec.uniformBuffer = Arcane::UniformBuffer::Create(sizeof(UniformBufferObject));
+	spec.uniformBuffer = m_UniformBuffer;
 
 	m_Pipeline = Arcane::Pipeline::Create(spec);
 
@@ -60,6 +62,15 @@ void EditorLayer::OnAttach()
 	m_VertexBuffer = Arcane::VertexBuffer::Create(vertices.data(), sizeof(TestVertex) * vertices.size());
 	Arcane::IndexBuffer* indexBuffer = Arcane::IndexBuffer::Create(indices.data(), indices.size());
 	m_VertexBuffer->AddIndexBuffer(indexBuffer);
+
+	UniformBufferObject ubo{};
+	ubo.model = glm::rotate(glm::mat4(1.0f), glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+	ubo.view = glm::lookAt(glm::vec3(2.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+	ubo.proj = glm::perspective(glm::radians(45.0f), 1600.0f / 1200.0f, 0.1f, 10.0f);
+	ubo.proj[1][1] *= -1;
+
+	m_UniformBuffer->WriteData(&ubo);
+
 }
 
 void EditorLayer::OnDetach()
@@ -69,12 +80,10 @@ void EditorLayer::OnDetach()
 
 void EditorLayer::OnUpdate(float deltaTime)
 {
-	printf("%.2f\n", deltaTime);
+	// printf("%.2f\n", deltaTime);
 
-	UniformBufferObject ubo{};
-	ubo.model = glm::rotate(glm::mat4(1.0f), deltaTime * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
-	ubo.view = glm::lookAt(glm::vec3(2.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 1.0f));
-	ubo.proj = glm::perspective(glm::radians(45.0f), 1600.0f / 1200.0f, 0.1f, 10.0f);
+
+	// m_UniformBuffer->WriteData(&ubo);
 
 	// Begin a Render pass
 	Arcane::Renderer::BeginRenderPass(m_RenderPass);