wip

Author: azer89

HelloVulkan/Source/Apps/AppPBRShadow.cpp

@@ -146,21 +146,6 @@ void AppPBRShadow::UpdateUBOs()
 	skyboxUbo.view = glm::mat4(glm::mat3(skyboxUbo.view));
 	skyboxPtr_->SetCameraUBO(vulkanContext_, skyboxUbo);
 
-	// Shadow mapping
-	// Temp
-	/*for (size_t i = 0; i < ShadowConfig::CascadeCount; ++i)
-	{
-		shadowUBO_.lightSpaceMatrices[i] = glm::mat4(1.0f);
-		shadowUBO_.splitValues[i] = (i + 1) * 2;
-	}*/
-
-	//LightData light = resLights_->lights_[0];
-	/*glm::mat4 lightProjection = glm::perspective(glm::radians(45.f), 1.0f, shadowUBO_.shadowNearPlane, shadowUBO_.shadowFarPlane);
-	glm::mat4 lightView = glm::lookAt(glm::vec3(light.position_), glm::vec3(0.0f), glm::vec3(0.0, 1.0, 0.0));
-	glm::mat4 lightSpaceMatrix = lightProjection * lightView;
-	shadowUBO_.lightSpaceMatrices[0] = lightSpaceMatrix;
-	shadowUBO_.lightPosition = light.position_;
-	*/
 	shadowPtr_->CalculateCascade(vulkanContext_, camera_.get(), & (resLight_->lights_[0]), &shadowUBO_);
 	pbrPtr_->SetShadowMapConfigUBO(vulkanContext_, shadowUBO_);
 }
@@ -207,7 +192,7 @@ void AppPBRShadow::UpdateUI()
 	ImGui::SliderFloat("Max Bias", &staticShadowUBO.shadowMaxBias, 0.001f, 0.1f);
 	ImGui::SliderFloat("Near Plane", &staticShadowUBO.shadowNearPlane, 0.1f, 50.0f);
 	ImGui::SliderFloat("Far Plane", &staticShadowUBO.shadowFarPlane, 10.0f, 150.0f);
-	ImGui::SliderFloat("PCF Scale", &staticShadowUBO.pcfScale, 0.1f, 1.0f);
+	ImGui::SliderFloat("PCF Scale", &staticShadowUBO.pcfScale, 0.1f, 3.0f);
 	ImGui::SliderInt("PCF Iteration", &staticPCFIteration, 1, 10);
 
 	ImGui::SeparatorText("Light position");

Shaders/ShadowMapping/PCF.glsl

@@ -9,9 +9,7 @@ float ShadowPCF(vec4 sc, uint cascadeIndex)
 	vec3 lightDir = normalize(shadowUBO.lightPosition.xyz - worldPos);
 	float bias = max(shadowUBO.shadowMaxBias * (1.0 - dot(N, lightDir)), shadowUBO.shadowMinBias);
 
-	// TODO Very slow, consider change to a constant for better performance
-	//const int range = 2;
-	int range = int(shadowUBO.pcfIteration);
+	const int range = 2;
 	float shadow = 0.0;
 	int count = 0;
 	for (int x = -range; x <= range; x++)