Phong illumination

Author: Pilzschaf

shaders/model_frag.glsl

@@ -2,14 +2,28 @@
 
 layout(location = 0) in vec3 in_normal;
 layout(location = 1) in vec2 in_texcoord;
+layout(location = 2) in vec3 in_position;
 
 layout(set = 0, binding = 1) uniform sampler2D in_albedoSampledTexture;
 
 layout(location = 0) out vec4 out_color;
 
 void main() {
+	vec3 view = normalize(-in_position);
+
 	vec4 texSample = texture(in_albedoSampledTexture, in_texcoord);
 	vec3 normal = normalize(in_normal);
+
+	vec3 light = normalize(vec3(1, 1, -1));
+	vec3 reflection = reflect(-light, normal);
+	float shininess = 16.0f;
+
+	vec3 diffuse = max(dot(normal, light), 0.0) * texSample.rgb;
+	vec3 specular = pow(max(dot(view, reflection), 0.0), shininess) * vec3(1.0);
+	vec3 ambient = 0.2f * texSample.rgb;
+
+	vec3 combined = 0.5 * diffuse + ambient + 0.4 * specular;
+
 	//out_color = vec4(normal * 0.5 + 0.5, 1.0);
-	out_color = texSample;
+	out_color = vec4(combined, texSample.a);
 }

shaders/model_frag.spv

@@ -6,14 +6,17 @@ layout(location = 2) in vec2 in_texcoord;
 
 layout(set = 0, binding = 0) uniform transform {
 	mat4 modelViewProj;
+	mat4 modelView;
 } u_transforms;
 
 layout(location = 0) out vec3 out_normal;
 layout(location = 1) out vec2 out_texcoord;
+layout(location = 2) out vec3 out_position;
 
 void main() {
 	mat4 modelViewProj = u_transforms.modelViewProj;
 	gl_Position = modelViewProj * vec4(in_position, 1.0);
-	out_normal = in_normal;
 	out_texcoord = in_texcoord;
+	out_normal = mat3(transpose(inverse(u_transforms.modelView))) * in_normal;
+	out_position = (u_transforms.modelView * vec4(in_position, 1.0)).xyz;
 }

shaders/model_vert.glsl

@@ -239,7 +239,7 @@ void initApplication(SDL_Window* window) {
 		VKA(vkCreateDescriptorPool(context->device, &createInfo, 0, &modelDescriptorPool));
 	}
 	for(uint32_t i = 0; i < FRAMES_IN_FLIGHT; ++i) {
-		createBuffer(context, &modelUniformBuffers[i], sizeof(glm::mat4), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+		createBuffer(context, &modelUniformBuffers[i], sizeof(glm::mat4)*2, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
 	}
 	{
 		VkDescriptorSetLayoutBinding bindings[] = {
@@ -258,7 +258,7 @@ void initApplication(SDL_Window* window) {
 			allocateInfo.pSetLayouts = &modelDescriptorSetLayout;
 			VKA(vkAllocateDescriptorSets(context->device, &allocateInfo, &modelDescriptorSets[i]));
 
-			VkDescriptorBufferInfo bufferInfo = {modelUniformBuffers[i].buffer, 0, sizeof(glm::mat4)};
+			VkDescriptorBufferInfo bufferInfo = {modelUniformBuffers[i].buffer, 0, sizeof(glm::mat4)*2};
 			VkDescriptorImageInfo imageInfo = {sampler, model.albedoTexture.view, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL};
 			VkWriteDescriptorSet descriptorWrites[2];
 			descriptorWrites[0] = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET};
@@ -468,10 +468,12 @@ void renderApplication() {
 		glm::mat4 modelMatrix = translationMatrix * scaleMatrix * rotationMatrix;
 
 		glm::mat4 modelViewProj = camera.viewProj * modelMatrix;
+		glm::mat4 modelView = camera.view * modelMatrix;
 
 		void* mapped;
-		VK(vkMapMemory(context->device, modelUniformBuffers[frameIndex].memory, 0, sizeof(glm::mat4), 0, &mapped));
+		VK(vkMapMemory(context->device, modelUniformBuffers[frameIndex].memory, 0, sizeof(glm::mat4)*2, 0, &mapped));
 		memcpy(mapped, &modelViewProj, sizeof(modelViewProj));
+		memcpy(((uint8_t*)mapped)+sizeof(glm::mat4), &modelView, sizeof(modelView));
 		VK(vkUnmapMemory(context->device, modelUniformBuffers[frameIndex].memory));
 
 		vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, modelPipeline.pipeline);