Commit Graph

104 Commits

Author SHA1 Message Date
dmcdiarmid-ly 6890cf907d Merge pull request #537 from aws-lumberyard-dev/Atom/dmcdiar/LYN-3256
[LYN-3256] Atom: Baking Reflection Probe crashes the Editor when Prefabs are enabled
2021-05-04 14:05:11 -07:00
dmcdiar 64f42ba1cb Removed the asset callback from the EditorReflectionProbeComponent, since the component may have been destroyed and recreated between the bake and the asset load.
Replaced with an OnTick handler that polls the ReflectionProbeFeatureProcessor to determine when the asset is ready.
2021-05-04 01:24:14 -07:00
jiaweig 837458abf2 ATOM-15391 [RHI][Vulkan][Android] SSAO introduces horizontal lines on flat surfaces 2021-05-03 20:23:03 -07:00
dmcdiarmid-ly dd3f032480 Merge pull request #488 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
[ATOM-14933] Reflection probes do not show mesh reflections if the entity's transform is scaled up
2021-04-30 16:33:15 -07:00
AMZN-mnaumov 1ce62ae797 Merge pull request #454 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5281
[ATOM-5281] Adding tone mapping option to Material Editor
2021-04-30 14:29:01 -07:00
Guthrie Adams b7a087948f Merge pull request #413 from aws-lumberyard-dev/Atom/guthadam/ATOM-4849
ATOM-4849 Update default lighting preset values
2021-04-30 16:04:21 -05:00
dmcdiar 95e9fe4e11 Fixed AR issue 2021-04-30 13:18:00 -07:00
dmcdiar 0e8e33dedf Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-04-30 00:36:13 -07:00
mnaumov 88e654cd17 Merge main 2021-04-29 22:12:13 -07:00
mnaumov 3ae4bb22df Adding tone mapping option to Material Editor 2021-04-29 16:51:32 -07:00
Ken Pruiksma 07780e137b Merge pull request #440 from aws-lumberyard-dev/pruiksma/ATOM-15427
Cherry pick [ATOM-15427] from 1.0 to main.
2021-04-29 18:44:31 -05:00
moudgils 4fd9ad5341 Merge pull request #414 from aws-lumberyard-dev/Atom/moudgils/DisableMetalShaders
Disable metal shaders that dont cross compile correctly
2021-04-29 16:37:07 -07:00
pruiksma 109605a733 Cherry pick 06044522763512b78ae504f658a3e7cb5f99996c from 1.0 to main.
[ATOM-15427] Fixing crash in DirectionalLightFeatureProcessor caused by incorrect use of a container.
2021-04-29 16:44:24 -05:00
dmcdiar ef79dfb359 Added scale handling to the ReflectionProbe 2021-04-29 13:10:07 -07:00
hershey5045 a746223c65 Change AtomSampleViewer screenshots to use png (#336)
Add functionality to capture png screenshots.
2021-04-29 12:01:32 -07:00
dmcdiar f65ef56654 Added maybe_unsed to result codes that are only used in Asserts. 2021-04-29 01:02:47 -07:00
moudgils 389846c45c Disable metal shaders that dont cross compile correctly 2021-04-28 21:24:10 -07:00
guthadam 6821ce41e5 ATOM-4849 Update default lighting preset values
This is an effort to produce a decent looking lighting preset and shadow with the default settings

https://jira.agscollab.com/browse/ATOM-4849
2021-04-28 21:33:34 -05:00
Peng 7c42ff959e Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-28 11:50:51 -07:00
kberg-amzn 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-27 18:59:41 -07:00
karlberg 16c31cde3e Fix issue found in PR 2021-04-27 13:53:18 -07:00
karlberg 901428668c Merging latest origin 2021-04-27 13:03:31 -07:00
karlberg 8cb1edb7d7 Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics 2021-04-27 11:37:56 -07:00
Peng 76423a1cc8 Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-27 09:15:33 -07:00
dmcdiar 73f3ec66b5 Set non-uniform scale in SetMesh. 2021-04-27 02:05:06 -07:00
Peng a8a60eeea7 ATOM-14947
-Fix vulkan graphics pipeline creation failure having depth clamp off with devices not supporting depth clip.
-Added reason for the mobile version of screen space reflection
2021-04-26 18:12:50 -07:00
Peng 41a2be2a71 Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-26 09:22:49 -07:00
antonmic ddd26c3321 addressed review feedback and resolved issues from merge with main 2021-04-25 23:22:02 -07:00
antonmic fb369541cb Changing specularF0 variables back to specularF0Factor 2021-04-24 11:27:13 -07:00
antonmic 7ed49cb20b Merging main 2021-04-24 11:14:49 -07:00
Peng 058bd9330b Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-23 14:51:10 -07:00
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
Aaron Ruiz Mora 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
mrieggeramzn 0629e20b35 Merge pull request #269 from aws-lumberyard-dev/Atom/mriegger/LCR
Removing unneeded function
2021-04-23 11:05:03 -07: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
dmcdiar 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
mriegger 577e16b423 Remove unused function 2021-04-22 17:31:48 -07: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
Peng 47ed211bf6 [ATOM][RHI][Vulkan][Android]
-Add different pass for screen space blur for mobile.
-Add macro for constant buffer limits for android vulkan.

JIRA: https://jira.agscollab.com/browse/ATOM-14947 https://jira.agscollab.com/browse/ATOM-14949
2021-04-21 13:33:29 -07:00
mriegger 07c0f05abb Fix for directional light not having shadows in editor 2021-04-21 11:54:37 -07:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
dmcdiar e908e19246 Fixed MeshFeatureProcessor meterial forward pass IBL check. 2021-04-21 03:04:42 -07:00
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 2021-04-21 10:56:36 +01:00
Chris Santora c4771997a2 Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040 2021-04-21 01:13:09 -07:00
Chris Santora 8fe1505d1d Fixed up issues with my prior occlusion changes, after merging latest main, got everything working again.
ATOM-14040 Add Support for Cavity Maps
2021-04-21 00:32:41 -07:00
dmcdiar 52e6a146eb Minor changes to comment. 2021-04-21 00:29:32 -07:00
dmcdiar a7b3372c15 Merge branch 'main' into Atom/dmcdiar/ATOM-14951 2021-04-20 22:38:13 -07:00