This repository was archived by the owner on Nov 1, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 17
Feature rt transparency #383
Open
LaisoEmilio
wants to merge
18
commits into
master
Choose a base branch
from
feature_rt_transparency
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
186bace
[CHANGE] Adding transparency. Committing because I need to merge mast…
LaisoEmilio 955b3c5
[CHANGE] Refactored AO shader a bit, adding RAY_FLAG_FORCE_OPAQUE fix…
LaisoEmilio bc2154e
[CHANGE] Prototyped ray layers
LaisoEmilio 19e240e
[CHANGE] Pushing to switch branch
LaisoEmilio 5a3ddf0
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio a20c8c1
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio 2675503
[CHANGE] Added transparency to hybrid path tracer
LaisoEmilio 7673050
[CHANGES]
LaisoEmilio d3644d1
Merged with master and added transparency to Ambient Occlusion
LaisoEmilio 5e5af30
[CHANGE] Shadows were bugged in full raytracing
LaisoEmilio 9fccc9b
[CHANGE] Acted on some of the feedback from Pull Request
LaisoEmilio c6f6497
[CHANGE] Reverted left out debug code
LaisoEmilio a61279a
[CHANGE]
LaisoEmilio cc1682b
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio fad5a33
[CHANGE] Re-named function as requested in the PR
LaisoEmilio 479c5af
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio 6c7f2fc
Merge branch 'master' into feature_rt_transparency
LaisoEmilio 1090d5e
[CHANGE] Merged with master. Also, ifdef DEBUG in ambient occlusion t…
LaisoEmilio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,162 +1,176 @@ | ||
| [Window][DockspaceViewport_11111111] | ||
| Pos=0,21 | ||
| Size=1280,699 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Debug##Default] | ||
| Pos=1022,401 | ||
| Size=228,150 | ||
| Collapsed=1 | ||
|
|
||
| [Window][Theme] | ||
| Pos=1032,376 | ||
| Size=248,201 | ||
| Collapsed=0 | ||
| DockId=0x00000009,0 | ||
|
|
||
| [Window][ImGui Details] | ||
| Pos=1032,607 | ||
| Size=248,113 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Camera Settings] | ||
| Pos=0,342 | ||
| Size=270,378 | ||
| Collapsed=0 | ||
| DockId=0x00000008,0 | ||
|
|
||
| [Window][Light Editor] | ||
| Pos=0,21 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Shader Registry] | ||
| Pos=340,105 | ||
| Size=590,455 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Pipeline Registry] | ||
| Pos=317,134 | ||
| Size=312,443 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Root Signature Registry] | ||
| Pos=748,338 | ||
| Size=169,259 | ||
| Collapsed=0 | ||
|
|
||
| [Window][DirectX 12 Settings] | ||
| Pos=1032,376 | ||
| Size=248,201 | ||
| Collapsed=0 | ||
| DockId=0x00000009,2 | ||
|
|
||
| [Window][Hardware Info] | ||
| Pos=1032,376 | ||
| Size=248,201 | ||
| Collapsed=0 | ||
| DockId=0x00000009,1 | ||
|
|
||
| [Window][Model Editor] | ||
| Pos=0,31 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Light Details] | ||
| Pos=0,403 | ||
| Size=220,129 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Inspect] | ||
| Pos=26,21 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Viewport] | ||
| Pos=272,21 | ||
| Size=758,699 | ||
| Collapsed=0 | ||
| DockId=0x00000002,0 | ||
|
|
||
| [Window][Scene Graph Editor] | ||
| Pos=0,21 | ||
| Size=270,319 | ||
| Collapsed=0 | ||
| DockId=0x00000007,1 | ||
|
|
||
| [Window][Inspector] | ||
| Pos=1032,21 | ||
| Size=248,353 | ||
| Collapsed=0 | ||
| DockId=0x00000006,0 | ||
|
|
||
| [Window][DockSpaceViewport_11111111] | ||
| Pos=0,21 | ||
| Size=1280,699 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Stats] | ||
| Pos=280,121 | ||
| Size=205,85 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Test popup] | ||
| ViewportPos=1503,395 | ||
| ViewportId=0xB4FE7E97 | ||
| Size=151,177 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Emissive Multiplier] | ||
| Pos=944,589 | ||
| Size=303,134 | ||
| Collapsed=0 | ||
|
|
||
| [Window][RTAO Settings] | ||
| Pos=1032,579 | ||
| Size=248,141 | ||
| Collapsed=0 | ||
| DockId=0x0000000A,0 | ||
|
|
||
| [Window][HBAO+ Settings] | ||
| Pos=1032,579 | ||
| Size=248,141 | ||
| Collapsed=0 | ||
| DockId=0x0000000A,0 | ||
|
|
||
| [Window][NVIDIA Ansel Settings] | ||
| Pos=1032,376 | ||
| Size=248,201 | ||
| Collapsed=0 | ||
| DockId=0x00000009,3 | ||
|
|
||
| [Window][Acceleration Structure Settings] | ||
| Pos=1032,579 | ||
| Size=248,141 | ||
| Collapsed=0 | ||
| DockId=0x0000000A,1 | ||
|
|
||
| [Window][Shadow Settings] | ||
| Pos=1032,579 | ||
| Size=248,141 | ||
| Collapsed=0 | ||
| DockId=0x0000000A,2 | ||
|
|
||
| [Window][Demo Scene] | ||
| Pos=0,21 | ||
| Size=270,319 | ||
| Collapsed=0 | ||
| DockId=0x00000007,0 | ||
|
|
||
| [Docking][Data] | ||
| DockSpace ID=0x8B93E3BD Pos=0,21 Size=1280,699 Split=X | ||
| DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=1030,699 Split=X | ||
| DockNode ID=0x00000001 Parent=0x00000003 SizeRef=270,699 Split=Y SelectedTab=0xF4865B00 | ||
| DockNode ID=0x00000007 Parent=0x00000001 SizeRef=219,319 SelectedTab=0xF4865B00 | ||
| DockNode ID=0x00000008 Parent=0x00000001 SizeRef=219,378 SelectedTab=0x8722C6A1 | ||
| DockNode ID=0x00000002 Parent=0x00000003 SizeRef=758,699 CentralNode=1 SelectedTab=0x995B0CF8 | ||
| DockNode ID=0x00000004 Parent=0x8B93E3BD SizeRef=248,699 Split=Y SelectedTab=0x070A839D | ||
| DockNode ID=0x00000006 Parent=0x00000004 SizeRef=248,353 SelectedTab=0xF02CD328 | ||
| DockNode ID=0x00000005 Parent=0x00000004 SizeRef=248,344 Split=Y SelectedTab=0xDA48A090 | ||
| DockNode ID=0x00000009 Parent=0x00000005 SizeRef=248,201 SelectedTab=0x4BB5AED3 | ||
| DockNode ID=0x0000000A Parent=0x00000005 SizeRef=248,141 SelectedTab=0xDCA1C528 | ||
|
|
||
| [Window][DockspaceViewport_11111111] | ||
| Pos=0,21 | ||
| Size=1280,699 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Debug##Default] | ||
| Pos=1022,401 | ||
| Size=228,150 | ||
| Collapsed=1 | ||
|
|
||
| [Window][Theme] | ||
| Pos=1032,222 | ||
| Size=248,219 | ||
| Collapsed=0 | ||
| DockId=0x00000009,0 | ||
|
|
||
| [Window][ImGui Details] | ||
| Pos=1032,607 | ||
| Size=248,113 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Camera Settings] | ||
| Pos=0,342 | ||
| Size=270,378 | ||
| Collapsed=0 | ||
| DockId=0x00000008,0 | ||
|
|
||
| [Window][Light Editor] | ||
| Pos=0,21 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Shader Registry] | ||
| Pos=340,105 | ||
| Size=590,455 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Pipeline Registry] | ||
| Pos=317,134 | ||
| Size=312,443 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Root Signature Registry] | ||
| Pos=748,338 | ||
| Size=169,259 | ||
| Collapsed=0 | ||
|
|
||
| [Window][DirectX 12 Settings] | ||
| Pos=1032,222 | ||
| Size=248,219 | ||
| Collapsed=0 | ||
| DockId=0x00000009,2 | ||
|
|
||
| [Window][Hardware Info] | ||
| Pos=1032,222 | ||
| Size=248,219 | ||
| Collapsed=0 | ||
| DockId=0x00000009,1 | ||
|
|
||
| [Window][Model Editor] | ||
| Pos=0,31 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Light Details] | ||
| Pos=0,403 | ||
| Size=220,129 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Inspect] | ||
| Pos=26,21 | ||
| Size=32,32 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Viewport] | ||
| Pos=272,21 | ||
| Size=758,699 | ||
| Collapsed=0 | ||
| DockId=0x00000002,0 | ||
|
|
||
| [Window][Scene Graph Editor] | ||
| Pos=0,21 | ||
| Size=270,319 | ||
| Collapsed=0 | ||
| DockId=0x00000007,1 | ||
|
|
||
| [Window][Inspector] | ||
| Pos=1032,21 | ||
| Size=248,199 | ||
| Collapsed=0 | ||
| DockId=0x00000006,0 | ||
|
|
||
| [Window][DockSpaceViewport_11111111] | ||
| Pos=0,21 | ||
| Size=1280,699 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Stats] | ||
| Pos=280,121 | ||
| Size=205,85 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Test popup] | ||
| ViewportPos=1503,395 | ||
| ViewportId=0xB4FE7E97 | ||
| Size=151,177 | ||
| Collapsed=0 | ||
|
|
||
| [Window][Emissive Multiplier] | ||
| Pos=944,589 | ||
| Size=303,134 | ||
| Collapsed=0 | ||
|
|
||
| [Window][RTAO Settings] | ||
| Pos=1032,443 | ||
| Size=248,121 | ||
| Collapsed=0 | ||
| DockId=0x0000000B,0 | ||
|
|
||
| [Window][HBAO+ Settings] | ||
| Pos=1032,443 | ||
| Size=248,277 | ||
| Collapsed=0 | ||
| DockId=0x0000000B,0 | ||
|
|
||
| [Window][NVIDIA Ansel Settings] | ||
| Pos=1032,222 | ||
| Size=248,219 | ||
| Collapsed=0 | ||
| DockId=0x00000009,3 | ||
|
|
||
| [Window][Acceleration Structure Settings] | ||
| Pos=1032,566 | ||
| Size=248,154 | ||
| Collapsed=0 | ||
| DockId=0x0000000C,0 | ||
|
|
||
| [Window][Shadow Settings] | ||
| Pos=1032,443 | ||
| Size=248,121 | ||
| Collapsed=0 | ||
| DockId=0x0000000B,1 | ||
|
|
||
| [Window][Demo Scene] | ||
| Pos=0,21 | ||
| Size=270,319 | ||
| Collapsed=0 | ||
| DockId=0x00000007,0 | ||
|
|
||
| [Window][Path Tracing Settings] | ||
| Pos=1548,797 | ||
| Size=372,220 | ||
| Collapsed=0 | ||
| DockId=0x0000000C,1 | ||
|
|
||
| [Window][Recorder] | ||
| Pos=1032,21 | ||
| Size=248,199 | ||
| Collapsed=0 | ||
| DockId=0x00000006,1 | ||
|
|
||
| [Docking][Data] | ||
| DockSpace ID=0x8B93E3BD Pos=0,21 Size=1280,699 Split=X | ||
| DockNode ID=0x00000003 Parent=0x8B93E3BD SizeRef=1030,699 Split=X | ||
| DockNode ID=0x00000001 Parent=0x00000003 SizeRef=270,699 Split=Y SelectedTab=0xF4865B00 | ||
| DockNode ID=0x00000007 Parent=0x00000001 SizeRef=219,319 SelectedTab=0xF4865B00 | ||
| DockNode ID=0x00000008 Parent=0x00000001 SizeRef=219,378 SelectedTab=0x8722C6A1 | ||
| DockNode ID=0x00000002 Parent=0x00000003 SizeRef=758,699 CentralNode=1 SelectedTab=0x995B0CF8 | ||
| DockNode ID=0x00000004 Parent=0x8B93E3BD SizeRef=248,699 Split=Y SelectedTab=0x070A839D | ||
| DockNode ID=0x00000006 Parent=0x00000004 SizeRef=248,199 SelectedTab=0xF02CD328 | ||
| DockNode ID=0x00000005 Parent=0x00000004 SizeRef=248,498 Split=Y SelectedTab=0xDA48A090 | ||
| DockNode ID=0x00000009 Parent=0x00000005 SizeRef=248,219 SelectedTab=0x4BB5AED3 | ||
| DockNode ID=0x0000000A Parent=0x00000005 SizeRef=248,277 Split=Y SelectedTab=0x23DB2B59 | ||
| DockNode ID=0x0000000B Parent=0x0000000A SizeRef=248,121 SelectedTab=0x23DB2B59 | ||
| DockNode ID=0x0000000C Parent=0x0000000A SizeRef=248,154 SelectedTab=0xA06991A0 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.