wip

Author: azer89

HelloVulkan/Source/Apps/AppPBRShadow.cpp

@@ -161,7 +161,7 @@ void AppPBRShadow::UpdateUBOs()
 	shadowUBO_.lightSpaceMatrices[0] = lightSpaceMatrix;
 	shadowUBO_.lightPosition = light.position_;
 	*/
-	shadowPtr_->CalculateCascade2(vulkanContext_, camera_.get(), & (resLight_->lights_[0]), &shadowUBO_);
+	shadowPtr_->CalculateCascade(vulkanContext_, camera_.get(), & (resLight_->lights_[0]), &shadowUBO_);
 	pbrPtr_->SetShadowMapConfigUBO(vulkanContext_, shadowUBO_);
 }
 

HelloVulkan/Source/Pipelines/PipelineShadow.cpp

@@ -167,7 +167,7 @@ void PipelineShadow::CalculateCascade(
 		}
 		frustumCenter /= 8.0f;
 
-		float radius = 0.0f;
+		/*float radius = 0.0f;
 		for (uint32_t i = 0; i < 8; i++)
 		{
 			float distance = glm::length(frustumCorners[i] - frustumCenter);
@@ -184,7 +184,47 @@ void PipelineShadow::CalculateCascade(
 			-radius,
 			radius,
 			0.0f,
-			radius * 2.0f);
+			radius * 2.0f);*/
+
+		glm::mat4 lightViewMatrix = glm::lookAt(frustumCenter + normLightPos, frustumCenter, glm::vec3(0.0f, 1.0f, 0.0f));
+
+		float minX = std::numeric_limits<float>::max();
+		float maxX = std::numeric_limits<float>::lowest();
+		float minY = std::numeric_limits<float>::max();
+		float maxY = std::numeric_limits<float>::lowest();
+		float minZ = std::numeric_limits<float>::max();
+		float maxZ = std::numeric_limits<float>::lowest();
+		for (const auto& v : frustumCorners)
+		{
+			glm::vec4 trf = lightViewMatrix * glm::vec4(v, 1.0f);
+			minX = std::min(minX, trf.x);
+			maxX = std::max(maxX, trf.x);
+			minY = std::min(minY, trf.y);
+			maxY = std::max(maxY, trf.y);
+			minZ = std::min(minZ, trf.z);
+			maxZ = std::max(maxZ, trf.z);
+		}
+
+		// Tune this parameter according to the scene
+		if (minZ < 0)
+		{
+			minZ *= zMult;
+		}
+		else
+		{
+			minZ /= zMult;
+		}
+
+		if (maxZ < 0)
+		{
+			maxZ /= zMult;
+		}
+		else
+		{
+			maxZ *= zMult;
+		}
+
+		const glm::mat4 lightOrthoMatrix = glm::ortho(minX, maxX, minY, maxY, minZ, maxZ);
 
 		// Store split distance and matrix in cascade
 		ubo->lightSpaceMatrices[a] = lightOrthoMatrix * lightViewMatrix;
@@ -290,7 +330,7 @@ glm::mat4 PipelineShadow::GetLightSpaceMatrix(const Camera* camera, float near,
 	float maxZ = std::numeric_limits<float>::lowest();
 	for (const auto& v : corners)
 	{
-		const auto trf = lightView * v;
+		glm::vec4 trf = lightView * v;
 		minX = std::min(minX, trf.x);
 		maxX = std::max(maxX, trf.x);
 		minY = std::min(minY, trf.y);

Shaders/ShadowMapping/Scene.frag

@@ -144,7 +144,7 @@ void main()
 
 	fragColor = vec4(color, 1.0);
 
-	switch (cascadeIndex)
+	/*switch (cascadeIndex)
 	{
 		case 0:
 			fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f);
@@ -158,5 +158,5 @@ void main()
 		case 3:
 			fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f);
 			break;
-	}
+	}*/
 }