it works

Author: azer89

HelloVulkan/Source/Pipelines/PipelineShadow.cpp

@@ -110,6 +110,7 @@ void PipelineShadow::CalculateCascade(
 
 	const glm::mat4 invCam = glm::inverse(camera->GetProjectionMatrix() * camera->GetViewMatrix());
 	const glm::vec3 normLightPos = normalize(glm::vec3(light->position_.x, light->position_.y, light->position_.z));
+	//const float lightDist = glm::length(glm::vec3(light->pos));
 	const float clipNear = CameraConfig::Near;
 	const float clipFar = CameraConfig::Far;
 	const float clipRange = clipFar - clipNear;
@@ -167,78 +168,34 @@ 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);
 			radius = glm::max(radius, distance);
 		}
 		radius = std::ceil(radius * 16.0f) / 16.0f;
 
-		glm::vec3 eye = frustumCenter + normLightPos * radius;
+		glm::vec3 eye = frustumCenter + glm::vec3(light->position_);
 		glm::vec3 target = frustumCenter;
 		glm::mat4 lightViewMatrix = glm::lookAt(eye, target, glm::vec3(0.0f, 1.0f, 0.0f));
 		glm::mat4 lightOrthoMatrix = glm::ortho(
 			-radius,
 			radius,
 			-radius,
 			radius,
-			0.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);
+			0.f,
+			clipFar);
 
 		// Store split distance and matrix in cascade
 		ubo->lightSpaceMatrices[a] = lightOrthoMatrix * lightViewMatrix;
 		ubo->orthoMatrices[a] = lightOrthoMatrix;
 		ubo->viewMatrices[a] = lightViewMatrix;
 		ubo->splitValues[a] = (clipNear + splitDist * clipRange) * -1.0f;
-
+		
 		lastSplitDist = cascadeSplits[a];
 	}
 
-	/*glm::mat4 lightProjection = glm::perspective(glm::radians(45.f), 1.0f, ubo->shadowNearPlane, ubo->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;
-	ubo->lightSpaceMatrices[0] = lightSpaceMatrix;*/
 	ubo->lightPosition = light->position_;
 
 	// Copy UBO to the buffer