Commit Graph

908 Commits

Author SHA1 Message Date
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
amzn-sean 84de2d2e12 Fixed failing periodic physics tests (#1429) 2021-06-18 15:38:49 +01:00
amzn-sean b17c5ca3e6 adding physics tick time to post simulate event (#1401) 2021-06-18 14:09:34 +01:00
Tom Hulton-Harrop 108b6f8e0c Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 2021-06-18 12:44:34 +01:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
2021-06-18 11:45:48 +01:00
John e4d4f8555b Merge branch 'development' into TIF/Runtime 2021-06-18 10:15:04 +01:00
Hasareej 75e640b908 Hasareej lyn 4389 fix cluster overlap with ImGui (#1329)
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
2021-06-18 09:50:02 +01:00
Chris Burel 6d0ef1cf57 Avoid reading from a destroyed variable (#1347)
This code iterates over the items in a vector, and if one case is met,
it mutates that same vector. This invalidates the object, as the place
where that object used to be has been moved.
2021-06-17 17:54:10 -07:00
Mike Balfour f6fc425a1a Prefab support for dynamic vegetation (#1374)
* First version of prefab support for dynamic vegetation

* Addressed PR feedback
- Made MockSpawnableEntitiesInterface a proper GMock in AzFramework
- Added Get/SetSpawnableAssetId
- Added lots of comments to better explain things that were asked about in the PR

* Exposed AzFrameworkTestShared on all platforms, not just host platforms
2021-06-17 16:24:33 -05:00
Esteban Papp 98767862af LYN-4071 Mac compile times are excessive 2021-06-17 13:41:36 -07:00
lumberyard-employee-dm 7dabe8b6e9 Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
2021-06-17 13:58:20 -05:00
Gene Walters 4be9ce56c4 Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
Tom Hulton-Harrop 8ffd16b0be Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362)
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
2021-06-17 18:31:56 +01:00
AMZN-koppersr 6b08ab6e03 Merge branch 'stabilization/2106' into JsonSerialization/ArrayDefaultsFix 2021-06-17 09:32:43 -07:00
Gene Walters eadbb17034 Cherry picking fff7cc0e10. Redcoding parts of old Networking that used Bullet external physics code 2021-06-17 09:04:22 -07:00
amzn-sean 9f62d631fb Physics joints updated to the new API (#1361)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-06-17 15:52:27 +01:00
John 22093f46fc Merge branch 'development' into TIF/Runtime 2021-06-17 11:34:31 +01:00
John Jones-Steele 127ad7f833 Merge branch 'development' into LYN-4195 2021-06-17 09:20:22 +01:00
AMZN-koppersr 1b1a5a28f4 Using zero-initializer for defaults in the Json Serializer instead of explicit values 2021-06-16 17:26:14 -07:00
AMZN-koppersr c482c17c9e Fixed an issue with the new Json Serializer Conformity tests and Atom's materials 2021-06-16 17:14:44 -07:00
AMZN-koppersr ddc60041d3 Addressing PR feedback 2021-06-16 16:40:46 -07:00
AMZN-koppersr c360e29fbf Fixed compile errors from Clang. 2021-06-16 13:57:17 -07:00
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 2021-06-16 17:23:18 +01:00
IgnacioMartinezGarrido d86e8b63c1 Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB
LYN-1767 : Asset Browser Search View
2021-06-16 17:05:40 +01:00
Olex Lozitskiy fff7cc0e10 Merge pull request #1344 from aws-lumberyard-dev/Network/olexl/redcode_bullet_code_use
[sig/network] Redcoding parts of old Networking that used Bullet external physics code
2021-06-16 09:55:06 -04:00
Tom Hulton-Harrop d9b1ccd323 Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
2021-06-16 12:58:01 +01:00
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 2021-06-16 12:30:10 +01:00
John Jones-Steele 0983d1ba45 Changes made to address comments. 2021-06-16 11:22:59 +01:00
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
srikappa-amzn 604dca1c3e Merge pull request #1349 from aws-lumberyard-dev/BenchMarksReset
Change create-spawnable benchmarks to not destroy created spawnables immediately
2021-06-15 16:18:02 -07:00
AMZN-koppersr 98ff91d854 Removed unused test structure. 2021-06-15 16:12:36 -07:00
AMZN-koppersr 8af45d28be Additional unit tests for the Json Serialization
To cover the recent changes to the return code from containers and the initialization fixes additional unit tests were added. Almost all new tests are part of the conformity test suite so that they test any custom json serializers outside of AzCore that might need to be updated due to the fixes.
2021-06-15 14:14:31 -07:00
AMZN-koppersr 780dd0df9f Container fixes for the Json Serialization
These changes fix the following:
- Containers treat new values as new objects and make sure they're initialized.
- Fixed sized containers behave slightly different and will initialize all values when a new fixed sized container is created.
- Loading any values to a container will now return PartialDefaults instead of defaults used as adding any value to a container no longer makes the container a default as the default is always an empty container.
- The previous doesn't apply to fixed sized containers as those containers are always considered to have the exact number of values they can hold.
2021-06-15 14:14:27 -07:00
AMZN-koppersr f00fa26e12 Separated initializing new and all objects in the Json Serialization
Introduced OperationFlags::InitializeNewInstance to the Json Serialization which allows custom json serializers to indicate that they need to set defaults only to new instances. Objects created to fill in a pointer are considered new objects and serializer can use the new ContinuationFlags::LoadAsNewInstance to also inform that the load is happening on a new object. Serializer that use the InitializeNewInstance flag know that a new object is begin initialized if they're called with an explicit default object.
2021-06-15 14:14:24 -07:00
AMZN-koppersr fcd989c295 Removed unit tests from bool, int and double Json Serialization
A future commit will include a generic test conformity test suite to replace these.
2021-06-15 14:14:20 -07:00
AMZN-koppersr 08abc497f3 Fixed initialization of math types for Json Serialization
Several math types in AzCore deliberately don't initialize through a constructor. This set of changes make sure that they still get properly initialized in the Json Serialization instead having random values.
2021-06-15 14:14:16 -07:00
AMZN-koppersr bc5fc9a191 Added missing reflection to NameJsonSerializerTests 2021-06-15 14:14:12 -07:00
AMZN-koppersr 716e99a8a7 Reverted string change because it cause incorrect string sizes. 2021-06-15 14:14:08 -07:00
AMZN-koppersr a98355e000 Fix PODs not initializing in Json Serialization
When pointers are used new instances are created for pod types, which will have random values at that point. The Json Serialization did not set a value for these if they were explicitly set to defaults. This change adds initialization for explicit defaults in the bool, integer and double serializer plus unit tests to verify.
2021-06-15 14:14:04 -07:00
AMZN-koppersr 6f50207b06 Updated the unit tests for the Json Serialization array fix 2021-06-15 14:14:00 -07:00
Yuriy Toporovskyy 3c46a72672 Bug fix: handle the case where a container has only default elements 2021-06-15 14:13:56 -07:00
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 2021-06-15 14:12:08 -07:00
AMZN-Olex 04f045bfd2 Recoding parts of old Networking that used Bullet external physics code 2021-06-15 15:58:16 -04:00
chcurran 9f7f6e84a4 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-15 12:10:10 -07:00
Mike Balfour ab3aa904f0 Fixed misc slice conversion bugs
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash.  Now that case is detected and the slice isn't reconverted.

* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
srikappa-amzn 9f9c01e781 Used reserve instead of resize 2021-06-15 11:10:45 -07:00
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 2021-06-15 11:07:43 -07:00
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 2021-06-15 10:59:36 -07:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00