Branimir Karadžić 8 years ago
parent
commit
f84a53c071
1 changed files with 21 additions and 21 deletions
  1. 21 21
      examples/16-shadowmaps/shadowmaps.cpp

+ 21 - 21
examples/16-shadowmaps/shadowmaps.cpp

@@ -1970,14 +1970,14 @@ class ExampleShadowmaps : public entry::AppI
 							, m_viewState.m_width
 							, m_viewState.m_width
 							, m_viewState.m_height
 							, m_viewState.m_height
 							);
 							);
-			
+
 			ImGui::SetNextWindowPos(ImVec2(m_viewState.m_width - 300 - 10, 10) );
 			ImGui::SetNextWindowPos(ImVec2(m_viewState.m_width - 300 - 10, 10) );
 			ImGui::Begin("Settings"
 			ImGui::Begin("Settings"
 						 , NULL
 						 , NULL
 						 , ImVec2(300, 660)
 						 , ImVec2(300, 660)
 						 , ImGuiWindowFlags_AlwaysAutoResize
 						 , ImGuiWindowFlags_AlwaysAutoResize
 						 );
 						 );
-			
+
 #define IMGUI_FLOAT_SLIDER(_name, _val) \
 #define IMGUI_FLOAT_SLIDER(_name, _val) \
 ImGui::SliderFloat(_name \
 ImGui::SliderFloat(_name \
 , &_val \
 , &_val \
@@ -1986,24 +1986,24 @@ ImGui::SliderFloat(_name \
 )
 )
 #define IMGUI_RADIO_BUTTON(_name, _var, _val) \
 #define IMGUI_RADIO_BUTTON(_name, _var, _val) \
 if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
-			
+
 			ImGui::Checkbox("Update lights", &m_settings.m_updateLights);
 			ImGui::Checkbox("Update lights", &m_settings.m_updateLights);
 			ImGui::Checkbox("Update scene", &m_settings.m_updateScene);
 			ImGui::Checkbox("Update scene", &m_settings.m_updateScene);
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			ImGui::Text("Shadow map depth:");
 			ImGui::Text("Shadow map depth:");
 			IMGUI_RADIO_BUTTON("InvZ", m_settings.m_depthImpl, DepthImpl::InvZ);
 			IMGUI_RADIO_BUTTON("InvZ", m_settings.m_depthImpl, DepthImpl::InvZ);
 			IMGUI_RADIO_BUTTON("Linear", m_settings.m_depthImpl, DepthImpl::Linear);
 			IMGUI_RADIO_BUTTON("Linear", m_settings.m_depthImpl, DepthImpl::Linear);
-			
+
 			ShadowMapSettings* currentSmSettings = &m_smSettings[m_settings.m_lightType][m_settings.m_depthImpl][m_settings.m_smImpl];
 			ShadowMapSettings* currentSmSettings = &m_smSettings[m_settings.m_lightType][m_settings.m_depthImpl][m_settings.m_smImpl];
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			ImGui::Checkbox("Draw depth buffer", &m_settings.m_drawDepthBuffer);
 			ImGui::Checkbox("Draw depth buffer", &m_settings.m_drawDepthBuffer);
 			if (m_settings.m_drawDepthBuffer)
 			if (m_settings.m_drawDepthBuffer)
 			{
 			{
 				IMGUI_FLOAT_SLIDER("Depth value pow", currentSmSettings->m_depthValuePow);
 				IMGUI_FLOAT_SLIDER("Depth value pow", currentSmSettings->m_depthValuePow);
 			}
 			}
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			ImGui::Text("Shadow Map implementation");
 			ImGui::Text("Shadow Map implementation");
 			IMGUI_RADIO_BUTTON("Hard", m_settings.m_smImpl, SmImpl::Hard);
 			IMGUI_RADIO_BUTTON("Hard", m_settings.m_smImpl, SmImpl::Hard);
@@ -2011,7 +2011,7 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 			IMGUI_RADIO_BUTTON("VSM", m_settings.m_smImpl, SmImpl::VSM);
 			IMGUI_RADIO_BUTTON("VSM", m_settings.m_smImpl, SmImpl::VSM);
 			IMGUI_RADIO_BUTTON("ESM", m_settings.m_smImpl, SmImpl::ESM);
 			IMGUI_RADIO_BUTTON("ESM", m_settings.m_smImpl, SmImpl::ESM);
 			currentSmSettings = &m_smSettings[m_settings.m_lightType][m_settings.m_depthImpl][m_settings.m_smImpl];
 			currentSmSettings = &m_smSettings[m_settings.m_lightType][m_settings.m_depthImpl][m_settings.m_smImpl];
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			IMGUI_FLOAT_SLIDER("Bias", currentSmSettings->m_bias);
 			IMGUI_FLOAT_SLIDER("Bias", currentSmSettings->m_bias);
 			IMGUI_FLOAT_SLIDER("Normal offset", currentSmSettings->m_normalOffset);
 			IMGUI_FLOAT_SLIDER("Normal offset", currentSmSettings->m_normalOffset);
@@ -2021,20 +2021,20 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 				IMGUI_FLOAT_SLIDER("Near plane", currentSmSettings->m_near);
 				IMGUI_FLOAT_SLIDER("Near plane", currentSmSettings->m_near);
 			}
 			}
 			IMGUI_FLOAT_SLIDER("Far plane", currentSmSettings->m_far);
 			IMGUI_FLOAT_SLIDER("Far plane", currentSmSettings->m_far);
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			switch(m_settings.m_smImpl)
 			switch(m_settings.m_smImpl)
 			{
 			{
 				case SmImpl::Hard:
 				case SmImpl::Hard:
 					//ImGui::Text("Hard");
 					//ImGui::Text("Hard");
 					break;
 					break;
-					
+
 				case SmImpl::PCF:
 				case SmImpl::PCF:
 					ImGui::Text("PCF");
 					ImGui::Text("PCF");
 					IMGUI_FLOAT_SLIDER("X Offset", currentSmSettings->m_xOffset);
 					IMGUI_FLOAT_SLIDER("X Offset", currentSmSettings->m_xOffset);
 					IMGUI_FLOAT_SLIDER("Y Offset", currentSmSettings->m_yOffset);
 					IMGUI_FLOAT_SLIDER("Y Offset", currentSmSettings->m_yOffset);
 					break;
 					break;
-					
+
 				case SmImpl::VSM:
 				case SmImpl::VSM:
 					ImGui::Text("VSM");
 					ImGui::Text("VSM");
 					IMGUI_FLOAT_SLIDER("Min variance", currentSmSettings->m_customParam0);
 					IMGUI_FLOAT_SLIDER("Min variance", currentSmSettings->m_customParam0);
@@ -2046,7 +2046,7 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 						IMGUI_FLOAT_SLIDER("Blur Y Offset", currentSmSettings->m_yOffset);
 						IMGUI_FLOAT_SLIDER("Blur Y Offset", currentSmSettings->m_yOffset);
 					}
 					}
 					break;
 					break;
