wip

Author: azer89

HelloVulkan/Header/UBOs.h

@@ -37,13 +37,11 @@ struct ShadowMapUBO
 	alignas(4)
 	float shadowMaxBias;
 	alignas(4)
-	float shadowNearPlane;
+	float cameraNearPlane;
 	alignas(4)
-	float shadowFarPlane;
+	float cameraFarPlane;
 	alignas(4)
 	float pcfScale;
-	alignas(4)
-	uint32_t pcfIteration;
 };
 
 // Per model transformation matrix

HelloVulkan/Source/Apps/AppPBRShadow.cpp

@@ -171,12 +171,11 @@ void AppPBRShadow::UpdateUI()
 	{
 		.shadowMinBias = 0.001f,
 		.shadowMaxBias = 0.001f,
-		.shadowNearPlane = 10.0f,
-		.shadowFarPlane = 40.0f,
+		.cameraNearPlane = CameraConfig::Near,
+		.cameraFarPlane = CameraConfig::Far,
 		.pcfScale = 0.5f
 	};
 	static float staticLightPos[3] = { -5.f, 30.0f, 5.0f};
-	static int staticPCFIteration = 2;
 
 	imguiPtr_->ImGuiStart();
 	imguiPtr_->ImGuiSetWindow("Bindless Shadow Mapping", 525, 650);
@@ -190,10 +189,7 @@ void AppPBRShadow::UpdateUI()
 	ImGui::SeparatorText("Shadow mapping");
 	ImGui::SliderFloat("Min Bias", &staticShadowUBO.shadowMinBias, 0.00001f, 0.01f);
 	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, 3.0f);
-	ImGui::SliderInt("PCF Iteration", &staticPCFIteration, 1, 10);
 
 	ImGui::SeparatorText("Light position");
 	ImGui::SliderFloat("X", &(staticLightPos[0]), -10.0f, 10.0f);
@@ -210,10 +206,7 @@ void AppPBRShadow::UpdateUI()
 
 	shadowUBO_.shadowMinBias = staticShadowUBO.shadowMinBias;
 	shadowUBO_.shadowMaxBias = staticShadowUBO.shadowMaxBias;
-	shadowUBO_.shadowNearPlane = staticShadowUBO.shadowNearPlane;
-	shadowUBO_.shadowFarPlane = staticShadowUBO.shadowFarPlane;
 	shadowUBO_.pcfScale = staticShadowUBO.pcfScale;
-	shadowUBO_.pcfIteration = staticPCFIteration;
 }
 
 // This is called from main.cpp

Shaders/ShadowMapping/UBO.glsl

@@ -8,8 +8,7 @@ struct ShadowUBO
 	vec4 lightPosition;
 	float shadowMinBias;
 	float shadowMaxBias;
-	float shadowNearPlane;
-	float shadowFarPlane;
+	float cameraNear;
+	float cameraFar;
 	float pcfScale;
-	uint pcfIteration;
 };