Commit Graph

16 Commits (f47e71da36e29f097509a1c5dd9555ffdbc34bfb)

Author SHA1 Message Date
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
Jonny Galloway f18ee01e68
Merge pull request #1517 from aws-lumberyard-dev/Atom/gallowj/dccsi_legal
pruning some files, reduced size of a image used in a test
5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
gallowj 7514d29ef1 pruning some files, reduced size of a image used in a test 5 years ago
gallowj cbb85e8ef9 adding qdarkstyle to requirements.txt since we removed the package from codebase 5 years ago
gallowj 5449c5785b Several small fixes to the DCCsi to match some o3de changes 5 years ago
Terry Michaels 8ddfcabae7
Removed unneeded comments (#673) 5 years ago
gallowj 50abfbb3f5 This is a sweep to remove bad inclusive terms like master. Also testing functionality. 5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
Chris Santora 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.
5 years ago
Chris Santora 94b11e5c8f Replaced StandardPBR_DiffuseOcclusionState and StandardPBR_SpecularOcclusionState functor scripts with just UseTexture functors. The behavior is the basically the same and a lot simpler. All we lose is the occlusion "enable" flag, which is cleaner anyway.
ATOM-14040 Add Support for Cavity Maps
5 years ago
Chris Santora 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).
5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
5 years ago
alexpete a10351f38d Initial commit 5 years ago