-					
+
 				case SmImpl::ESM:
 				case SmImpl::ESM:
 					ImGui::Text("ESM");
 					ImGui::Text("ESM");
 					IMGUI_FLOAT_SLIDER("ESM Hardness", currentSmSettings->m_customParam0);
 					IMGUI_FLOAT_SLIDER("ESM Hardness", currentSmSettings->m_customParam0);
@@ -2058,11 +2058,11 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 						IMGUI_FLOAT_SLIDER("Blur Y Offset", currentSmSettings->m_yOffset);
 						IMGUI_FLOAT_SLIDER("Blur Y Offset", currentSmSettings->m_yOffset);
 					}
 					}
 					break;
 					break;
-					
+
 				default:
 				default:
 					break;
 					break;
 			};
 			};
-			
+
 			ImGui::End();
 			ImGui::End();
 #undef IMGUI_RADIO_BUTTON
 #undef IMGUI_RADIO_BUTTON
 
 
@@ -2087,10 +2087,10 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 			{
 			{
 				m_settings.m_lightType = LightType::DirectionalLight; bLtChanged = true;
 				m_settings.m_lightType = LightType::DirectionalLight; bLtChanged = true;
 			}
 			}
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			ImGui::Checkbox("Show shadow map coverage.", &m_settings.m_showSmCoverage);
 			ImGui::Checkbox("Show shadow map coverage.", &m_settings.m_showSmCoverage);
