Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Feature rt transparency #383

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Feature rt transparency #383

Show file tree
Hide file tree
Changes from 11 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 Jun 7, 2019
955b3c5
[CHANGE] Refactored AO shader a bit, adding RAY_FLAG_FORCE_OPAQUE fix…
LaisoEmilio Jun 7, 2019
bc2154e
[CHANGE] Prototyped ray layers
LaisoEmilio Jun 12, 2019
19e240e
[CHANGE] Pushing to switch branch
LaisoEmilio Jun 13, 2019
5a3ddf0
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio Jun 13, 2019
a20c8c1
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio Jun 14, 2019
2675503
[CHANGE] Added transparency to hybrid path tracer
LaisoEmilio Jun 14, 2019
7673050
[CHANGES]
LaisoEmilio Jun 15, 2019
d3644d1
Merged with master and added transparency to Ambient Occlusion
LaisoEmilio Jun 17, 2019
5e5af30
[CHANGE] Shadows were bugged in full raytracing
LaisoEmilio Jun 18, 2019
9fccc9b
[CHANGE] Acted on some of the feedback from Pull Request
LaisoEmilio Jun 18, 2019
c6f6497
[CHANGE] Reverted left out debug code
LaisoEmilio Jun 19, 2019
a61279a
[CHANGE]
LaisoEmilio Jun 20, 2019
cc1682b
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio Jun 20, 2019
fad5a33
[CHANGE] Re-named function as requested in the PR
LaisoEmilio Jun 20, 2019
479c5af
Merge remote-tracking branch 'origin/master' into feature_rt_transpar…
LaisoEmilio Jun 20, 2019
6c7f2fc
Merge branch 'master' into feature_rt_transparency
LaisoEmilio Jun 22, 2019
1090d5e
[CHANGE] Merged with master. Also, ifdef DEBUG in ambient occlusion t…
LaisoEmilio Jun 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 162 additions & 162 deletions imgui.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,162 +1,162 @@
[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,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

Loading