Skip to content

Commit 48aa4e2

Browse files
authored
Falcor 4.0 Preview (#222)
* 4.0 dev snapshot
1 parent f2b53b1 commit 48aa4e2

File tree

916 files changed

+55089
-56113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

916 files changed

+55089
-56113
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ charset = utf-8
1717
# Override trailing whitespace setting for Markdown since there it's actually useful
1818
[*.{md}]
1919
trim_trailing_whitespace = false
20+
21+
# Override settings for project files to use the same settings as Visual Studio
22+
[*.{vcxproj,vcxproj.filters}]
23+
indent_size = 2
24+
insert_final_newline = false

.gitignore

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,16 @@ Bin/*
99
*.suo
1010
*.ptx
1111
*.pyc
12-
Falcor.VC.db
13-
FalcorTest.VC.db
14-
Framework/BuildScripts/PatchFalcorProps/PatchFalcorPropertySheet/PatchFalcorPropertySheet.VC.db
12+
*.VC.db
1513
FalcorTest/TestResults/*
16-
Falcor.VC.VC.opendb
14+
*.VC.opendb
1715
.vs/*
1816
.vscode/
1917
*.pyc
2018
*.o
2119
*slang-dump-*
22-
23-
# A bit of a song and dance to ignore all the files
24-
# in the Slang codebase except for the ones we need.
25-
Framework/Externals/slang/*
26-
!Framework/Externals/slang/source/
27-
Framework/Externals/slang/source/**/*.vcxproj
28-
Framework/Externals/slang/source/**/*.filters
29-
Framework/Externals/slang/source/**/*.natvis
30-
!Framework/Externals/slang/source/**/*.cpp
31-
!Framework/Externals/slang/source/**/*.cpp
32-
!Framework/Externals/slang/source/**/*.h
33-
Framework/Externals/*
34-
!Framework/Externals/dear_imgui_addons/
35-
!Framework/Externals/dear_imgui_addons/imguinodegrapheditor/
20+
Source/Externals/.packman/*
3621
Media
22+
/Tests/TestResults/*
23+
/Tests/Solution_BuildLog.txt
24+
/Tests/robocopy.txt

Build/deploycommon.bat

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
@echo off
2+
setlocal
3+
4+
rem %1 -> Falcor Core Directory Path
5+
rem %2 -> Platform Short Name
6+
rem %3 -> Output Directory
7+
rem %4 -> WINDSDK Directory
8+
9+
setlocal
10+
11+
SET ExtDir=%1\Externals\.packman\
12+
SET OutDir=%3
13+
SET FalcorDir=%1\Falcor\
14+
if not exist "%OutDir%" mkdir "%OutDir%"
15+
16+
rem Copy Falcor's files
17+
IF not exist %OutDir%\Data\ mkdir %OutDir%\Data >nul
18+
IF exist %FalcorDir%\ShadingUtils\ (xcopy %FalcorDir%\ShadingUtils\*.* %OutDir%\Data /s /y /d)
19+
IF exist %FalcorDir%\Raytracing\Data\ (xcopy %FalcorDir%\Raytracing\Data\*.* %OutDir%\Data /s /y /d /q >nul)
20+
call %~dp0\deployproject.bat %FalcorDir% %OutDir%
21+
22+
rem Copy externals
23+
robocopy %ExtDir%\Python\ %OutDir% Python37*.dll /r:0 >nul
24+
robocopy %ExtDir%\Python %OutDir%\Python /E /r:0 >nul
25+
robocopy %ExtDir%\AntTweakBar\lib %OutDir% AntTweakBar64.dll /r:0 >nul
26+
robocopy %ExtDir%\FreeImage %OutDir% freeimage.dll /r:0 >nul
27+
robocopy %ExtDir%\assimp\bin\%2 %OutDir% *.dll /r:0 >nul
28+
robocopy %ExtDir%\FFMpeg\bin\%2 %OutDir% *.dll /r:0 >nul
29+
robocopy %ExtDir%\dxcompiler\%2 %OutDir% dxcompiler.dll /r:0 >nul
30+
rem robocopy %ExtDir%\dxcompiler\windows-x86_64\release\%2 %OutDir% *.dll /r:0 >nul
31+
robocopy %ExtDir%\OptiX\bin64 %OutDir% *.dll /r:0 >nul
32+
robocopy %ExtDir%\openvr\bin\win64 %OutDir% openvr_api.dll /r:0 >nul
33+
robocopy %ExtDir%\Slang\bin\windows-x64\release %OutDir% *.dll /r:0 >nul
34+
robocopy %ExtDir%\GLFW\lib %OutDir% *.dll /r:0 >nul
35+
robocopy %ExtDir%\WinPixEventRuntime\bin\x64 %OutDir% WinPixEventRuntime.dll /r:0 >nul
36+
robocopy "%~4\Redist\D3D\%2" %OutDir% dxil.dll /r:0 >nul
37+
38+
rem Copy NVAPI
39+
set NvApiDir=%ExtDir%\NVAPI
40+
IF exist %NvApiDir% (
41+
IF not exist %OutDir%\Data\NVAPI mkdir %OutDir%\Data\NVAPI >nul
42+
copy /y %NvApiDir%\nvHLSLExtns.h %OutDir%\Data\NVAPI
43+
copy /y %NvApiDir%\nvHLSLExtnsInternal.h %OutDir%\Data\NVAPI
44+
copy /y %NvApiDir%\nvShaderExtnEnums.h %OutDir%\Data\NVAPI
45+
)
46+
47+
rem robocopy sets the error level to something that is not zero even if the copy operation was successful. Set the error level to zero
48+
exit /b 0

Build/deployproject.bat

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
rem %1==projectDir %2==outputdir
3+
setlocal
4+
5+
IF not exist %2\Data\ ( mkdir %2\Data >nul )
6+
IF exist %1\data\ ( xcopy %1\Data\*.* %2\Data /s /y /d /q >nul)
7+
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)