Commit Graph

2051 Commits

Author SHA1 Message Date
pruiksma 5802c4e1dc Merge branch 'main' into pruiksma/ATOM-15561 2021-05-19 14:26:30 -05:00
sconel 6a108c0515 Merge pull request #806 from aws-lumberyard-dev/Spawnable/Instantiation/EntityIdReferenceFix
Updating SpawnAllEntities to handle entity references during spawn
2021-05-19 11:26:10 -07:00
Tommy Walton ded39be57e Merging WrinkleMask support from 1.0 to main (#680)
Added a loop to the skin shader that will sample from wrinkle masks, multiply them by a weight, combine them, and use them instead of vertex colors for wrinkle map blending

Added an array of masks, an array of weights, and a wrinkle mask count to the DefaultObjectSrg. -Will create a follow up task to handle this a better way.

Removed motion vector (for now) from skin.materialtype since we're not using them, and removed depthtransparent since skin doesn't support transparency

Added an interface to the MeshFeatureProcessor to get the object srg

Wrapped srg->Compile in if(srg->IsQueuedForCompile()) to prevent compiling twice --This doesn't stop a race condition if both happen at the same time, but that is at least far less likely. It will need a better solution later.

Added a function to the MorphTargetExporter that will check to see if a texture that matches the blend shape name exists in a particular folder, and adds a reference to that image to the MorphTargetMetaAsset --Only supports .tif, and doesn't automatically re-process the .fbx if the folder is updated. These can be improved in later iterations

Added a null check in MaterialTypeSourceData.cpp to fix a crash I ran into

Added a for loop in two places to look for the first submesh that has a morph target, instead of just using the first to check if a lod has morph targets or not. --I have a better fix for this, but it involves more areas of the code, so I'm saving that for another change.

Modified AtomActorInstance to look for any morph targets that have a wrinkle mask reference

Then each frame, for any morph targets with non-zero weights that also have wrinkle masks, it updates the mask array, weights, and count on the object srg.
2021-05-19 11:21:44 -07:00
amzn-hdoke 659998cd26 AWSI Gems CDK Automation fixtures (#707)
* Adding AWS automation tests cdk and resource mapping fixtures

* Add aws_utils fixture

* Update assume role arn

* Get region and account id from aws_utils fixture

* Adding NodeJS and AWS CDK as install dependencies

* Fixing missing copyright headers

* Add missing copyright header

* Remove cdk and node install from build folder

* Remove unused script canvas file

* Uncomment code, remove unused script canvas

* Add region to aws_utils fixture

* Adding AWS gems to automated testing for all platforms

* Re-exporting ClientAuth level

* Add PythonTests/AWS CMakeLists.txt
2021-05-19 11:07:53 -07:00
Vincent Liu ad2d2381a4 [SPEC-6713] Add common session interfaces and notifications (#773) 2021-05-19 10:33:48 -07:00
ibtehajn 3c3f3fa91e Disable shallow checkout in initial setup step
Performing a shallow checkout breaks changelog computation, which is
required for accurate build failure notifications.
2021-05-19 17:35:18 +01:00
sconel 31e5a312b4 Updated loadAll check to set to false if previous entities already spawned on ticket 2021-05-19 08:58:12 -07:00
sconel 4769664e9e Updating the loadAll flag after a SpawnAllCommand 2021-05-19 08:50:14 -07:00
amzn-sean 8dbcd9f199 increase physics max frame time to 0.1 seconds (10fps) (#824) 2021-05-19 16:44:53 +01:00
sconel a4f673eb32 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-19 08:40:09 -07:00
sconel d8126d59c7 Moved to iterative clone instead of bulk, addressed PR feedback 2021-05-19 08:39:00 -07:00
sphrose 815e750439 Merge pull request #94 from aws-lumberyard-dev/LY-113714
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
2021-05-19 16:05:35 +01:00
Jonny Galloway 908f4ee9f6 Merge pull request #814 from aws-lumberyard-dev/cherrypick_ATOM14976_to_main
Broken material updates from Atom-14976 1.0 to main
2021-05-19 09:57:28 -05:00
balibhan 9cd3758ff2 Merge pull request #777 from aws-lumberyard-dev/sc_automation_balibhan
Pane properties test script
2021-05-19 20:16:56 +05:30
ibtehajn c49875fc37 Use author instead of committer in changelog computations
Any commits created through the GitHub UI (e.g. commits created by
merging PRs) usually assign GitHub itself as the ccommitter. This is
expected behaviour, as the commit is applied by GitHub itself. However,
for the purposes of changelog creation, showing the author (e.g. the
person who clicked the merge button on the PR) is more useful.
2021-05-19 15:15:27 +01:00
amzn-sean bf4b65afde Fix crash in character component when using prefabs (#798) 2021-05-19 14:18:54 +01:00
Mike Chang 85feef74dc Update Windows 2019 AMI v3 Label
* Added new Windows v3 build label

* New v3 AMI
2021-05-18 22:24:14 -07:00
balibhan b82fa2a7dc Merge branch 'main' into sc_automation_balibhan 2021-05-19 09:42:08 +05:30
Anton Michels 27d38a4880 Merge pull request #725 from aws-lumberyard-dev/Atom/antonmic/lowEnd
Implemented Atom Low End Render Pipeline
2021-05-18 18:47:42 -07:00
Steve Pham 8a07408a0c Fix for intermitten AzNetworkingTest on Linux AR runs 2021-05-18 18:39:42 -07:00
sconel 8733f0e492 Remove extra newline 2021-05-18 17:16:44 -07:00
sconel 66a7db44f7 Reduced scope of change to focus on SpawnAllEntities 2021-05-18 17:13:24 -07:00
sconel b2ab26b428 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 17:10:06 -07:00
bosnichd a2608e187b Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873) (#811)
Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873). This was recently removed as part of 96b85e6813920554f7dfdc7752c1dd4452919b92
2021-05-18 17:37:02 -06:00
AMZN-puvvadar 29b4ab6ff3 Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
2021-05-18 16:28:08 -07:00
sconel fb290a27af Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 16:24:23 -07:00
Scott Romero c275be092e [main] online installer support for windows
Merge pull request #804 from aws-lumberyard-dev/cpack_installer
2021-05-18 15:38:53 -07:00
gallowj b006eb57fe Updating a bunch of materials in TestData to correct changes to referenced texture paths 2021-05-18 17:36:21 -05:00
puvvadar 350e5a0cd2 Update to const auto& 2021-05-18 15:22:22 -07:00
puvvadar 55ecd8517d Add assert to new Asset constructor to declare intent and safeguard ID overwrite 2021-05-18 14:57:27 -07:00
scottr b3b54742f7 Merge branch 'main' into cpack_installer 2021-05-18 14:20:57 -07:00
antonmic 519525b28f fixing feature common asset cmake 2021-05-18 13:54:07 -07:00
puvvadar e2ade654fb Address misc feedback 2021-05-18 13:52:28 -07:00
Tommy Walton 3182dc37c3 Fix for ATOM-15488 : Rendering out an animation with shadows crashes the editor (#794)
Previously, the SkinnedMeshFeatureProcessor assumed there would only be one skinning pass. However, that's not always the case. When rendering with track view, the feature processor was getting a pass that only updated once every three frames, which could lead to a condition where a skinned mesh was released, but the pass never submitted and cleared the previously added dispatch items, and one or two frames later it would go to submit after the skinned mesh and all of its resources had already been released.

-Modified the skinning and morph target compute passes to pull dispatch items from the feature processor instead of the feature processor pushing them to the passes.
-If more than one skinning (or morph target) pass is active in the frame, whichever one is first will submit all the dispatch items, and clear the feature processor's dispatch items before the next one tries to submit anything
-Moved the logic for caching shader options from the SkinnedMeshComputePass to the SkinnedMeshFeatureProcessor, since there may be more than one pass but only one feature processor per scene
2021-05-18 13:52:01 -07:00
pruiksma ba478000ce Merge branch 'main' into pruiksma/ATOM-15561 2021-05-18 15:42:23 -05:00
srikappa-amzn 3c40aad148 Merge pull request #792 from aws-lumberyard-dev/Prefab/CreatePrefab
Bug fixes for creating prefabs with nested entities
2021-05-18 13:33:34 -07:00
SergeyAMZN 6626a7cf8e Merge pull request #682 from aws-lumberyard-dev/MultiplayerPipeline
Added support for parent-child networked entities
2021-05-18 21:23:32 +01:00
antonmic a4e1b40e88 Merge branch 'main' into Atom/antonmic/lowEnd 2021-05-18 13:04:25 -07:00
pruiksma dff3efbfca [ATOM-15561] Adding AZ_Error for unhandled pass binding failure case. 2021-05-18 14:01:18 -05:00
sconel 4dccfa0d74 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 11:54:29 -07:00
scottr b91fc8648d Merge branch 'main' into cpack_installer 2021-05-18 11:51:58 -07:00
scottr 54dc47eb91 [cpack_installer] fixed typo in help string 2021-05-18 11:50:01 -07:00
SSpalding 39de8631f2 Caught KeyError and changed to log message. (#782)
Fixed missing key breaking report combining.
2021-05-18 11:13:59 -07:00
AMZN-AlexOteiza 906780a01f Reorganized PythonTests CMakeLists (#716)
Reorganized Python Tests CMakeLists.txt

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-05-18 19:11:56 +01:00
Tommy Walton c10e37f2d6 Atom-15447 : Crash on null buffer with many morph targets
Fixed a crash by keeping a reference to the buffer instance after creating it and checking for null
2021-05-18 10:54:39 -07:00
Tommy Walton d0810892f1 ATOM-15358 : Culling concurrency checker fails in AtomSampleViewer (merge from 1.0->main)
Inserting, updating, and removing entries from a VisibilityScene was made thread safe in a previous change, and now both the MeshFeatureProcessor and DiffuseProbeGridFeatureProcessor update entries at the same time from multiple threads. This leads to an assert in the Culling concurrency_checker, even though this is now valid behavior.

However, we still don't want to be adding, removing, or updating cullables between BeginCulling and EndCulling, which could cause a mismatch between the result of OctreeScene::GetEntryCount and the actual number of cullables in the scene.

-Added soft_lock_shared/soft_unlock_shared to the concurrency checker to allow multiple threads to acquire a lock when that is the desired behavior, while still asserting that nothing tries to acquire a shared lock when the concurrency checker is already locked.
-Update Culling.cpp to use the new soft_lock_shared when adding, updating, or removing cullables
-Added unit tests for the concurrency_checker
-Updated ArrayView unit test to use AZ_TEST_START_TRACE_SUPPRESSION instead of manually checking the assertion count, so that test now passes in release builds which do not assert.
2021-05-18 10:53:41 -07:00
Tommy Walton 343fc1999f ATOM-15346 : Morph target buffer only found on first Atom mesh (merge from 1.0->main)
Instead of assuming the first submesh will always have a reference to the morph target buffer, search the submeshes to find the first one that does.
2021-05-18 10:52:41 -07:00
puvvadar e03645f816 Disable editorsv launch by default 2021-05-18 10:48:39 -07:00
puvvadar 19316e422b Check launch process exists before waiting for 15 seconds 2021-05-18 10:46:18 -07:00
bosnichd 7a557c05ac Remove or update some remaining non-inclusive terms. (#793) 2021-05-18 11:43:57 -06:00