Skip to content

Commit

Permalink
Falcor 6.0-preview (#338)
Browse files Browse the repository at this point in the history
  • Loading branch information
skallweitNV authored Feb 17, 2023
1 parent 430824f commit eb8f691
Show file tree
Hide file tree
Showing 1,424 changed files with 96,649 additions and 75,408 deletions.
97 changes: 97 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# C++ formatting

Language: Cpp
BasedOnStyle: Chromium
IndentWidth: 4
ColumnLimit: 140
AccessModifierOffset: -4
SortIncludes: false
SortUsingDeclarations: false
SpaceAfterTemplateKeyword: false
DerivePointerAlignment: false
PointerAlignment: Left
FixNamespaceComments: true

AllowAllConstructorInitializersOnNextLine: true
BreakConstructorInitializers: BeforeComma
AlwaysBreakTemplateDeclarations: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortEnumsOnASingleLine: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: Always
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
BeforeWhile: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
IndentCaseLabels: false

ReflowComments: true
CommentPragmas: '^\\.+'
SpacesBeforeTrailingComments: 1
PenaltyBreakComment: 0
AlignAfterOpenBracket: BlockIndent
IndentPPDirectives: None
PenaltyReturnTypeOnItsOwnLine: 100000
PenaltyBreakTemplateDeclaration: 100000

---

# Slang formatting

Language: CSharp
BasedOnStyle: Chromium
IndentWidth: 4
ColumnLimit: 140
AccessModifierOffset: -4
SortIncludes: false
SortUsingDeclarations: false
SpaceAfterTemplateKeyword: false
DerivePointerAlignment: false
PointerAlignment: Left
FixNamespaceComments: true

AllowAllConstructorInitializersOnNextLine: true
BreakConstructorInitializers: BeforeComma
AlwaysBreakTemplateDeclarations: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortEnumsOnASingleLine: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: Always
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
BeforeWhile: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
IndentCaseLabels: false

ReflowComments: true
CommentPragmas: '^\\.+'
SpacesBeforeTrailingComments: 1
PenaltyBreakComment: 0
AlignAfterOpenBracket: BlockIndent
IndentPPDirectives: None
PenaltyReturnTypeOnItsOwnLine: 100000
PenaltyBreakTemplateDeclaration: 100000
21 changes: 21 additions & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Source/Falcor/RenderGraph
Source/Falcor/Rendering
Source/Falcor/RenderPasses
Source/Falcor/Scene
Source/Falcor/Utils
Source/Mogwai
Source/plugins/importers/USDImporter
Source/RenderPasses

# Explicitly whitelisted files
!Source/Falcor/Utils/PathResolving.cpp
!Source/Falcor/Utils/PathResolving.h
!Source/Falcor/Utils/Settings.cpp
!Source/Falcor/Utils/Settings.h
!Source/Falcor/Utils/StringFormatters.h
!Source/Falcor/Utils/Math/Rectangle.cpp
!Source/Falcor/Utils/Math/Rectangle.h
!Source/Falcor/Utils/Algorithm/UnionFind.h
!Source/Falcor/Rendering/Materials/BSDFs
!Source/RenderPasses/DLSSPass/

3 changes: 0 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ insert_final_newline = true
# Override trailing whitespace setting for Markdown since there it's actually useful
[*.{md}]
trim_trailing_whitespace = false

[*.{yml}]
indent_size = 2
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Format slang files as HLSL.
*.slang gitlab-language=hlsl
*.slangh gitlab-language=hlsl
6 changes: 3 additions & 3 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
branches: ["master"]

env:
CMAKE_EXE: tools\.packman\cmake\bin\cmake.exe
CMAKE_BUILD_PRESET: windows-ninja-msvc-d3d12
CMAKE_BUILD_CONFIG: Release
CMAKE_EXE: tools\.packman\cmake\bin\cmake.exe
CMAKE_BUILD_PRESET: windows-ninja-msvc-ci
CMAKE_BUILD_CONFIG: Release

jobs:
windows:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
/.vs/
/.vscode/

# User files.
/CMakeUserPresets.json

# File types.
*.user
*.suo
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
[submodule "external/glm"]
path = external/glm
url = https://github.com/g-truc/glm.git
[submodule "external/tiny-cuda-nn"]
path = external/tiny-cuda-nn
url = https://github.com/NVlabs/tiny-cuda-nn.git
[submodule "external/vulkan-headers"]
path = external/vulkan-headers
url = https://github.com/KhronosGroup/Vulkan-Headers
20 changes: 20 additions & 0 deletions .vscode-default/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,26 @@
}
],
"visualizerFile": "${workspaceFolder}/Source/Falcor/Falcor.natvis"
},
{
// Launch configuration for Python example.
"name": "Python Example",
"type": "cppvsdbg",
"request": "launch",
"windows": {
"program": "${config:python.defaultInterpreterPath}"
},
"args": [ "${workspaceFolder}/scripts/internal/python/simple.py" ],
"stopAtEntry": false,
"cwd": "${command:cmake.launchTargetDirectory}",
"environment": [
{
"name": "FALCOR_DEVMODE",
"value": "1"
}
],
"internalConsoleOptions": "openOnSessionStart",
"visualizerFile": "${workspaceFolder}/Source/Falcor/Falcor.natvis"
}
]
}
4 changes: 3 additions & 1 deletion .vscode-default/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"files.associations": {
"*.pyscene": "python"
},
"cmake.configureOnEdit": false
"cmake.configureOnEdit": false,
"C_Cpp.clang_format_path": "${workspaceFolder}/tools/.packman/clang-format/clang-format",
"slang.format.clangFormatLocation": "${workspaceFolder}/tools/.packman/clang-format/clang-format"
}
Loading

0 comments on commit eb8f691

Please sign in to comment.