Skip to content

Commit

Permalink
Falcor 3.2 (#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyaoNV authored Nov 22, 2018
1 parent 5a12f29 commit 236927c
Show file tree
Hide file tree
Showing 312 changed files with 5,982 additions and 6,430 deletions.
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Topmost EditorConfig file; do not look at files higher up in the directory tree
root = true

# Set default editor config for all files:
# - 4 spaces, no trailing whitespaces
# - final newline for slightly cleaner diffs when changing the last line
# - native end-of-line in case we want to open a file elsewhere, git converts to LF for non-Windows
# - use utf-8 as default
[*]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = crlf
charset = utf-8

# Override trailing whitespace setting for Markdown since there it's actually useful
[*.{md}]
trim_trailing_whitespace = false
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
v3.2
------
- Introduced concept of Experimental Features. These features are not included by default in "Falcor.h" and are instead part of a new "FalcorExperimental.h" header. DXR is considered an experimental feature.
- Render Graph and a set of Render Passes are released as an experimental feature. Most existing effects can also be used as a render pass.
- D3D Feature Level is now automatically selected by default
- Check Vulkan device's max supported API version if user requested a specific version
- RGB32 format no longer disabled on AMD GPUs now that drivers support it correctly
- RGB32 format support is checked when loading textures in Vulkan
- Added macro for suppressing deprecation warnings
- Add option to Gui::pushWindow() to choose if it should be have focus or not
- Add RenderContext::getBindFlags() getter
- Add Sampler::getDesc() getter
- Add Material::isEmissive() getter
- Add `alphaTest()` that uses Slang generics to select Sample method
- Add scene_unit key to fscene
- Added `renderUI()` functions to `Scene` and `Camera`
- Add error check for missing file in Program creation
- Store scene bounding box in Scene, add getter
- Change OBJ/MTL to use SpecGloss by default, overrideable with metal_rough key in fscene
- Add frame reset option to video encoder UI
- Make video encoder retain options (do not delete the UI class between exports)
- Renamed getTriNormalsAndEdges to getTriNormalsAndEdgesInObjectSpace to clarify it's in object space
- Renamed getGeometricNormal to getGeometricNormalW to clarify it's in world space
- Loading of GLTF models has been enabled

New samples
- RenderGraphEditor: A visual, node-based tool for creating and editing render graph scripts.
- RenderGraphViewer: Load scenes and render them with a render graph.
- SamplePassLibrary: Demonstration of how to write render passes that compile to DLLs, and how they can be loaded from render graph scripts.

Bug Fixes:
- Fixed reflection data to use row major flag from Slang
- Fixed bug in RtProgram::addDefine() methods
- Fixed bug in scene exporter that it aborted on nan/inf
- Fixed Vulkan image tiling flag selection for textures

Deprecations:
- Device::isExtensionSupported() - Use isFeatureSupported() instead.

Dependencies:
- Updated packman to 5.7.1
- Updated Slang to 0.11.7
- Updated Falcor Media to 2.2.1

v3.1
------
- Falcor now requires Windows 10 SDK version 1809 (10.0.17763.0)
Expand Down
54 changes: 52 additions & 2 deletions Falcor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightProbeViewer", "Samples
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FalcorSharedObjects", "Framework\FalcorSharedObjects\FalcorSharedObjects.vcxproj", "{2C535635-E4C5-4098-A928-574F0E7CD5F9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RenderGraph", "RenderGraph", "{AC911782-AE2C-4026-9E0E-EB359ECDE830}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderGraphEditor", "Samples\RenderGraph\RenderGraphEditor\RenderGraphEditor.vcxproj", "{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderGraphViewer", "Samples\RenderGraph\RenderGraphViewer\RenderGraphViewer.vcxproj", "{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SamplePassLibrary", "Samples\RenderGraph\SamplePassLibrary\SamplePassLibrary.vcxproj", "{232CBBB4-33D9-4445-BB62-08A7E7700147}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FalcorTest", "Samples\Utils\FalcorTest\FalcorTest.vcxproj", "{20401FAD-6022-8EB7-2F78-41369B8F0F49}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{350A0B15-98C0-45E3-872B-4FEFB47AA37C}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugD3D12|x64 = DebugD3D12|x64
Expand Down Expand Up @@ -215,14 +230,44 @@ Global
{9D80D89D-D029-4E3E-BCA8-424ECC1F1DF5}.ReleaseVK|x64.Build.0 = Release|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugD3D12|x64.ActiveCfg = DebugD3D12|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugD3D12|x64.Build.0 = DebugD3D12|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugDXR|x64.ActiveCfg = DebugDXR|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugDXR|x64.Build.0 = DebugDXR|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugVK|x64.ActiveCfg = DebugVK|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.DebugVK|x64.Build.0 = DebugVK|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.ReleaseD3D12|x64.ActiveCfg = ReleaseD3D12|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.ReleaseD3D12|x64.Build.0 = ReleaseD3D12|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.ReleaseVK|x64.ActiveCfg = ReleaseVK|x64
{2C535635-E4C5-4098-A928-574F0E7CD5F9}.ReleaseVK|x64.Build.0 = ReleaseVK|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.DebugD3D12|x64.ActiveCfg = Debug|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.DebugD3D12|x64.Build.0 = Debug|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.DebugVK|x64.ActiveCfg = Debug|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.DebugVK|x64.Build.0 = Debug|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.ReleaseD3D12|x64.ActiveCfg = Release|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.ReleaseD3D12|x64.Build.0 = Release|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.ReleaseVK|x64.ActiveCfg = Release|x64
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71}.ReleaseVK|x64.Build.0 = Release|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.DebugD3D12|x64.ActiveCfg = Debug|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.DebugD3D12|x64.Build.0 = Debug|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.DebugVK|x64.ActiveCfg = Debug|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.DebugVK|x64.Build.0 = Debug|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.ReleaseD3D12|x64.ActiveCfg = Release|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.ReleaseD3D12|x64.Build.0 = Release|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.ReleaseVK|x64.ActiveCfg = Release|x64
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49}.ReleaseVK|x64.Build.0 = Release|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.DebugD3D12|x64.ActiveCfg = Debug|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.DebugD3D12|x64.Build.0 = Debug|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.DebugVK|x64.ActiveCfg = Debug|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.DebugVK|x64.Build.0 = Debug|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.ReleaseD3D12|x64.ActiveCfg = Release|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.ReleaseD3D12|x64.Build.0 = Release|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.ReleaseVK|x64.ActiveCfg = Release|x64
{232CBBB4-33D9-4445-BB62-08A7E7700147}.ReleaseVK|x64.Build.0 = Release|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.DebugD3D12|x64.ActiveCfg = Debug|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.DebugD3D12|x64.Build.0 = Debug|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.DebugVK|x64.ActiveCfg = Debug|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.DebugVK|x64.Build.0 = Debug|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.ReleaseD3D12|x64.ActiveCfg = Release|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.ReleaseD3D12|x64.Build.0 = Release|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.ReleaseVK|x64.ActiveCfg = Release|x64
{20401FAD-6022-8EB7-2F78-41369B8F0F49}.ReleaseVK|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -251,6 +296,11 @@ Global
{6D4D8D4B-CFFB-455A-BFFC-9490C5583150} = {518F9E6D-D9DE-4557-94EC-F0F466354504}
{71B60B71-89A2-4196-BFB9-4A848CF6C541} = {6D4D8D4B-CFFB-455A-BFFC-9490C5583150}
{9D80D89D-D029-4E3E-BCA8-424ECC1F1DF5} = {152F0E49-0B22-4359-B8FB-BD76093D36DE}
{AC911782-AE2C-4026-9E0E-EB359ECDE830} = {518F9E6D-D9DE-4557-94EC-F0F466354504}
{DE81ACAA-933F-4DBC-A7EB-D69B9CB0BA71} = {AC911782-AE2C-4026-9E0E-EB359ECDE830}
{204D1CBA-6D34-4EB7-9F78-A1369F8F0F49} = {AC911782-AE2C-4026-9E0E-EB359ECDE830}
{232CBBB4-33D9-4445-BB62-08A7E7700147} = {AC911782-AE2C-4026-9E0E-EB359ECDE830}
{20401FAD-6022-8EB7-2F78-41369B8F0F49} = {152F0E49-0B22-4359-B8FB-BD76093D36DE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {357B2AE0-FE30-4AC6-8D41-B580232BC0DE}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,8 @@ namespace ImGui {
bool show_node_copy_paste_buttons;
static bool UseSlidersInsteadOfDragControls;
mutable void* user_ptr;
static Style& GetStyle() { static Style style; return style; }
//FALCOR_FIX modified from static function. It is now a non-static to avoid initializing a new style from outside of the dll
Style& GetStyle() { return style; }
/*mutable ImGuiColorEditMode colorEditMode;*/
float nodesBaseWidth;
enum class DragEnum {
Expand Down Expand Up @@ -783,7 +784,8 @@ namespace ImGui {
}
return -1;
}
static Style style;
// FALCOR_FIX -- changed from static style to member to avoid static initialization creating a new one
Style style;


private:
Expand Down
1 change: 1 addition & 0 deletions Framework/FalcorSharedObjects/FalcorSharedObjects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#include <Falcor.h>
#include <FalcorExperimental.h>

namespace Falcor
{
Expand Down
Loading

0 comments on commit 236927c

Please sign in to comment.