HBAO+ 3.0.0.20735892

4 files changed, 16 insertions, 17 deletions

diff --git a/samples/D3D11/src/SSAO11.cpp b/samples/D3D11/src/SSAO11.cpp
index 4f43ee4..e44fa51 100644
--- a/samples/D3D11/src/SSAO11.cpp
+++ b/samples/D3D11/src/SSAO11.cpp
@@ -67,7 +67,8 @@ public:
         , m_BlurAO(true)
         , m_BlurSharpness(32.f)
         , m_PowerExponent(2.f)
-        , m_NearAO(1.f)
+        , m_SmallScaleAO(1.f)
+        , m_LargeScaleAO(1.f)
         , m_pVB(NULL)
         , m_pIB(NULL)
         , m_pConstantBuffer(NULL)
@@ -208,7 +209,8 @@ private:
 
         TwAddVarRW(bar, "Radius", TW_TYPE_FLOAT, &m_AORadius, "min=1.0 max=8.0 group=AO");
         TwAddVarRW(bar, "Bias", TW_TYPE_FLOAT, &m_AOBias, "min=0.0 max=0.5 group=AO");
-        TwAddVarRW(bar, "NearAO", TW_TYPE_FLOAT, &m_NearAO, "min=1.0 max=4.0 group=AO");
+        TwAddVarRW(bar, "SmallScaleAO", TW_TYPE_FLOAT, &m_SmallScaleAO, "min=0.0 max=2.0 group=AO");
+        TwAddVarRW(bar, "LargeScaleAO", TW_TYPE_FLOAT, &m_LargeScaleAO, "min=0.0 max=2.0 group=AO");
         TwAddVarRW(bar, "Power Exponent", TW_TYPE_FLOAT, &m_PowerExponent, "min=0.0 max=4.0 group=AO");
         TwAddVarRW(bar, "Enable Blur", TW_TYPE_BOOLCPP, &m_BlurAO, "group=Blur");
         TwAddVarRW(bar, "Blur Sharpness", TW_TYPE_FLOAT, &m_BlurSharpness, "group=Blur min=0.0 max=100.0");
@@ -219,7 +221,7 @@ private:
     void UpdateUI()
     {
         const int barWidth = 200;
-        const int barHeight = 200;
+        const int barHeight = 220;
         const int border = 20;
 
         char buffer[2048];
@@ -497,8 +499,8 @@ private:
         GFSDK_SSAO_Parameters AOParams;
         AOParams.Radius = m_AORadius;
         AOParams.Bias = m_AOBias;
-        AOParams.NearAO = m_NearAO;
-        AOParams.FarAO = 1.f;
+        AOParams.SmallScaleAO = m_SmallScaleAO;
+        AOParams.LargeScaleAO = m_LargeScaleAO;
         AOParams.PowerExponent = m_PowerExponent;
         AOParams.Blur.Enable = m_BlurAO;
         AOParams.Blur.Sharpness = m_BlurSharpness;
@@ -537,7 +539,8 @@ private:
     bool m_BlurAO;
     float m_BlurSharpness;
     float m_PowerExponent;
-    float m_NearAO;
+    float m_SmallScaleAO;
+    float m_LargeScaleAO;
 
     Mesh m_Mesh;
     ID3D11Buffer* m_pVB;
diff --git a/samples/D3D11/src/SSAO11_2015.vcxproj b/samples/D3D11/src/SSAO11_2015.vcxproj
index ce0d4f7..f1b50a0 100644
--- a/samples/D3D11/src/SSAO11_2015.vcxproj
+++ b/samples/D3D11/src/SSAO11_2015.vcxproj
@@ -175,8 +175,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win32.dll ..\Bin
-copy /Y ..\external\AntTweakBar\1.16\lib\win32\AntTweakBar.dll ..\Bin</Command>
+      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win32.dll ..\Bin</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -213,8 +212,7 @@ copy /Y ..\external\AntTweakBar\1.16\lib\win32\AntTweakBar.dll ..\Bin</Command>
       </DataExecutionPrevention>
     </Link>
     <PreBuildEvent>
-      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win64.dll ..\Bin
-copy /Y ..\external\AntTweakBar\1.16\lib\win64\AntTweakBar64.dll ..\Bin</Command>
+      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win64.dll ..\Bin</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -286,8 +284,7 @@ copy /Y ..\external\AntTweakBar\1.16\lib\win64\AntTweakBar64.dll ..\Bin</Command
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win32.dll ..\Bin
-copy /Y ..\external\AntTweakBar\1.16\lib\win32\AntTweakBar.dll ..\Bin</Command>
+      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win32.dll ..\Bin</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -330,8 +327,7 @@ copy /Y ..\external\AntTweakBar\1.16\lib\win32\AntTweakBar.dll ..\Bin</Command>
       </DataExecutionPrevention>
     </Link>
     <PreBuildEvent>
-      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win64.dll ..\Bin
-copy /Y ..\external\AntTweakBar\1.16\lib\win64\AntTweakBar64.dll ..\Bin</Command>
+      <Command>copy /Y ..\..\..\lib\GFSDK_SSAO_D3D11.win64.dll ..\Bin</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/samples/D3D12/src/Viewer.cpp b/samples/D3D12/src/Viewer.cpp
index e445ffd..2ad4761 100644
--- a/samples/D3D12/src/Viewer.cpp
+++ b/samples/D3D12/src/Viewer.cpp
@@ -952,8 +952,8 @@ public:
             ImGui::DragFloat("PowerExponent", &mAOParams.PowerExponent, 0.05f, 1.f, 8.f);
             ImGui::DragFloat("Bias", &mAOParams.Bias, 0.001f, 0, 0.5f);
 
-            ImGui::DragFloat("NearAO", &mAOParams.NearAO, 0.01f, 1.f, 2.f);
-            ImGui::DragFloat("FarAO", &mAOParams.FarAO, 0.01f, 1.f, 2.f);
+            ImGui::DragFloat("SmallScaleAO", &mAOParams.SmallScaleAO, 0.01f, 0.f, 2.f);
+            ImGui::DragFloat("LargeScaleAO", &mAOParams.LargeScaleAO, 0.01f, 0.f, 2.f);
 
             bool BlurEnabled = mAOParams.Blur.Enable ? true : false;
             ImGui::Checkbox("Blur.Enable", &BlurEnabled);
diff --git a/samples/D3D12/src/Viewer.vcxproj b/samples/D3D12/src/Viewer.vcxproj
index c67ff59..2bb2dfe 100644
--- a/samples/D3D12/src/Viewer.vcxproj
+++ b/samples/D3D12/src/Viewer.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{CFEEDBA7-74CF-4AF1-9A14-0E890CE94DF8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>hbaop_dx12</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
     <ProjectName>SampleApp_D3D12</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />