Skip to content

Commit eb8f691

Browse files
skallweitNVskallweitNV
authored
Falcor 6.0-preview (#338)
1 parent 430824f commit eb8f691

File tree

1,424 files changed

+96649
-75408
lines changed

Some content is hidden

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

1,424 files changed

+96649
-75408
lines changed

‎.clang-format‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# C++ formatting
2+
3+
Language: Cpp
4+
BasedOnStyle: Chromium
5+
IndentWidth: 4
6+
ColumnLimit: 140
7+
AccessModifierOffset: -4
8+
SortIncludes: false
9+
SortUsingDeclarations: false
10+
SpaceAfterTemplateKeyword: false
11+
DerivePointerAlignment: false
12+
PointerAlignment: Left
13+
FixNamespaceComments: true
14+
15+
AllowAllConstructorInitializersOnNextLine: true
16+
BreakConstructorInitializers: BeforeComma
17+
AlwaysBreakTemplateDeclarations: true
18+
AllowShortFunctionsOnASingleLine: Inline
19+
AllowShortEnumsOnASingleLine: true
20+
BreakBeforeBraces: Custom
21+
BraceWrapping:
22+
AfterCaseLabel: true
23+
AfterClass: true
24+
AfterControlStatement: Always
25+
AfterEnum: true
26+
AfterFunction: true
27+
AfterNamespace: true
28+
AfterStruct: true
29+
AfterUnion: true
30+
AfterExternBlock: true
31+
BeforeCatch: true
32+
BeforeElse: true
33+
BeforeLambdaBody: true
34+
BeforeWhile: false
35+
SplitEmptyFunction: false
36+
SplitEmptyRecord: false
37+
SplitEmptyNamespace: false
38+
IndentCaseLabels: false
39+
40+
ReflowComments: true
41+
CommentPragmas: '^\\.+'
42+
SpacesBeforeTrailingComments: 1
43+
PenaltyBreakComment: 0
44+
AlignAfterOpenBracket: BlockIndent
45+
IndentPPDirectives: None
46+
PenaltyReturnTypeOnItsOwnLine: 100000
47+
PenaltyBreakTemplateDeclaration: 100000
48+
49+
---
50+
51+
# Slang formatting
52+
53+
Language: CSharp
54+
BasedOnStyle: Chromium
55+
IndentWidth: 4
56+
ColumnLimit: 140
57+
AccessModifierOffset: -4
58+
SortIncludes: false
59+
SortUsingDeclarations: false
60+
SpaceAfterTemplateKeyword: false
61+
DerivePointerAlignment: false
62+
PointerAlignment: Left
63+
FixNamespaceComments: true
64+
65+
AllowAllConstructorInitializersOnNextLine: true
66+
BreakConstructorInitializers: BeforeComma
67+
AlwaysBreakTemplateDeclarations: true
68+
AllowShortFunctionsOnASingleLine: Inline
69+
AllowShortEnumsOnASingleLine: true
70+
BreakBeforeBraces: Custom
71+
BraceWrapping:
72+
AfterCaseLabel: true
73+
AfterClass: true
74+
AfterControlStatement: Always
75+
AfterEnum: true
76+
AfterFunction: true
77+
AfterNamespace: true
78+
AfterStruct: true
79+
AfterUnion: true
80+
AfterExternBlock: true
81+
BeforeCatch: true
82+
BeforeElse: true
83+
BeforeLambdaBody: true
84+
BeforeWhile: false
85+
SplitEmptyFunction: false
86+
SplitEmptyRecord: false
87+
SplitEmptyNamespace: false
88+
IndentCaseLabels: false
89+
90+
ReflowComments: true
91+
CommentPragmas: '^\\.+'
92+
SpacesBeforeTrailingComments: 1
93+
PenaltyBreakComment: 0
94+
AlignAfterOpenBracket: BlockIndent
95+
IndentPPDirectives: None
96+
PenaltyReturnTypeOnItsOwnLine: 100000
97+
PenaltyBreakTemplateDeclaration: 100000

‎.clang-format-ignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Source/Falcor/RenderGraph
2+
Source/Falcor/Rendering
3+
Source/Falcor/RenderPasses
4+
Source/Falcor/Scene
5+
Source/Falcor/Utils
6+
Source/Mogwai
7+
Source/plugins/importers/USDImporter
8+
Source/RenderPasses
9+
10+
# Explicitly whitelisted files
11+
!Source/Falcor/Utils/PathResolving.cpp
12+
!Source/Falcor/Utils/PathResolving.h
13+
!Source/Falcor/Utils/Settings.cpp
14+
!Source/Falcor/Utils/Settings.h
15+
!Source/Falcor/Utils/StringFormatters.h
16+
!Source/Falcor/Utils/Math/Rectangle.cpp
17+
!Source/Falcor/Utils/Math/Rectangle.h
18+
!Source/Falcor/Utils/Algorithm/UnionFind.h
19+
!Source/Falcor/Rendering/Materials/BSDFs
20+
!Source/RenderPasses/DLSSPass/
21+

‎.editorconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ insert_final_newline = true
1515
# Override trailing whitespace setting for Markdown since there it's actually useful
1616
[*.{md}]
1717
trim_trailing_whitespace = false
18-
19-
[*.{yml}]
20-
indent_size = 2

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Set the default behavior, in case people don't have core.autocrlf set.
22
* text=auto
3+
# Format slang files as HLSL.
4+
*.slang gitlab-language=hlsl
5+
*.slangh gitlab-language=hlsl

‎.github/workflows/compile.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
branches: ["master"]
66

77
env:
8-
CMAKE_EXE: tools\.packman\cmake\bin\cmake.exe
9-
CMAKE_BUILD_PRESET: windows-ninja-msvc-d3d12
10-
CMAKE_BUILD_CONFIG: Release
8+
CMAKE_EXE: tools\.packman\cmake\bin\cmake.exe
9+
CMAKE_BUILD_PRESET: windows-ninja-msvc-ci
10+
CMAKE_BUILD_CONFIG: Release
1111

1212
jobs:
1313
windows:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
/.vs/
1616
/.vscode/
1717

18+
# User files.
19+
/CMakeUserPresets.json
20+
1821
# File types.
1922
*.user
2023
*.suo

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
[submodule "external/glm"]
1717
path = external/glm
1818
url = https://github.com/g-truc/glm.git
19-
[submodule "external/tiny-cuda-nn"]
20-
path = external/tiny-cuda-nn
21-
url = https://github.com/NVlabs/tiny-cuda-nn.git
19+
[submodule "external/vulkan-headers"]
20+
path = external/vulkan-headers
21+
url = https://github.com/KhronosGroup/Vulkan-Headers

‎.vscode-default/launch.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,26 @@
6262
}
6363
],
6464
"visualizerFile": "${workspaceFolder}/Source/Falcor/Falcor.natvis"
65+
},
66+
{
67+
// Launch configuration for Python example.
68+
"name": "Python Example",
69+
"type": "cppvsdbg",
70+
"request": "launch",
71+
"windows": {
72+
"program": "${config:python.defaultInterpreterPath}"
73+
},
74+
"args": [ "${workspaceFolder}/scripts/internal/python/simple.py" ],
75+
"stopAtEntry": false,
76+
"cwd": "${command:cmake.launchTargetDirectory}",
77+
"environment": [
78+
{
79+
"name": "FALCOR_DEVMODE",
80+
"value": "1"
81+
}
82+
],
83+
"internalConsoleOptions": "openOnSessionStart",
84+
"visualizerFile": "${workspaceFolder}/Source/Falcor/Falcor.natvis"
6585
}
6686
]
6787
}

‎.vscode-default/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
"files.associations": {
33
"*.pyscene": "python"
44
},
5-
"cmake.configureOnEdit": false
5+
"cmake.configureOnEdit": false,
6+
"C_Cpp.clang_format_path": "${workspaceFolder}/tools/.packman/clang-format/clang-format",
7+
"slang.format.clangFormatLocation": "${workspaceFolder}/tools/.packman/clang-format/clang-format"
68
}

0 commit comments

Comments
 (0)