Vulkan_Helpers: Send matrices to GPU to be calculated

Author: TechnicJelle

Vulkan_Helpers/assets/shaders/compiled/triangle.vert.spv

@@ -20,7 +20,9 @@ layout(buffer_reference, std430) readonly buffer VertexBuffer{
 //push constants block
 layout(push_constant) uniform constants
 {
-	mat4 render_matrix;
+	mat4 modelMatrix;
+	mat4 viewMatrix;
+	mat4 projectionMatrix;
 	VertexBuffer vertexBuffer;
 } PushConstants;
 
@@ -30,7 +32,7 @@ void main()
 	Vertex v = PushConstants.vertexBuffer.vertices[gl_VertexIndex];
 
 	//output data
-	gl_Position = PushConstants.render_matrix *vec4(v.position, 1.0f);
+	gl_Position = PushConstants.projectionMatrix * PushConstants.viewMatrix * PushConstants.modelMatrix * vec4(v.position, 1.0);
 	outColor = v.color;
 	outUV = vec2(v.uv_x, v.uv_y);
 }

Vulkan_Helpers/assets/shaders/triangle.vert.glsl

@@ -48,6 +48,8 @@ struct GPUMeshBuffers {
 };
 
 struct GPUDrawPushConstants {
-	math::float4x4 worldMatrix;
+	math::float4x4 modelMatrix;
+	math::float4x4 viewMatrix;
+	math::float4x4 projectionMatrix;
 	VkDeviceAddress vertexBufferAddress;
 };

Vulkan_Helpers/src/vk_custom_types.hpp

@@ -736,6 +736,10 @@ SDL_AppResult VulkanEngine::DrawGeometry(const VkCommandBuffer& commandBuffer) {
 
 	vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshPipelineLayout, 0, 1, &imageSet, 0, nullptr);
 
+	//Uniforms
+	// > Model Matrix
+	math::float4x4 model = math::float4x4(1.0f);
+
 	// > View Matrix
 	constexpr float radius = 10.0f;
 	float camX = sinf(static_cast<float>(SDL_GetTicks()) / 1000.0f) * radius;
@@ -748,15 +752,14 @@ SDL_AppResult VulkanEngine::DrawGeometry(const VkCommandBuffer& commandBuffer) {
 	// > Projection Matrix
 	math::int2 screenSize;
 	SDL_GetWindowSize(window, &screenSize.x, &screenSize.y);
-	math::float4x4 projection = perspective(math::degrees(45.0f).radians(),
-	                                        static_cast<float>(screenSize.x) / static_cast<float>(screenSize.y),
-	                                        0.1f, 1000.0f);
-
-	// invert the Y direction on projection matrix so that we are more similar to opengl and gltf axis
-	// projection[1][1] *= -1;
+	math::float4x4 proj = perspective(math::degrees(45.0f).radians(),
+	                                  static_cast<float>(screenSize.x) / static_cast<float>(screenSize.y),
+	                                  0.1f, 100.0f);
 
 	const GPUDrawPushConstants pushConstants{
-		.worldMatrix = view * projection,
+		.modelMatrix = model,
+		.viewMatrix = view,
+		.projectionMatrix = proj,
 		.vertexBufferAddress = meshes[selectedMeshIndex]->meshBuffers.vertexBufferAddress,
 	};