-			
+
 			ImGui::Separator();
 			ImGui::Separator();
 			ImGui::Text("Shadow map resolution: %ux%u", m_currentShadowMapSize, m_currentShadowMapSize);
 			ImGui::Text("Shadow map resolution: %ux%u", m_currentShadowMapSize, m_currentShadowMapSize);
 			ImGui::SliderFloat("##SizePwrTwo", &currentSmSettings->m_sizePwrTwo,
 			ImGui::SliderFloat("##SizePwrTwo", &currentSmSettings->m_sizePwrTwo,
@@ -2102,7 +2102,7 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 			{
 			{
 				ImGui::Text("Spot light");
 				ImGui::Text("Spot light");
 				ImGui::SliderFloat("Shadow map area", &m_settings.m_coverageSpotL, 45.0f, 120.0f);
 				ImGui::SliderFloat("Shadow map area", &m_settings.m_coverageSpotL, 45.0f, 120.0f);
-				
+
 				ImGui::Separator();
 				ImGui::Separator();
 				ImGui::SliderFloat("Spot outer cone", &m_settings.m_spotOuterAngle, 0.0f, 91.0f);
 				ImGui::SliderFloat("Spot outer cone", &m_settings.m_spotOuterAngle, 0.0f, 91.0f);
 				ImGui::SliderFloat("Spot inner cone", &m_settings.m_spotInnerAngle, 0.0f, 90.0f);
 				ImGui::SliderFloat("Spot inner cone", &m_settings.m_spotInnerAngle, 0.0f, 90.0f);
@@ -2111,7 +2111,7 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 			{
 			{
 				ImGui::Text("Point light");
 				ImGui::Text("Point light");
 				ImGui::Checkbox("Stencil pack", &m_settings.m_stencilPack);
 				ImGui::Checkbox("Stencil pack", &m_settings.m_stencilPack);
-				
+
 				ImGui::SliderFloat("Fov X adjust", &m_settings.m_fovXAdjust, -20.0f, 20.0f);
 				ImGui::SliderFloat("Fov X adjust", &m_settings.m_fovXAdjust, -20.0f, 20.0f);
 				ImGui::SliderFloat("Fov Y adjust", &m_settings.m_fovYAdjust, -20.0f, 20.0f);
 				ImGui::SliderFloat("Fov Y adjust", &m_settings.m_fovYAdjust, -20.0f, 20.0f);
 			}
 			}
@@ -2122,11 +2122,11 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
 				ImGui::SliderInt("Cascade splits", &m_settings.m_numSplits, 1, 4);
 				ImGui::SliderInt("Cascade splits", &m_settings.m_numSplits, 1, 4);
 				ImGui::SliderFloat("Cascade distribution", &m_settings.m_splitDistribution, 0.0f, 1.0f);
 				ImGui::SliderFloat("Cascade distribution", &m_settings.m_splitDistribution, 0.0f, 1.0f);
 			}
 			}
-			
+
 #undef IMGUI_FLOAT_SLIDER
 #undef IMGUI_FLOAT_SLIDER
-			
+
 			ImGui::End();
 			ImGui::End();
-			
+
 			imguiEndFrame();
 			imguiEndFrame();
 
 
 			// Update uniforms.
 			// Update uniforms.