Commit Graph

1054 Commits

Author SHA1 Message Date
Chris Santora 6cd86619ff Merge pull request #860 from aws-lumberyard-dev/Atom/santorac/MaterialInspectorCrash-ATOM-15597
ATOM-15597 Accessing Material Instance Panel Crashes Editor

There were two issues fixed here. First, I broke the material inspector with my changes at 53188a1 which added support for hiding entire property groups. I'm not sure how this happened because I definitely tested the MaterialComponent's material inspector. Perhaps there was a bad merge or something otherwise got clobbered after testing and before committing. Anyway, this issue was I accidentally delete the code that prepared the list of material properties for functor processing.

The second issue was the MaterialFunctor class needs to return null when metadata can't be found; it was proceeding to dereference an end iterator.

Testing:
Successfully opened the material inspector through the MaterialComponent. Was able to change property flags in the inspector and see other properties change visibility as expected.
2021-05-21 08:17:31 -07:00
greerdv 1a4bdcf651 Merge pull request #855 from aws-lumberyard-dev/non-uniform-scale-blast
remove vector scale from Blast in preparation for its removal from Transform
2021-05-21 12:07:55 +01:00
Chris Santora bffc72794b ATOM-15597 Accessing Material Instance Panel Crashes Editor
There were two issues fixed here. First, I broke the material inspector with my changes at 53188a12da which added support for hiding entire property groups. I'm not sure how this happened because I definitely tested the MaterialComponent's material inspector. Perhaps there was a bad merge or something otherwise got clobbered after testing and before committing. Anyway, this issue was I accidentally delete the code that prepared the list of material properties for functor processing.

The second issue was the MaterialFunctor class needs to return null when metadata can't be found; it was proceeding to dereference an end iterator.

