Model loading and rendering

Pilzschaf · Pilzschaf · commit 93822bceca7c · 2022-08-03T12:09:25.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "libs/stb"]
 	path = libs/stb
 	url = https://github.com/nothings/stb.git
+[submodule "libs/cgltf"]
+	path = libs/cgltf
+	url = https://github.com/jkuhlmann/cgltf.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
 
-set(SOURCE_FILES src/main.cpp src/simple_logger.cpp src/vulkan_base/vulkan_device.cpp src/vulkan_base/vulkan_swapchain.cpp src/vulkan_base/vulkan_renderpass.cpp src/vulkan_base/vulkan_pipeline.cpp src/vulkan_base/vulkan_utils.cpp)
+set(SOURCE_FILES src/main.cpp src/simple_logger.cpp src/model.cpp src/vulkan_base/vulkan_device.cpp src/vulkan_base/vulkan_swapchain.cpp src/vulkan_base/vulkan_renderpass.cpp src/vulkan_base/vulkan_pipeline.cpp src/vulkan_base/vulkan_utils.cpp)
 
 # Find SDL2
 add_subdirectory(libs/SDL)
diff --git a/data/models/monkey.glb b/data/models/monkey.glb
diff --git a/libs/cgltf b/libs/cgltf
@@ -0,0 +1 @@
+Subproject commit cd37936659b448554f612a145d05e76ff27832a6
diff --git a/shaders/compile.bat b/shaders/compile.bat
@@ -3,4 +3,6 @@ glslc.exe -fshader-stage=frag triangle_frag.glsl -o triangle_frag.spv
 glslc.exe -fshader-stage=vert color_vert.glsl -o color_vert.spv
 glslc.exe -fshader-stage=frag color_frag.glsl -o color_frag.spv
 glslc.exe -fshader-stage=vert texture_vert.glsl -o texture_vert.spv
-glslc.exe -fshader-stage=frag texture_frag.glsl -o texture_frag.spv
+glslc.exe -fshader-stage=frag texture_frag.glsl -o texture_frag.spv
+glslc.exe -fshader-stage=vert model_vert.glsl -o model_vert.spv
+glslc.exe -fshader-stage=frag model_frag.glsl -o model_frag.spv
diff --git a/shaders/compile.sh b/shaders/compile.sh
@@ -4,4 +4,6 @@ glslc -fshader-stage=frag triangle_frag.glsl -o triangle_frag.spv
 glslc -fshader-stage=vert color_vert.glsl -o color_vert.spv
 glslc -fshader-stage=frag color_frag.glsl -o color_frag.spv
 glslc -fshader-stage=vert texture_vert.glsl -o texture_vert.spv
-glslc -fshader-stage=frag texture_frag.glsl -o texture_frag.spv
+glslc -fshader-stage=frag texture_frag.glsl -o texture_frag.spv
+glslc -fshader-stage=vert model_vert.glsl -o model_vert.spv
+glslc -fshader-stage=frag model_frag.glsl -o model_frag.spv
diff --git a/shaders/model_frag.glsl b/shaders/model_frag.glsl
@@ -0,0 +1,7 @@
+#version 450 core
+
+layout(location = 0) out vec4 out_color;
+
+void main() {
+	out_color = vec4(1.0);
+}
diff --git a/shaders/model_frag.spv b/shaders/model_frag.spv
diff --git a/shaders/model_vert.glsl b/shaders/model_vert.glsl
@@ -0,0 +1,7 @@
+#version 450 core
+
+layout(location = 0) in vec3 in_position;
+
+void main() {
+	gl_Position = vec4(in_position.x, -in_position.y, in_position.z, 1.0);
+}
diff --git a/shaders/model_vert.spv b/shaders/model_vert.spv
diff --git a/src/main.cpp b/src/main.cpp
@@ -7,6 +7,7 @@
 
 #include "logger.h"
 #include "vulkan_base/vulkan_base.h"
+#include "model.h"
 
 #define FRAMES_IN_FLIGHT 2
 
@@ -15,7 +16,8 @@ VkSurfaceKHR surface;
 VulkanSwapchain swapchain;
 VkRenderPass renderPass;
 std::vector<VkFramebuffer> framebuffers;
