42c9f4416b
Merge branch 'main' into DxcExperiment
2021-05-18 20:43:43 -07:00
1ebb7c405f
Merge branch 'main' into DxcExperiment
2021-05-18 20:24:52 -07:00
a4e1b40e88
Merge branch 'main' into Atom/antonmic/lowEnd
2021-05-18 13:04:25 -07:00
bcea9f29a8
Improved variable name
2021-05-12 22:11:49 -07:00
30637274e1
Merge branch 'main' into DxcExperiment
2021-05-12 19:35:26 -07:00
92b7099d78
Some clean up
2021-05-12 11:10:13 -07:00
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
1a59f8c54b
Merge branch 'main' into Atom/antonmic/lowEnd
2021-05-09 23:09:54 -07:00
cb245730a1
work in progress
2021-05-09 23:01:24 -07:00
24aa0f8521
skybox pass separation for single vs double output
2021-05-07 20:56:40 -07:00
c5cc6e0371
Merge branch 'main' into DxcExperiment
2021-05-07 20:39:29 -07:00
1f3d0beb38
work in progress
2021-05-07 18:51:20 -07:00
e2ca84ceb2
More fixes to shaders with the latest dxc
2021-05-07 17:41:24 -07:00
19e28b18a0
Merge branch 'main' into Atom/mriegger/PLS
2021-05-04 17:15:41 -07:00
c58089d35a
Merge branch 'main' into Atom/mriegger/PLS
2021-05-04 15:57:20 -07:00
3c4889b929
Merge branch 'main' into Atom/dmcdiar/ATOM-15438
2021-05-04 14:11:12 -07:00
b5d62b9cf6
Better variables
2021-05-04 10:36:57 -07:00
837458abf2
ATOM-15391 [RHI][Vulkan][Android] SSAO introduces horizontal lines on flat surfaces
2021-05-03 20:23:03 -07:00
cc15e0d489
Avoid alignment issue if it ever went to cbuffer
2021-05-03 13:19:53 -07:00
009ecbc152
Relocated RayTracingSceneSrg and converted to .azsli
2021-05-01 15:53:24 -07:00
cff730b4b8
Merge branch 'main' into Atom/mriegger/PLS
2021-04-30 11:46:08 -07:00
389846c45c
Disable metal shaders that dont cross compile correctly
2021-04-28 21:24:10 -07:00
66d36137b7
Tabs to spaces
2021-04-28 10:53:52 -07:00
81dbcdc8e4
Merge branch 'main' into DxcExperiment
2021-04-27 21:32:49 -07:00
304696fa5c
Shader compile fixes
2021-04-27 19:26:35 -07:00
569c831532
Working PLS
2021-04-26 14:53:31 -07:00
f508c4a4b5
Initial pointlight shadow work
2021-04-24 00:28:43 -07:00
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
5fd8c35878
Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh. ( #235 )
...
- Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh.
- Actor caches map from joint indices in skin metadata to skeleton indices so they can be query later.
- Actor cloth skinning reads indices and weights from Model Asset instead from EMFX Mesh.
- Actor cloth skinning with unlimited skinning bones.
- Sort out cloth unit tests by disabling them until there is a way to create an Atom mesh
- Addressing feedback.
2021-04-23 19:46:57 +01:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
10a8780e6f
Merge branch 'main' into Atom/dmcdiar/ATOM-14951
...
# Conflicts:
# Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
# Gems/Atom/Feature/Common/Assets/Passes/ReflectionGlobalFullscreen.pass
# Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
# Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
# Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
2021-04-22 21:49:21 -07:00
c4771997a2
Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040
2021-04-21 01:13:09 -07:00
a7b3372c15
Merge branch 'main' into Atom/dmcdiar/ATOM-14951
2021-04-20 22:38:13 -07:00
33745fdad1
Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040
...
Note there were significant conflicts in LightingModel.azsli and StandardPBR_ForwardPass.azsl. I only did basic resolves of these conflicts, mostly preserving the changes from main and distarding the changes in the local branch. The shaders are not compiling at this point, and of course the tests are not passing. I will fix up the code to make corrections in a separate commit, to make it easier to review those changes separate from this merge.
2021-04-20 16:59:27 -07:00
64e625a79f
Added support for cavity maps by changing the "Ambient Occlusion" material property group go just "Occlusion", which now contains properties for both "Diffuse AO" and "Specular Cavity".
...
Added new input attachment to the fullscreen reflection pass to receive the "ambient" gbuffer.
Added diffuse and specular occlusion to the Skin material type; it was missing before.
ATOM-14040 Add Support for Cavity Maps
Testing:
AtomSampleViewer automation, with updates that will be submitted in that repo.
Manual testing in Material Editor.
Built all AtomTest assets and opened a few test levels, with updates that will be submitted in that repo.
Made local copies of the occlusion test materials and changed replaced the material types with EnhancedPBR and Skin, and got identical results (with clear coat disabled since it works different in EnhancedPBR and is absent in Skin).
2021-04-20 12:52:56 -07:00
f5cb6f438b
Making room for specular cavity occlusion support in the buffer. We can pre-multiply the diffuseAmbientOcclusion into the albedo term output from the forward pass, instead of multiplying it in the diffuse GI passes. The difference due to precision is negligable. This can be seen in the corresponding changes in AtomSampleViewer baseline screenshots.
...
ATOM-14040 Add Support for Cavity Maps
2021-04-20 00:12:53 -07:00
c367e51462
Added DiffuseProbeGridClassification pass.
2021-04-19 02:30:52 -07:00
007589a98d
Added DiffuseProbeGridClassification pass.
...
Updated RayTracing shaders to use the new light types.
2021-04-19 02:29:20 -07:00
a4fe1bc8db
Removed ClearCoatNormal RT from the pipeline and shaders.
...
Changed stencil bits to use 0x3 for the IBL Specular pass and 0x80 for the DiffuseGI pass.
2021-04-18 23:07:29 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
moudgils
antonmic
mriegger
Terry Michaels
Michael Riegger
dmcdiar
jiaweig
Chris Burel
Aaron Ruiz Mora
Chris Santora
alexpete