*Fixed bloom artifacts caused by very bright specular highlights

*Recalibrated bloom parameters
*Reduced the autofocus time
*Fixed fLumaAdaptSpeed parameter usage
*Fixed build script

Author: iftodebogdan

GITechDemo/Build/build_win.py

@@ -9,7 +9,7 @@
 #	'profile' to build on the Profile configuration
 
 PROJECT_NAME = "GITechDemo"
-DEFAULT_VSCOMNTOOLS = "VS140COMNTOOLS"
+DEFAULT_VSCOMNTOOLS = "VS100COMNTOOLS"
 FORCE_REBUILD = False
 BUILD_CONFIGURATION = "Release"
 
@@ -55,15 +55,15 @@ def copytree(src, dst, symlinks = False, ignore = None):
     else:
       shutil.copy2(s, d)
 
-def buildsln(pathToTools, platform, buildConfig):
-	cmd = "\"" + pathToTools + "VsDevCmd.bat\" && "
-	cmd += "MSBuild.exe /maxcpucount /p:Configuration=" + buildConfig + " /p:Platform=" + platform
+def buildsln(pathToTools, envSetupBat, platform, buildConfig):
+	os.environ["PATH"] += os.pathsep + pathToTools
+	cmd =envSetupBat + " && MSBuild.exe /maxcpucount /p:Configuration=" + buildConfig + " /p:Platform=" + platform
 	if(FORCE_REBUILD):
 		cmd += " /t:rebuild "
 	else:
 		cmd += " "
-	cmd += os.getcwd() + "/../Code/Solutions/"
-	cmd += PROJECT_NAME + ".sln"
+	cmd += "\"" + os.getcwd() + "/../Code/Solutions/"
+	cmd += PROJECT_NAME + ".sln\""
 	#print(cmd)
 	os.system(cmd)
 
@@ -79,8 +79,16 @@ def buildsln(pathToTools, platform, buildConfig):
 
 print("\nStarting build process...\n")
 
+envSetupBat = "VsDevCmd.bat"
+
 if(os.getenv(DEFAULT_VSCOMNTOOLS)):
 	pathToTools = os.getenv(DEFAULT_VSCOMNTOOLS)
+	if(
+		DEFAULT_VSCOMNTOOLS == "VS100COMNTOOLS" or
+		DEFAULT_VSCOMNTOOLS == "VS90COMNTOOLS" or
+		DEFAULT_VSCOMNTOOLS == "VS80COMNTOOLS"
+	):
+		envSetupBat = "vsvars32.bat"
 elif(os.getenv("VS140COMNTOOLS")):	# Visual Studio 2015
 	pathToTools = os.getenv("VS140COMNTOOLS")
 elif(os.getenv("VS120COMNTOOLS")):	# Visual Studio 2013
@@ -89,16 +97,19 @@ def buildsln(pathToTools, platform, buildConfig):
 	pathToTools = os.getenv("VS110COMNTOOLS")
 elif(os.getenv("VS100COMNTOOLS")):	# Visual Studio 2010
 	pathToTools = os.getenv("VS100COMNTOOLS")
+	envSetupBat = "vsvars32.bat"
 #elif(os.getenv("VS90COMNTOOLS")):	# Visual Studio 2008
 #	pathToTools = os.getenv("VS90COMNTOOLS")
+#	envSetupBat = "vsvars32.bat"
 #elif(os.getenv("VS80COMNTOOLS")):	# Visual Studio 2005
 #	pathToTools = os.getenv("VS80COMNTOOLS")
+#	envSetupBat = "vsvars32.bat"
 else:
 	print("No compatible version of Visual Studio found!\n")
 
 if(pathToTools):
-	buildsln(pathToTools, "x86", BUILD_CONFIGURATION)
-	buildsln(pathToTools, "x64", BUILD_CONFIGURATION)
+	buildsln(pathToTools, envSetupBat, "x86", BUILD_CONFIGURATION)
+	buildsln(pathToTools, envSetupBat, "x64", BUILD_CONFIGURATION)
 
 print("\nConfiguring build...\n")
 

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DepthOfFieldPass.cpp

@@ -17,7 +17,7 @@ namespace GITechDemoApp
 {
 	bool DOF_ENABLED = true;
 	bool DOF_USE_QUARTER_RESOLUTION_BUFFER = false;
-	float DOF_AUTOFOCUS_TIME = 1.f;
+	float DOF_AUTOFOCUS_TIME = 0.25f;
 }
 
 DepthOfFieldPass::DepthOfFieldPass(const char* const passName, RenderPass* const parentPass)

GITechDemo/Code/AppMain/GITechDemo/Resources/RenderResources.cpp

@@ -211,9 +211,9 @@ namespace GITechDemoApp
 	IMPLEMENT_ARTIST_SHADER_CONSTANT(fLinearWhite,			float,			11.2f					);
 	IMPLEMENT_ARTIST_SHADER_CONSTANT(fLumaAdaptSpeed,		float,			1.f						);
 	// Bloom
-	IMPLEMENT_ARTIST_SHADER_CONSTANT(fBrightnessThreshold,	float,			1.f						);
+	IMPLEMENT_ARTIST_SHADER_CONSTANT(fBrightnessThreshold,	float,			0.5f					);
 	IMPLEMENT_ARTIST_SHADER_CONSTANT(fBloomPower,			float,			1.f						);
-	IMPLEMENT_ARTIST_SHADER_CONSTANT(fBloomStrength,		float,			0.3f					);
+	IMPLEMENT_ARTIST_SHADER_CONSTANT(fBloomStrength,		float,			0.25f					);
 	// FXAA
 	IMPLEMENT_ARTIST_SHADER_CONSTANT(fFxaaSubpix,			float,			0.75f					);
 	IMPLEMENT_ARTIST_SHADER_CONSTANT(fFxaaEdgeThreshold,	float,			0.166f					);

GITechDemo/Data/shaders/Downsample.hlsl

@@ -38,6 +38,10 @@ void psmain(VSOut input, out float4 f4Color : SV_TARGET)
 		f4Color = tex2D(texSource, input.f2TexCoord);
 
 	if (bApplyBrightnessFilter)
-		f4Color.rgb = max(0.f, f4Color.rgb - fBrightnessThreshold);
+	{
+		const float fBrightness = dot(f4Color.rgb, LUMINANCE_VECTOR);
+		f4Color.rgb *= step(fBrightnessThreshold, fBrightness);
+		f4Color.rgb /= fBrightness;
+	}
 }
 ////////////////////////////////////////////////////////////////////

GITechDemo/Data/shaders/LumaCalc.hlsl

@@ -93,7 +93,7 @@ void psmain(VSOut input, out float4 f4Color : SV_TARGET)
 	{
 		const float fCurrLuma = tex2D(texLumaCalcInput, float2(0.5f, 0.5f)).r;
 		const float fTargetLuma = tex2D(texLumaTarget, float2(0.5f, 0.5f)).r;
-		const float fNewLuma = fCurrLuma + (fTargetLuma - fCurrLuma) * (fLumaAdaptSpeed * fFrameTime);
+		const float fNewLuma = fCurrLuma + (fTargetLuma - fCurrLuma) * (rcp(fLumaAdaptSpeed) * fFrameTime);
 		f4Color = float4(fNewLuma, fNewLuma, fNewLuma, 1.f);
 	}
 }