Merge pull request #132 from vilbeyli/staging

Release 0.6.0 - PBR + IBL + AMD FidelityFX CAS

.gitignore

@@ -62,7 +62,9 @@ bld/
 [Oo]bj/
 [Ll]og/
 Build/_artifacts/
-
+ShaderCache/
+PSOCache/
+Data/Textures/PBR/*/*.png
 
 # Visual Studio 2015 cache/options directory
 .vs/

Build/GenerateProjectFiles.bat

@@ -99,8 +99,10 @@ if !NEED_TO_INIT_SUBMODULES! neq 0 (
     :: attempt to initialize submodule
     cd ..
     echo.
-    git submodule init 
-    git submodule update
+    git submodule update --init Libs/D3D12MA
+    git submodule update --init Libs/VQUtils
+    git submodule update --init Libs/assimp
+    git submodule update --init Source/Renderer/Libs/D3DX12
     cd Build
 
     :: check if submodule initialized properly

Build/PackageEngine.bat

@@ -273,15 +273,24 @@ set ASSETS_DIR__HDRI=
 pushd %cd%
 cd !DATA_DIRECTORY!/Textures/HDRI
 set ASSETS_DIR__HDRI=%cd%
-
+cd ../PBR
+set ASSETS_DIR__PBR=%cd%
 popd
 
 
 echo [VQPackage] Checking Assets...
 if exist !ASSETS_DIR__HDRI!/*.hdr (
-    echo [VQPackage] Found .hdr files in Data/Textures/HDRI/ directory, skipping download.
+    echo [VQPackage] Found .hdr files in Data/Textures/HDRI/ directory, skipping HDRI download.
+) else (
+    echo [VQPackage] HDRI Textures are missing, starting download...
+    call %~dp0/../Scripts/DownloadAssets.bat
+)
+
+if exist !ASSETS_DIR__PBR!/*/*.png (
+    echo [VQPackage] Found PBR files in Data/Textures/PBR/ subdirectory, skipping PBR download.
 ) else (
-    echo [VQPackage] Textures are missing, starting download...
+    echo [VQPackage] PBR Textures are missing, starting download...
+    echo.
     call %~dp0/../Scripts/DownloadAssets.bat
 )
 

CMakeLists.txt

@@ -37,13 +37,31 @@ set (Config
     "Data/Scenes.ini"
 )
 
+set (Materials
+    "Data/Materials/RoughMaterials.xml"
+    "Data/Materials/PBRMaterials.xml"
+    "Data/Materials/MetallicMaterials.xml"
+    "Data/Materials/DefaultMaterials.xml"
+)
+
 set (Shaders
     "Shaders/hello-triangle.hlsl"
     "Shaders/hello-cube.hlsl"
     "Shaders/FullscreenTriangle.hlsl"
     "Shaders/Tonemapper.hlsl"
     "Shaders/Skydome.hlsl"
     "Shaders/Object.hlsl"
+    "Shaders/ForwardLighting.hlsl"
+    "Shaders/BRDF.hlsl"
+    "Shaders/Common.hlsl"
+    "Shaders/ShadingMath.hlsl"
+    "Shaders/Lighting.hlsl"
+    "Shaders/LightingConstantBufferData.h"
+    "Shaders/Unlit.hlsl"
+    "Shaders/DepthPass.hlsl"
+    "Shaders/CubemapConvolution.hlsl"
+    "Shaders/GaussianBlur.hlsl"
+    "Shaders/AMDFidelityFX.hlsl"
 )
 
 set (HeaderVQE 
@@ -68,6 +86,7 @@ set (HeaderVQE
     "Source/Application/GameObject.h"
     "Source/Application/Memory.h"
     "Source/Application/GPUMarker.h"
+    "Shaders/LightingConstantBufferData.h"
 )
 
 set (SourceVQE 
@@ -79,6 +98,7 @@ set (SourceVQE
     "Source/Application/VQEngine_Update.cpp"
     "Source/Application/VQEngine_WindowEvents.cpp"
     "Source/Application/VQEngine_EventHandlers.cpp"
+    "Source/Application/EnvironmentMap.cpp"
     "Source/Application/FileParser.cpp"
     "Source/Application/Events.cpp"
     "Source/Application/Mesh.cpp"
@@ -98,6 +118,12 @@ set (SourceVQE
     "Source/Application/GPUMarker.cpp"
 )
 
+set (FidelityFX
+    "Shaders/FidelityFX/ffx_a.h"
+    "Shaders/FidelityFX/CAS/ffx_cas.h"
+#    "Shaders/FidelityFX/SPD/ffx_spd.h"
+)
+
 set (PIXIncl 
     "Libs/WinPixEventRuntime/Include"
 )
@@ -128,19 +154,23 @@ source_group("Config"   FILES ${Config})
 source_group("Resource" FILES ${Resource})
 source_group("Icons"    FILES ${Icons})
 source_group("Shaders"  FILES ${Shaders})
+source_group("Shaders\\AMD-FidelityFX"  FILES ${FidelityFX})
 source_group("Scenes"   FILES ${Scenes})
+source_group("Materials" FILES ${Materials})
 
 set_source_files_properties(${Config} PROPERTIES VS_TOOL_OVERRIDE "Text")
+set_source_files_properties(${Materials} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${Scenes} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${Shaders} PROPERTIES VS_TOOL_OVERRIDE "Text")
+set_source_files_properties(${FidelityFX} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(Data/Resources/VQE.rc PROPERTIES VS_TOOL_OVERRIDE "Resource compiler")
 set_source_files_properties(Data/Icons/VQE32.ico  PROPERTIES VS_TOOL_OVERRIDE "Image")
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/VQUtils/Bin/)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/WinPixEventRuntime/bin/x64)
 
 # Create a library with the project name that is build with the Headers and Source files
-add_executable( ${PROJECT_NAME} ${HeaderVQE} ${SourceVQE} ${Config} ${Scenes} ${Resource} ${Shaders} )
+add_executable( ${PROJECT_NAME} ${HeaderVQE} ${SourceVQE} ${Config} ${Scenes} ${Resource} ${Shaders} ${Materials} ${FidelityFX})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} )
 

Data/EngineSettings.ini

@@ -1,19 +1,19 @@
 ; TODO: seperate graphics vs display settings
 
 [Graphics]
-VSync=true
+VSync=false
 RenderScale=1.0
 TripleBuffer=true
 AntiAliasing=true
-MaxFrameRate=Auto
+MaxFrameRate=0
 HDR=false
 
 [Engine]
-Width=768
-Height=432
+Width=1600
+Height=900
 DisplayMode=Windowed
 PreferredDisplay=0
-Scene=StressTest
+Scene=GeometryUnitTest
 
 DebugWindow=false
 DebugWindowWidth=450