Commit Graph

1955 Commits

Author SHA1 Message Date
daimini a4953a5204 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-18 15:04:34 -07:00
daimini bb458254a2 Polish pass - rename arguments to be more generic, add comments, restore patches to links during instantiation that were mistakenly removed in previous changes. 2021-05-18 14:52:30 -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
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
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
bosnichd 7a557c05ac Remove or update some remaining non-inclusive terms. (#793) 2021-05-18 11:43:57 -06:00
srikappa 1a1d608c7a Merge branch 'main' into Prefab/CreatePrefab 2021-05-18 10:22:33 -07:00
Steve Pham fed56805f5 Fix issue with layout tool and symlinks on Mac (#791)
* - Fix reversed symlink logic for Non-Windows file systems
- Add additional logic to clear existing symlink if it exists before re-applying

* Update to remove pre-existing reference regardless if its a symlink or not
2021-05-18 10:09:09 -07:00
Terry Michaels 7109cbbc98 Removed non-inclusive terms from comments (#803) 2021-05-18 11:43:55 -05:00
Terry Michaels f624fefeac Make AutomatedTest dependent on Qt5::Test for imports in tests that use it (#802) 2021-05-18 11:43:05 -05:00
Terry Michaels 8cfe16c06f Added null check for m_font (#801) 2021-05-18 11:42:31 -05:00
pereslav f721aa511f Fixed entity IDs of the original & networked spawnables 2021-05-18 17:15:24 +01:00
mrieggeramzn aab4b4a126 Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
Making shadow res of 1024 and bicubic pcf the default
2021-05-18 09:13:49 -07:00
Aaron Ruiz Mora dd398891c9 Improve iOS string handling in DynamicModuleHandle_iOS 2021-05-18 16:43:51 +01:00
Tom Hulton-Harrop 43258be51c Merge pull request #786 from aws-lumberyard-dev/hultonha_LYN-2215_camera-viewport-3
Add new orbit functionality for camera
2021-05-18 15:37:38 +01:00
Aaron Ruiz Mora 87ec96fbf4 Fix compilation errors in windows release 2021-05-18 15:26:45 +01:00
pereslav b821a3a12d Fixed build 2021-05-18 14:00:41 +01:00
pereslav 85374ea7fc Merged from main 2021-05-18 13:10:44 +01:00
amzn-sean 672dad7fea combined the 2 physics shape collider config pair types into 1(#778) 2021-05-18 12:39:07 +01:00
Tom Hulton-Harrop c4fa373e43 Temporarily ignore failing test to get main to go green (#795)
* keep test_CLITool_AssetBuilder_Works running but ignore failure for now
2021-05-18 11:07:44 +01:00
Benjamin Jillich 6d7c2f1a0c Reusable selection proxy model (#780) 2021-05-18 11:16:00 +02:00
srikappa 761a77a436 Avoid creating a new list for non-container top level entities 2021-05-17 18:51:23 -07:00
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 2021-05-17 17:13:02 -07:00
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 2021-05-17 17:10:50 -07:00
pereslav b758a1920f removed useless todo comment 2021-05-17 23:44:40 +01:00
daimini bcaf4209d5 Move some logic to a helper function. Revert order of link creation operations as they are not necessary to fix the bug, so it is preferred to leave them untouched. 2021-05-17 15:39:25 -07:00
pereslav 970c87b487 Refactored spawning network entities to use SpawnableEntityManager instead of duplicating the code in NetworkEntityManager 2021-05-17 23:34:58 +01:00
Alex Peterson 2d54275cc6 Initial project creation logic
* Add GetProjects, GetProjectTemplates, GetGems
* Redirect python output to AZ_TracePrintf
* Allow creating projects in empty folders
* Enable project creation
2021-05-17 15:07:20 -07:00
Steve Pham 8601ffa27b Set MCPP 3rd Party Package to new OS-specific packages including Linux
- Add MCPP 3PP definition for Linux
- Update mcpp 3PP definition from -multiplatform to -windows on windows
- Update mcpp 3PP definition from -multiplatform to -mac on mac
2021-05-17 14:17:42 -07:00
bosnichd e2f5677bbc Remove a number of unused CryCommon interfaces and docs related folders. (#788) 2021-05-17 14:32:44 -06:00
daimini d0b6ae47ed Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-17 13:26:04 -07:00
dmcdiarmid-ly 3143b41020 Merge pull request #757 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-13575
[ATOM-13575] Move the RHI::RayTracingShaderTable build into the RHI frame
2021-05-17 13:02:52 -07:00
Steve Pham c5e8a20462 Re-enable and fix failing AZ_NETWORKING_TESTS on Linux
- Enable the previously failing network unit tests for TcpTransportTests for Linux: TestSingleClient and TestMultipleClients
- Switch Linux to use SELECT implementation of the TCP Socket Manager instead of the EPOLL version (root cause of the failure)
2021-05-17 13:02:28 -07:00
Mike Balfour d084027b6e Bugfixes to enable slice-to-prefab conversion to run with less warnings/errors/crashes (#768)
While trying to process all slices and levels in Automated Testing, a few bugs came up that needed to be addressed:
- [LYN-3832] TransformComponent had a field removed without updating the version number and converter, which caused a lot of excessive warnings
- SliceComponent would crash in debug builds on instantiation failures due to a null dereference that was guarded against in most but not all places
- SliceConverter now detects when nested slices exist and gracefully warns about it.
- InstanceUpdateExecutor / TemplateInstanceMapper will now immediately remove instances that are unregistered, so that any in the queue don't get processed on a subsequent tick.  This was causing crashes when the instance was destroyed before the processing occurred.  It also has a side benefit of preventing the same instance from executing multiple times.
- Minor logic bugfix to the pack close warning, the boolean check was flipped.

Also added an early-out on SetTemplateId, since this was causing some unnecessary instance queue entries.
2021-05-17 14:58:18 -05:00
SJ bade3229be Fix iOS asset_profile nightly incremental build failure. 2021-05-17 12:54:34 -07:00
Sean Sweeney aa193d9943 Merge pull request #570 from aws-lumberyard-dev/smoke_migration_branch
smoke test cases migration
2021-05-17 12:52:47 -07:00
Jonny Galloway 8fae60056c Merge pull request #752 from aws-lumberyard-dev/cherry-pick_fix_ATOM14976_to_main
Cherry pick fix atom14976 to main
2021-05-17 14:15:06 -05:00
Aaron Ruiz Mora dd80668da0 Fix iOS and android compilation errors from nightly build 2021-05-17 19:41:32 +01:00
amzn-sj 118feaa961 Fix iOS asset_profile nightly incremental build failure. 2021-05-17 11:24:14 -07:00
hultonha bb05993355 add new orbit functionality for camrea 2021-05-17 18:25:13 +01:00
Tom Hulton-Harrop f4106fe73f Add 'Goto entity' support for the new Editor camera (#743)
* add find entity in viewport functionality to new camera

* fix AZ_CVAR usage

* updates following review feedback

- updated comment styles from /// to //!
- retrieve fov of camera (add test for fov access)

* update namespace naming, fix AZ_CVAR usage

* update missed namespace and use AZ::Transform::CreateLookAt

* add missing include

* move EditorViewportSettings to EditorLib

* update DLL import/export API and rename namespace usage
2021-05-17 18:21:38 +01:00
Gene Walters 1c1b34cf76 Merge pull request #775 from aws-lumberyard-dev/SPEC6779_VectorListNetworkProperties
Begin Cleaning Up Vector Network Properties

Work in progress: Cleaning up jinja fixed_vector method calls, still more work to do to replace NovaNet SerializableFixedSizeArray(Vector)DeltaStruct.
Updating AutoComponent BehaviorContext to properly Get/Set elements of vector/array network properties.
Commented out some vector/array jinja code in order to allow for compilation (see @todo)
2021-05-17 10:16:20 -07:00
Terry Michaels 514f4b9543 Removed unused files to reduce size (#779) 2021-05-17 11:36:59 -05:00
Jonny Galloway 275fbc714d Merge branch 'aws-lumberyard:main' into cherry-pick_fix_ATOM14976_to_main 2021-05-17 10:32:06 -05:00
rgba16f 749ffcfff2 Merge pull request #708 from aws-lumberyard-dev/Atom/breja/FixDefaultDebugDrawId
Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance
2021-05-17 10:26:40 -05:00