cleanup

Author: azer89

HelloVulkan/Header/Pipelines/PipelineShadow.h

@@ -23,21 +23,9 @@ class PipelineShadow final : public PipelineBase
 		const LightData* light, 
 		ShadowMapUBO* ubo);
 
-	void CalculateCascade2(VulkanContext& ctx,
-		const Camera* camera,
-		const LightData* light,
-		ShadowMapUBO* ubo);
-
-	glm::mat4 GetLightSpaceMatrix(const Camera* camera, float near, float far, glm::vec3 normLightPos);
-
-	std::vector<glm::vec4> GetFrustumCornersWorldSpace(glm::mat4& proj, glm::mat4& view);
-
 	virtual void FillCommandBuffer(VulkanContext& ctx, VkCommandBuffer commandBuffer) override;
 
 	void OnWindowResized(VulkanContext& ctx) override;
-
-public:
-	float zMult = 10.f;
 
 private:
 	void CreateDescriptor(VulkanContext& ctx);

HelloVulkan/Source/Apps/AppPBRShadow.cpp

@@ -192,7 +192,6 @@ void AppPBRShadow::UpdateUI()
 	};
 	static float staticLightPos[3] = { -5.f, 30.0f, 5.0f};
 	static int staticPCFIteration = 2;
-	static float zMult = 10.f;
 
 	imguiPtr_->ImGuiStart();
 	imguiPtr_->ImGuiSetWindow("Bindless Shadow Mapping", 525, 650);
@@ -210,7 +209,6 @@ void AppPBRShadow::UpdateUI()
 	ImGui::SliderFloat("Far Plane", &staticShadowUBO.shadowFarPlane, 10.0f, 150.0f);
 	ImGui::SliderFloat("PCF Scale", &staticShadowUBO.pcfScale, 0.1f, 1.0f);
 	ImGui::SliderInt("PCF Iteration", &staticPCFIteration, 1, 10);
-	ImGui::SliderFloat("Z Mult", &zMult, 0.0f, 50.f);
 
 	ImGui::SeparatorText("Light position");
 	ImGui::SliderFloat("X", &(staticLightPos[0]), -10.0f, 10.0f);
@@ -231,8 +229,6 @@ void AppPBRShadow::UpdateUI()
 	shadowUBO_.shadowFarPlane = staticShadowUBO.shadowFarPlane;
 	shadowUBO_.pcfScale = staticShadowUBO.pcfScale;
 	shadowUBO_.pcfIteration = staticPCFIteration;
-
-	shadowPtr_->zMult = zMult;
 }
 
 // This is called from main.cpp

HelloVulkan/Source/Pipelines/PipelineShadow.cpp

@@ -203,142 +203,6 @@ void PipelineShadow::CalculateCascade(
 	shadowMapUBOBuffers_[frameIndex].UploadBufferData(ctx, ubo, sizeof(ShadowMapUBO));
 }
 
-void PipelineShadow::CalculateCascade2(VulkanContext& ctx,
-	const Camera* camera,
-	const LightData* light,
-	ShadowMapUBO* ubo)
-{
-	float far = CameraConfig::Far;
-	const glm::vec3 normLightPos = normalize(glm::vec3(light->position_.x, light->position_.y, light->position_.z));
-	std::vector<float> shadowCascadeLevels{ far / 50.0f, far / 25.0f, far / 10.0f, far / 2.0f };
-
-	for (uint32_t i = 0; i < ShadowConfig::CascadeCount; i++)
-	{
-		glm::mat4 lightspaceMatrix(1.0f);
-		if (i == 0)
-		{
-			lightspaceMatrix = GetLightSpaceMatrix(camera, CameraConfig::Near, shadowCascadeLevels[i], normLightPos);
-		}
-		else if (i < shadowCascadeLevels.size())
-		{
-			lightspaceMatrix = GetLightSpaceMatrix(camera, shadowCascadeLevels[i - 1], shadowCascadeLevels[i], normLightPos);
-		}
-		else
-		{
-			lightspaceMatrix = GetLightSpaceMatrix(camera, shadowCascadeLevels[i - 1], CameraConfig::Far, normLightPos);
-		}
-
-		// Store split distance and matrix in cascade
-		ubo->lightSpaceMatrices[i] = lightspaceMatrix;
-		ubo->orthoMatrices[i] = glm::mat4(1.0f);
-		ubo->viewMatrices[i] = glm::mat4(1.0f);
-		ubo->splitValues[i] = -1.0f * shadowCascadeLevels[i];
-	}
-
-	ubo->lightPosition = light->position_;
-
-	// Copy UBO to the buffer
-	const uint32_t frameIndex = ctx.GetFrameIndex();
-	shadowMapUBOBuffers_[frameIndex].UploadBufferData(ctx, ubo, sizeof(ShadowMapUBO));
-}
-
-std::vector<glm::vec4> PipelineShadow::GetFrustumCornersWorldSpace(glm::mat4& proj, glm::mat4& view)
-{
-	const auto inv = glm::inverse(proj * view);
-
-	std::vector<glm::vec4> frustumCorners;
-	for (unsigned int x = 0; x < 2; ++x)
-	{
-		for (unsigned int y = 0; y < 2; ++y)
-		{
-			for (unsigned int z = 0; z < 2; ++z)
-			{
-				const glm::vec4 pt = inv * glm::vec4(2.0f * x - 1.0f, 2.0f * y - 1.0f, 2.0f * z - 1.0f, 1.0f);
-				frustumCorners.push_back(pt / pt.w);
-			}
-		}
-	}
-
-	return frustumCorners;
-}
-
-glm::mat4 PipelineShadow::GetLightSpaceMatrix(const Camera* camera, float near, float far, glm::vec3 normLightPos)
-{
-	glm::mat4 proj = glm::perspective(glm::radians(camera->zoom_), 1.0f, near, far);
-	proj[1][1] *= -1;
-	glm::mat4 view = camera->GetViewMatrix();
-
-	const auto corners = GetFrustumCornersWorldSpace(proj, view);
-
-	glm::vec3 center = glm::vec3(0, 0, 0);
-	for (const auto& v : corners)
-	{
-		center += glm::vec3(v);
-	}
-	center /= static_cast<float>(corners.size());
-
-	const auto lightView = glm::lookAt(center + normLightPos, center, 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 : corners)
-	{
-		glm::vec4 trf = lightView * v;
-		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 lightProjection = glm::ortho(minX, maxX, minY, maxY, minZ, maxZ);
-
-	/*float radius = 0.0f;
-	for (uint32_t i = 0; i < 8; i++)
-	{
-		float distance = glm::length(glm::vec3(corners[i]) - center);
-		radius = glm::max(radius, distance);
-	}
-	radius = std::ceil(radius * 16.0f) / 16.0f;
-
-	glm::vec3 eye = center + normLightPos * radius;
-	glm::vec3 target = center;
-	glm::mat4 lightView = glm::lookAt(eye, target, glm::vec3(0.0f, 1.0f, 0.0f));
-	glm::mat4 lightProjection = glm::ortho(
-		-radius,
-		radius,
-		-radius,
-		radius,
-		0.0f,
-		radius * 2.0f);*/
-
-	return lightProjection * lightView;
-}
-
 void PipelineShadow::FillCommandBuffer(VulkanContext& ctx, VkCommandBuffer commandBuffer)
 {
 	uint32_t frameIndex = ctx.GetFrameIndex();