Commit Graph

391 Commits

Author SHA1 Message Date
Chris Burel 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
Ken Pruiksma 256eb0d49e Merge pull request #275 from aws-lumberyard-dev/pruiksma/ATOM-15316
ATOM-15316 Fixing crash in disk light delegate drawing aux geom.
2021-04-23 14:03:20 -05:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
Benjamin Jillich 0fa00a117c [ATOM-14477] Add clone function to model and/or model asset (#135)
* Added clone methods for the buffer, model lod and model assets.
* Cloning works via the creators.
* Mesh handle/instance now knows about the model asset it originated from as well as the cloned model asset that we need for instancing until instancing works without the dependencies to the asset ids.
* MeshComponentRequestBus returns the original asset id and the model asset. If you need access to the clone, go by the model.
* Cloth component mesh now gettings its model asset from the model as it needs to work on the clone.
* Moved the requires cloning function from the mesh loader in the mesh feature processor to the mesh component controller.
* As we need the model asset to be loaded before we can check if it requires cloning or not, we couldn't pass in a bool from the controller but had to use a callback.
* Using asset hint instead of asset id for the model lod asset creator error.
* Storing a map of source buffer asset ids and the actual cloned buffer assets rather than just their ids.
* Using the buffer assets from the new map directly and removed the search process in the mesh loop where the asset views are created.
* Fixed the vegetation mocks.
* Using the actor's mesh asset when emitting the on model ready event for the mesh component notification bus.
* Mesh components notifications connection policy changed to adapt to cloned model asset.
* Handling empty meshes in model lod asset creator.
* Removed the requires cloning callback from the mesh feature processor and made it a parameter to the acquire mesh function
* Fixing mocks and unit tests
2021-04-23 18:33:00 +02:00
pruiksma 47851883e2 ATOM-15316 Fixing crash in disk light delegate drawing aux geom. Using a negative step is no longer supported in aux geom. 2021-04-22 23:29:30 -05:00
Chris Santora 43b7a42a0b Merge pull request #188 from aws-lumberyard-dev/Atom/santorac/CavityMaps-ATOM-14040
ATOM-14040 Add Support for Cavity Maps

Replace the "Ambient Occlusion" property groups with "Occlusion" property groups that contain settings for "Diffuse AO" and "Specular Cavity" maps.
Pre-multiplied diffuseAmbientOcclusion into the m_albedo.rgb gbuffer, making room for specularOcclusion to be stored in m_albedo.a
Added new render pipeline connections to connect the albedo gbuffer to the fullscreen reflection passes.
Also fixed ATOM-15297 "StandardPBR_ForwardPass.shadervariantlist Job Fails With Obscure Error"
2021-04-22 12:15:22 -07:00
mrieggeramzn b8861cd575 Merge pull request #216 from aws-lumberyard-dev/Atom/mriegger/DirFix
Fix for directional light not having shadows in editor
2021-04-22 11:11:52 -07:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00
mnaumov af00191e82 merge from main 2021-04-21 15:21:03 -07:00
mriegger 07c0f05abb Fix for directional light not having shadows in editor 2021-04-21 11:54:37 -07:00
greerdv 496891b4c0 feedback from PR 2021-04-21 10:55:05 +01:00
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.
2021-04-20 16:59:27 -07:00
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
2021-04-20 16:40:10 -07:00
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).
2021-04-20 12:52:56 -07:00
greerdv cc937e0809 feedback from PR 2021-04-20 14:44:31 +01:00
greerdv 03350134c5 more feedback from PR 2021-04-20 13:41:18 +01:00
greerdv fd8b42c45e Merge branch 'main' into non-uniform-scale-mesh 2021-04-20 10:29:55 +01:00
greerdv f0ae8056c8 feedback from PR 2021-04-20 10:25:19 +01:00
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 2021-04-19 11:05:10 +01:00
guthadam 8fead27c45 ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
Remove option from presets

Updated code to select current default options

Will data drive default options with editor settings or settings registry in upcoming tasks

https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
mnaumov db9b0f141f Double click launches Material Editor 2021-04-16 16:13:39 -07:00
AMZN-mnaumov 40bca24204 Merge pull request #116 from aws-lumberyard-dev/Atom/mnaumov/LYN-3004
[LYN-3004] Moving thumbnail assets to AtomLyIntegration so thumbnails work in Editor
2021-04-16 16:09:44 -07:00
Alex Peterson 6924621cc1 Merge pull request #112 from aws-lumberyard-dev/github/staging
Integrating github/staging through commit ef88e6e
2021-04-16 15:21:17 -07:00
mnaumov 01a2ea6423 Moving thumbnail assets to AtomLyIntegration 2021-04-16 14:21:20 -07:00
AMZN-mnaumov 5ef212624f Merge pull request #53 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5659
[ATOM-5659] Adding "Open Material Editor" action to Material Component slot context
2021-04-16 12:54:31 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
guthadam 48e53ac66b Correctingtypo 2021-04-15 13:50:29 -05:00
guthadam 2baa0db2de Standardizing dialog button boxes across material editor and component
Making dialogs modal

https://jira.agscollab.com/browse/ATOM-15173

https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
greerdv 2bfb93e5e1 fixing non-uniform scale for mesh on activation 2021-04-15 12:34:35 +01:00
greerdv d8169e08fb merging from main 2021-04-15 08:18:11 +01:00
pruiksma 243af5f697 ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists. Adding simple point and simple spot feature processors to the thumbnail scene descriptor. 2021-04-14 23:13:31 -05:00
mnaumov a23a2fba65 PR feedback 2021-04-14 17:47:37 -07:00
greerdv 2fb2813b48 updating atom mesh component to support non-uniform scale component 2021-04-14 14:05:59 +01:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
mnaumov 5050de2604 Adding "Open Material Editor" action to Material Component slot context menu 2021-04-13 15:05:05 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00