-VulkanPipeline pipeline;
+VulkanPipeline spritePipeline;
+VulkanPipeline modelPipeline;
 VkCommandPool commandPools[FRAMES_IN_FLIGHT];
 VkCommandBuffer commandBuffers[FRAMES_IN_FLIGHT];
 VkFence fences[FRAMES_IN_FLIGHT];
@@ -30,6 +32,8 @@ VkDescriptorPool descriptorPool;
 VkDescriptorSet descriptorSet;
 VkDescriptorSetLayout descriptorLayout;
 
+Model model;
+
 bool handleMessage() {
 	SDL_Event event;
 	while (SDL_PollEvent(&event)) {
@@ -188,7 +192,21 @@ void initApplication(SDL_Window* window) {
 	vertexInputBinding.binding = 0;
 	vertexInputBinding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
 	vertexInputBinding.stride = sizeof(float) * 7;
-	pipeline = createPipeline(context, "../shaders/texture_vert.spv", "../shaders/texture_frag.spv", renderPass, swapchain.width, swapchain.height, vertexAttributeDescriptions, ARRAY_COUNT(vertexAttributeDescriptions), &vertexInputBinding, 1, &descriptorLayout);
+	spritePipeline = createPipeline(context, "../shaders/texture_vert.spv", "../shaders/texture_frag.spv", renderPass, swapchain.width, swapchain.height, 
+									vertexAttributeDescriptions, ARRAY_COUNT(vertexAttributeDescriptions), &vertexInputBinding, 1, &descriptorLayout);
+
+
+	VkVertexInputAttributeDescription modelAttributeDescriptions[1] = {};
+	modelAttributeDescriptions[0].binding = 0;
+	modelAttributeDescriptions[0].location = 0;
+	modelAttributeDescriptions[0].format = VK_FORMAT_R32G32B32_SFLOAT;
+	modelAttributeDescriptions[0].offset = 0;
+	VkVertexInputBindingDescription modelInputBinding = {};
+	modelInputBinding.binding = 0;
+	modelInputBinding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+	modelInputBinding.stride = sizeof(float) * 3;
+	modelPipeline = createPipeline(context, "../shaders/model_vert.spv", "../shaders/model_frag.spv", renderPass, swapchain.width, swapchain.height,
+									modelAttributeDescriptions, ARRAY_COUNT(modelAttributeDescriptions), &modelInputBinding, 0, 0);
 
 	for(uint32_t i = 0; i < ARRAY_COUNT(fences); ++i) {
 		VkFenceCreateInfo createInfo = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO };
@@ -220,6 +238,8 @@ void initApplication(SDL_Window* window) {
 	
 	createBuffer(context, &indexBuffer, sizeof(indexData), VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
 	uploadDataToBuffer(context, &indexBuffer, indexData, sizeof(indexData));
+
+	model = createModel(context, "../data/models/monkey.glb");
 }
 
 void recreateSwapchain() {
@@ -281,14 +301,20 @@ void renderApplication() {
 		beginInfo.pClearValues = &clearValue;
 		vkCmdBeginRenderPass(commandBuffer, &beginInfo, VK_SUBPASS_CONTENTS_INLINE);
 
-		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline.pipeline);
-
+#if 0
+		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, spritePipeline.pipeline);
 		VkDeviceSize offset = 0;
 		vkCmdBindVertexBuffers(commandBuffer, 0, 1, &vertexBuffer.buffer, &offset);
 		vkCmdBindIndexBuffer(commandBuffer, indexBuffer.buffer, 0, VK_INDEX_TYPE_UINT32);
-		vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline.pipelineLayout, 0, 1, &descriptorSet, 0, 0);
-
+		vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, spritePipeline.pipelineLayout, 0, 1, &descriptorSet, 0, 0);
 		vkCmdDrawIndexed(commandBuffer, ARRAY_COUNT(indexData), 1, 0, 0, 0);
+#else
+		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, modelPipeline.pipeline);
+		VkDeviceSize offset = 0;
+		vkCmdBindVertexBuffers(commandBuffer, 0, 1, &model.vertexBuffer.buffer, &offset);
+		vkCmdBindIndexBuffer(commandBuffer, model.indexBuffer.buffer, 0, VK_INDEX_TYPE_UINT16);
+		vkCmdDrawIndexed(commandBuffer, model.numIndices, 1, 0, 0, 0);
+#endif
 
 		vkCmdEndRenderPass(commandBuffer);
 
@@ -329,6 +355,7 @@ void shutdownApplication() {
 	VK(vkDestroyDescriptorPool(context->device, descriptorPool, 0));
 	VK(vkDestroyDescriptorSetLayout(context->device, descriptorLayout, 0));
 
+	destroyModel(context, &model);
 	destroyBuffer(context, &vertexBuffer);
 	destroyBuffer(context, &indexBuffer);
 
@@ -343,7 +370,8 @@ void shutdownApplication() {
 		VK(vkDestroyCommandPool(context->device, commandPools[i], 0));
 	}
 
-	destroyPipeline(context, &pipeline);
+	destroyPipeline(context, &spritePipeline);
+	destroyPipeline(context, &modelPipeline);
 
 	vkDestroySampler(context->device, sampler, 0);
 
diff --git a/src/model.cpp b/src/model.cpp
@@ -0,0 +1,50 @@
+#include "model.h"
+
+#define CGLTF_IMPLEMENTATION
+#include <cgltf/cgltf.h>
+
+Model createModel(VulkanContext* context, const char* filename) {
+    Model result = {};
+    cgltf_options options = {};
+    cgltf_data* data = 0;
+    cgltf_result error = cgltf_parse_file(&options, filename, &data);
+    if(error == cgltf_result_success) {
+        error = cgltf_load_buffers(&options, data, "../data/models");
+        if(error == cgltf_result_success) {
+            assert(data->meshes_count == 1);
+            assert(data->meshes[0].primitives_count == 1);
+            assert(data->meshes[0].primitives[0].attributes_count > 0);
+            assert(data->meshes[0].primitives[0].attributes[0].type == cgltf_attribute_type_position);
+            assert(data->meshes[0].primitives[0].attributes[0].data->stride == sizeof(float)*3);
+            assert(data->meshes[0].primitives[0].indices->component_type == cgltf_component_type_r_16u);
+            assert(data->meshes[0].primitives[0].indices->stride == sizeof(uint16_t));
+
+            // Indices
+            uint8_t* bufferBase = (uint8_t*)data->meshes[0].primitives[0].indices->buffer_view->buffer->data;
+            uint64_t indexDataSize = data->meshes[0].primitives[0].indices->buffer_view->size;
+            void* indexData = bufferBase + data->meshes[0].primitives[0].indices->buffer_view->offset;
+
+            createBuffer(context, &result.indexBuffer, indexDataSize, VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+            uploadDataToBuffer(context, &result.indexBuffer, indexData, indexDataSize);
+            result.numIndices = data->meshes[0].primitives[0].indices->count;
+
+
+            // Vertices
+            bufferBase = (uint8_t*)data->meshes[0].primitives[0].attributes[0].data->buffer_view->buffer->data;
+            uint64_t vertexDataSize = data->meshes[0].primitives[0].attributes[0].data->buffer_view->size;
+            void* vertexData = bufferBase + data->meshes[0].primitives[0].attributes[0].data->buffer_view->offset;
+
+            createBuffer(context, &result.vertexBuffer, vertexDataSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+            uploadDataToBuffer(context, &result.vertexBuffer, vertexData, vertexDataSize);
+        }
+        cgltf_free(data);
+    }
+
+    return result;
+}
+
+void destroyModel(VulkanContext* context, Model* model) {
+    destroyBuffer(context, &model->vertexBuffer);
+    destroyBuffer(context, &model->indexBuffer);
+    *model = {};
+}
diff --git a/src/model.h b/src/model.h
@@ -0,0 +1,10 @@
+#include "vulkan_base/vulkan_base.h"
+
+struct Model {
+    VulkanBuffer vertexBuffer;
+    VulkanBuffer indexBuffer;
+    uint64_t numIndices;
+};
+
+Model createModel(VulkanContext* context, const char* filename);
+void destroyModel(VulkanContext* context, Model* model);
diff --git a/src/vulkan_base/vulkan_base.h b/src/vulkan_base/vulkan_base.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "../logger.h"
 
 #include <vulkan/vulkan.h>
