Commit Graph

68 Commits

Author SHA1 Message Date
Michael Riegger a2d2a37220 Better commenting and readability fixes 2021-05-04 10:38:21 -07:00
Michael Riegger cff730b4b8 Merge branch 'main' into Atom/mriegger/PLS 2021-04-30 11:46:08 -07:00
Michael Riegger 738883a9b0 Kens feedback 2021-04-30 11:43:32 -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
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
Michael Riegger 9dd3fe49df fixing spelling and increasing angle so that the borders are not visible at 256 res 2021-04-28 17:27:20 -07:00
Michael Riegger ce2af6be15 Tabs to spaces 2021-04-28 11:53:27 -07:00
Michael Riegger 37fd8d43ed Tabs to space and better naming and comments 2021-04-28 10:40:31 -07:00
Michael Riegger c729c72034 Switching to XYZ instead of ZYX 2021-04-28 09:35:56 -07:00
kberg-amzn 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-27 18:59:41 -07:00
Michael Riegger 2eed8684b5 Adding full shadowmap support 2021-04-27 14:08:54 -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
dmcdiar 73f3ec66b5 Set non-uniform scale in SetMesh. 2021-04-27 02:05:06 -07:00
Michael Riegger bbae3b6d48 Slight improvements 2021-04-26 16:16:05 -07:00
Michael Riegger 569c831532 Working PLS 2021-04-26 14:53:31 -07:00
Michael Riegger f508c4a4b5 Initial pointlight shadow work 2021-04-24 00:28:43 -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
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
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
mriegger 07c0f05abb Fix for directional light not having shadows in editor 2021-04-21 11:54:37 -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
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
dmcdiar a4acfc8261 Changed the clearcloat enable Lua functor to set the forwardPassIBL shader option.
Changed MeshFeatureProcessor to look for this shader option to determine if the material requires forward pass IBL specular.
2021-04-20 03:28:42 -07:00
dmcdiar f2a757f21e Merge branch 'main' into Atom/dmcdiar/ATOM-14951 2021-04-20 02:50:03 -07: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
dmcdiar 9cc0d3fa2d Minor cleanup 2021-04-20 01:01:27 -07:00
dmcdiar bfe36a388d Merge branch 'main' into Atom/dmcdiar/ATOM-14706 2021-04-19 20:27:28 -07:00
Guthrie Adams 3b4e424d38 Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 2021-04-19 11:05:10 +01:00
dmcdiar c367e51462 Added DiffuseProbeGridClassification pass. 2021-04-19 02:30:52 -07:00
dmcdiar 007589a98d Added DiffuseProbeGridClassification pass.
Updated RayTracing shaders to use the new light types.
2021-04-19 02:29:20 -07:00
dmcdiar 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
dmcdiar 456bcb3bf9 Updated the EnvironmentCubeMapPipeline to match recent changes to the MainPipeline.
Set the multisample state on the EnvironmentCubeMapPipeline render settings.
2021-04-18 14:57:52 -07: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
Vicky 9195abe5c6 Merge pull request #102 from aws-lumberyard-dev/Atom/qingtao/ATOM-15252
ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
2021-04-16 15:50:37 -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
hershey5045 8378f52ba6 Fix bug in ShaderVariantAssetBuilder. Add cvar in MeshDrawPacket class. (#61)
Fix bug in ShaderVariantAssetBuilder. Add a console variable to force root shader variant usage.
2021-04-16 12:06:05 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
qingtao 0aae99c491 Merge branch 'main' into Atom/qingtao/ATOM-15252 to first the blast test issue in AR. 2021-04-16 11:23:30 -07:00
qingtao 8e34d784e6 ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
The crash was because the "BlendColorGradingLutImageAttachmentId" attachment got imported to attachment database twice.
This fix avoids import this attachment twice. It also avoid crash but only report a warning if an imported attachment wasn't used in any scope.
Enable both RHI and RPI validation (no visiable performance impact observed.
2021-04-16 09:47:03 -07:00