GITechDemo:

*switched default BRDF to Cook-Torrance with GGX normal distribution and geometric shadowing terms
*added new BRDFs: Ashikhmin-Shirley and Ward
*added PBR material samples throughout the Sponza model
*added a script which builds PBR sample model and textures
*added an option to tonemap and saturate colors in the color copy shader in order to fix issues with SSR (specular highlights with very high intensity would ruin the mip chain of the light accumulation buffer and cause very bright reflections on rougher surfaces)
*updated some artist parameters (mainly lighting parameters and some post-processing parameters to compensate for the latter)
*refactored and fixed various issues with Cook-Torrance shader code
*moved cubemap reflections code from DirectionalLight.hlsl to ScreenSpaceReflection.hlsl so as to properly blend it with the SSR result, where applicable
*updated .gitignore for VS2017

Author: iftodebogdan

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.sln.docstates
 *.VC.opendb
+.vs/
 
 # Build results
 [Dd]ebug/

GITechDemo/Build/build_data_win.py

@@ -53,6 +53,7 @@ def Run():
     # List of scripts to run for building data
     dataBuildScript = [
         "compile_sponza_model.py",
+		"compile_pbr_materials.py",
         "compile_utility_textures.py"
         ]
 

GITechDemo/Code/AppMain/GITechDemo.vcxproj

@@ -348,6 +348,7 @@ xcopy /y /d "$(SolutionDir)..\External\Synesthesia3D\External\DX9\utils\$(Platfo
     <ClInclude Include="Framework\Windows\FrameworkWin.h" />
     <ClInclude Include="GITechDemo\RenderScheme\DirectionalLightVolumePass.h" />
     <ClInclude Include="GITechDemo\RenderScheme\HDRDownsampleForBloomPass.h" />
+    <ClInclude Include="GITechDemo\RenderScheme\PBRMaterialTestPass.h" />
     <ClInclude Include="GITechDemo\RenderScheme\ScreenSpaceReflectionPass.h" />
     <ClInclude Include="GITechDemo\RenderScheme\SSAOPass.h" />
     <ClInclude Include="GITechDemo\RenderScheme\BloomPass.h" />
@@ -384,6 +385,7 @@ xcopy /y /d "$(SolutionDir)..\External\Synesthesia3D\External\DX9\utils\$(Platfo
     <ClCompile Include="Framework\Windows\FrameworkWin.cpp" />
     <ClCompile Include="GITechDemo\RenderScheme\DirectionalLightVolumePass.cpp" />
     <ClCompile Include="GITechDemo\RenderScheme\HDRDownsampleForBloomPass.cpp" />
+    <ClCompile Include="GITechDemo\RenderScheme\PBRMaterialTestPass.cpp" />
     <ClCompile Include="GITechDemo\RenderScheme\ScreenSpaceReflectionPass.cpp" />
     <ClCompile Include="GITechDemo\RenderScheme\SSAOPass.cpp" />
     <ClCompile Include="GITechDemo\RenderScheme\BloomPass.cpp" />

GITechDemo/Code/AppMain/GITechDemo.vcxproj.filters

@@ -145,6 +145,9 @@
     <ClInclude Include="GITechDemo\RenderScheme\ScreenSpaceReflectionPass.h">
       <Filter>App\Render Schemes</Filter>
     </ClInclude>
+    <ClInclude Include="GITechDemo\RenderScheme\PBRMaterialTestPass.h">
+      <Filter>App\Render Schemes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Framework\main.cpp">
@@ -246,6 +249,9 @@
     <ClCompile Include="GITechDemo\RenderScheme\ScreenSpaceReflectionPass.cpp">
       <Filter>App\Render Schemes</Filter>
     </ClCompile>
+    <ClCompile Include="GITechDemo\RenderScheme\PBRMaterialTestPass.cpp">
+      <Filter>App\Render Schemes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Framework\Windows\Framework.ico">

GITechDemo/Code/AppMain/GITechDemo/GITechDemo.cpp

@@ -670,6 +670,34 @@ void GITechDemo::Update(const float fDeltaTime)
     }
     gmtl::normalize((Vec3f&)f3LightDir);
 
+#if 0
+    // NaN at this position!
+    f3LightDir.GetCurrentValue()[0] = 9.41706021e-05;
+    f3LightDir.GetCurrentValue()[1] = -1.00000000;
+    f3LightDir.GetCurrentValue()[2] = -0.000278121064;
+
+    m_tCamera.vPos[0] = 545.252686;
+    m_tCamera.vPos[1] = -1660.33801;
+    m_tCamera.vPos[2] = -81.6245651;
+
+    m_tCamera.mRot.mData[0] = -0.0230895355;
+    m_tCamera.mRot.mData[1] = 0.260565788;
+    m_tCamera.mRot.mData[2] = 0.965138495;
+    m_tCamera.mRot.mData[3] = 0.000000000;
+    m_tCamera.mRot.mData[4] = 0.0582327023;
+    m_tCamera.mRot.mData[5] = 0.964119077;
+    m_tCamera.mRot.mData[6] = -0.258897275;
+    m_tCamera.mRot.mData[7] = 0.000000000;
+    m_tCamera.mRot.mData[8] = -0.998014688;
+    m_tCamera.mRot.mData[9] = 0.0502296351;
+    m_tCamera.mRot.mData[10] = -0.0374352485;
+    m_tCamera.mRot.mData[11] = 0.000000000;
+    m_tCamera.mRot.mData[12] = 0.000000000;
+    m_tCamera.mRot.mData[13] = 0.000000000;
+    m_tCamera.mRot.mData[14] = 0.000000000;
+    m_tCamera.mRot.mData[15] = 1.00000000;
+#endif
+
     // Precalculate some parts of the equation for reconstructing
     // linear depth from hyperbolic depth
     f2LinearDepthEquation = Vec2f(fZNear * fZFar / (fZNear - fZFar), fZFar / (fZFar - fZNear));

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/BloomPass.cpp

@@ -70,6 +70,7 @@ void BloomPass::Update(const float fDeltaTime)
     bSingleChannelCopy = false;
     f4CustomColorModulator = Vec4f(1.f, 1.f, 1.f, 1.f);
     bDepthDownsample = false;
+    bApplyTonemap = false;
 }
 
 // Apply a brightness filter to the downsampled HDR scene color buffer

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

@@ -87,6 +87,7 @@ void DepthOfFieldPass::Update(const float fDeltaTime)
 
     bSingleChannelCopy = false;
     f4CustomColorModulator = Vec4f(1.f, 1.f, 1.f, 1.f);
+    bApplyTonemap = false;
 }
 
 void DepthOfFieldPass::AutofocusPass()

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalLightVolumePass.cpp

@@ -87,6 +87,7 @@ void DirectionalLightVolumePass::Update(const float fDeltaTime)
     texNoise = NoiseTexture.GetTextureIndex();
     fElapsedTime += fDeltaTime;
     f3FogBox = Vec3f(CASCADE_MAX_VIEW_DEPTH, CASCADE_MAX_VIEW_DEPTH, CASCADE_MAX_VIEW_DEPTH);
+    bApplyTonemap = false;
 }
 
 void DirectionalLightVolumePass::CalculateLightVolume()

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/GBufferPass.cpp

@@ -67,6 +67,8 @@ void GBufferPass::Update(const float fDeltaTime)
     ResourceMgr->GetTexture(GBuffer.GetRenderTarget()->GetColorBuffer(3))->SetAddressingMode(SAM_CLAMP);
     ResourceMgr->GetTexture(GBuffer.GetRenderTarget()->GetDepthBuffer())->SetAddressingMode(SAM_CLAMP);
 
+    // Update matrices
+    f44WorldMat = makeTrans(Vec3f(0, 0, 0), Type2Type<Matrix44f>());
     f44WorldViewMat = f44ViewMat * f44WorldMat;
     f44WorldViewProjMat = f44ProjMat * f44WorldViewMat;
 
@@ -169,13 +171,13 @@ void GBufferPass::Draw()
             bHasNormalMap = (texNormal != -1) && GBUFFER_USE_NORMAL_MAPS;
 
             // For Blinn-Phong BRDF
-            texSpec = (nBRDFModel == BLINN_PHONG ? specTexIdx : ~0u);
+            texSpec = specTexIdx;
             bHasSpecMap = (texSpec != -1);
             fSpecIntensity = SponzaScene.GetModel()->arrMaterial[SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx]->fShininessStrength;
 
             // For Cook-Torrance BRDF
-            texMatType = (nBRDFModel == COOK_TORRANCE_GGX || nBRDFModel == COOK_TORRANCE_BECKMANN ? matTexIdx : ~0u);
-            texRoughness = (nBRDFModel == COOK_TORRANCE_GGX || nBRDFModel == COOK_TORRANCE_BECKMANN ? roughnessTexIdx : ~0u);
+            texMatType = matTexIdx;
+            texRoughness = roughnessTexIdx;
 
             GBufferGenerationShader.Enable();
             RenderContext->DrawVertexBuffer(SponzaScene.GetModel()->arrMesh[mesh]->pVertexBuffer);
@@ -194,6 +196,9 @@ void GBufferPass::Draw()
 
     GBuffer.Disable();
 
+    // Draw child render passes (in this case, the PBR material test spheres)
+    DrawChildren();
+
     // Generate linear depth buffer and quarter-resolution versions of the hyperbolic and linear depth buffers
     const bool blendEnable = RenderContext->GetRenderStateManager()->GetColorBlendEnabled();
     RenderContext->GetRenderStateManager()->SetColorBlendEnabled(false);

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/MotionBlurPass.cpp

@@ -50,6 +50,7 @@ void MotionBlurPass::Update(const float fDeltaTime)
 {
     bSingleChannelCopy = false;
     f4CustomColorModulator = Vec4f(1.f, 1.f, 1.f, 1.f);
+    bApplyTonemap = false;
 }
 
 void MotionBlurPass::Draw()