Testing:
Successfully opened the material inspector through the MaterialComponent. Was able to change property flags in the inspector and see other properties change visibility as expected.
2021-05-20 22:24:19 -07:00
kberg-amzn c05c100a72 Merge pull request #834 from aws-lumberyard-dev/MultiplayerComponents
Finishing off rewind and backward reconciliation support as well as a bunch of bug fixes and API cleanup.
2021-05-20 18:48:40 -07:00
nvsickle e19f1c0147 Ensure AtomFont loads with the Editor
-Use PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE which will correctly be set to GEM_MODULE to get loaded at runtime with non-monolithic builds instead of PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE
-Removed the unneeded entries from AutomatedTesting's runtime config now that this is fixed (AtomBridge will bring it in again)
2021-05-20 17:09:05 -07:00
karlberg 3dd40171cd Merging latest origin 2021-05-20 17:08:18 -07:00
AMZN-puvvadar fd3927651b Merge pull request #840 from aws-lumberyard-dev/mpgem_scripting_rpc
Add events for MP Gem RPCs plus BC reflection so ScriptCanvas can respond to them
2021-05-20 15:58:29 -07:00
Gene Walters a86f61e360 Merge pull request #810 from aws-lumberyard-dev/SPEC6477_NetworkContextScriptCanvas
Reflect functionality to scripting to determine the current network context for an entity/component
2021-05-20 15:12:42 -07:00
Vincent Liu 34be1caa99 [HOTFIX] Fix broken nightly build because of invalid module name (#851) 2021-05-20 14:53:26 -07:00
greerdv 726597ad34 Merge branch 'main' into non-uniform-scale-blast 2021-05-20 22:05:22 +01:00
greerdv 87b1a19df4 remove vector scale from Blast in preparation for removal from Transform 2021-05-20 22:04:37 +01:00
Gene Walters d656afa1c3 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas 2021-05-20 14:03:39 -07:00
moudgils 8e24408959 Merge pull request #819 from aws-lumberyard-dev/DxcExperiment
Update Dxc to the latest + all the fixes related to it
2021-05-20 14:02:33 -07:00
michabr 542256478d Merge pull request #848 from aws-lumberyard-dev/michabr/lyshine_texatlas
Bring back texture atlas builder files
2021-05-20 13:06:10 -07:00
SergeyAMZN eb3f623bf5 Merge pull request #845 from aws-lumberyard-dev/MultiplayerPipeline
Added support for nested prefabs in multiplayer pipeline
2021-05-20 20:29:42 +01:00
Nicholas Van Sickle c1819b6486 Merge pull request #839 from aws-lumberyard-dev/nvsickle/BootstrapFixes
Fix dummy rendering pipeline being created for the Editor
2021-05-20 12:10:22 -07:00
Chris Santora 6deae83906 Merge pull request #736 from aws-lumberyard-dev/Atom/santorac/NewLayeringWorkflow
Updated StandardMultilayerPBR To Use New Layering Model

ATOM-15518 "Change Multilayer PBR To Use Lerp Base Blending"
ATOM-14688 "Disable Individual Layers"
ATOM-14793 "Fix Inconsistent Casing For LuaMaterialFunctorRuntimeContext"
ATOM-4120 "Stabilize Standard PBR Regarding Subsurface and Translucency" (partial)

Changed to lerp-based blending, with an implicit base layer.
Refactored the shader code to collate all the code for each layer into a couple structs and utility functions. This makes the code easier to maintain, and in particular will make it easy for me to add Enable flags for the layers in a subsequent commit.
Added support for disabling individual layers, so you can easily make a 2-layer material instead of a 3-layer material.
Added support to the material system and MaterialEditor for hiding entire property groups. This is used to hide the disabled layers.
Added and updated test data to reflect the new blend model.
Removed subsurface scattering and translucency from StandardMultilayerPBR.
Note to reviewers: There are a lot of changes here, but they are broken down into separate commits. I recommend going through each commit individually rather than doing one comprehensive review.

ASV changes are here: aws-lumberyard/o3de-atom-sampleviewer#55
2021-05-20 12:06:11 -07:00
moudgils 5a149a4594 Merge branch 'main' into DxcExperiment 2021-05-20 11:56:35 -07:00
pereslav cb87b7cd1f Moved early return case in prefab processing 2021-05-20 19:43:33 +01:00
puvvadar d26d24d9bd Remove test RTTIs 2021-05-20 11:38:06 -07:00
AMZN-stankowi c47c45724a LYN-3772 : For non-PBR materials, apply the diffuse color to the base color field on the Atom material, so a color value set in the DCC tool still comes through. (#733) 2021-05-20 11:28:34 -07:00
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-20 11:07:45 -07:00
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 2021-05-20 10:46:48 -07:00
abrmich e975a622b0 Move TextureAtlas builder files to the gem 2021-05-20 10:15:38 -07:00
abrmich 451b850f27 Bring back AtlasBuilder files that were removed with the ImageProcessing gem 2021-05-20 10:15:26 -07:00
michabr 69fed39982 Merge pull request #766 from aws-lumberyard-dev/michabr/lyshine_atom
Add image builder processing bus
2021-05-20 10:02:44 -07:00
amzn-hdoke 525840fb2a Adding password 1 factor sign in (#830)
AWS automation test
2021-05-20 09:29:44 -07:00
Chris Santora 8799d1ab54 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-20 09:07:08 -07:00
pereslav 43d98ac989 Fixed comment 2021-05-20 16:56:54 +01:00
amzn-mike 798d96f1a2 Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter
[LYN-3689] AssImp: Data driven supported filetypes
2021-05-20 10:36:29 -05:00
pereslav 22e893ccbe Added support for nested prefabs in multiplayer pipeline 2021-05-20 16:32:41 +01:00
amzn-sean 0b4b0698c7 disable physics tick time warning in debug builds and make it less spammy (#827) 2021-05-20 15:39:39 +01:00
galibzon 256df54575 [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System (#749)
* [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System.

Added ShaderAssetBuilder2 & ShaderVariantAssetBuilder2.

Added ShaderAsset2, ShaderVariantAsset2.

Eventually they will be the only builders. AzslBuilder &
SrgLayoutBuilder will be removed.
ShaderResourceGroupAsset will be removed. ShaderAssetBuilder &
ShaderVariantAssetBuilder will be replaced.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-20 04:53:16 -05:00
Gene Walters 8d349c3383 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas 2021-05-19 21:09:43 -07:00
abrmich 19aa0bdd75 Merge branch 'main' into michabr/lyshine_atom 2021-05-19 20:49:32 -07:00
puvvadar 2452149e7d Add RPC Events plus reflection plus fix Ctrl+G retry 2021-05-19 19:34:48 -07:00
moudgils 94a8c8258b Bumped shader builders 2021-05-19 19:22:35 -07:00
nvsickle 1654553e9c Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-19 19:12:07 -07:00
nvsickle 8d4fb4d67d Fix dummy rendering pipeline being created for the Editor
-This ensures OnBootstrapSceneReady still fires even if the bootstrap system component doesn't create a default scene
-This also disables default scene creation for non-game projects by default to ease tools development

Tested with the Editor, AtomSampleViewer, the Material Editor, and the AtomTest launcher
2021-05-19 19:11:23 -07:00
AMZN-mnaumov af22a0f44e Merge pull request #820 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15528
[ATOM-15528] Exposing existing ACES parameters in tone mapping component
2021-05-19 18:34:22 -07:00
Chris Santora bcf21e0930 Removed unused InitializeZero function from StandardSurface 2021-05-19 17:43:24 -07:00
Chris Santora f3099aa7d5 Merge remote-tracking branch 'origin/main' into Atom/santorac/NewLayeringWorkflow 2021-05-19 16:57:49 -07:00
moudgils e265990a0c Set DisableOptimizations to false. 2021-05-19 16:18:11 -07:00
mnaumov e510446185 PR feedback 2021-05-19 16:18:02 -07:00
mnaumov 19664dccd2 Merge main 2021-05-19 16:10:44 -07:00
Gene Walters f61b9c4081 Removing spaces in behavior context method names. While whitespace works in Lua and ScriptCanvas, the Scripting team wants to keep the script API and code API consistent (ie: no spaces) 2021-05-19 16:03:13 -07:00
Ken Pruiksma 7bdebfe17f [ATOM-15561] Adding AZ_Error for unhandled pass binding failure case. 2021-05-19 16:24:09 -05:00
karlberg 6a643392f0 Merging latest main 2021-05-19 13:37:45 -07:00
karlberg 487e989e68 Several updates to complete rewind support and remove unneeded functionality 2021-05-19 13:27:24 -07:00
mnaumov 58eea979cf AR build fix 2021-05-19 13:24:04 -07:00