Commit Graph

7329 Commits

Author SHA1 Message Date
AMZN-Phil 64fa92c56d Constrain exceptions to the type we are handling.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-05 14:41:20 -07:00
AMZN-Phil 09342694c9 Fix issues with adding a repo and make each object type optional in repo.json
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-05 13:49:27 -07:00
Chris Galvan 8581b30260 Merge pull request #4274 from aws-lumberyard-dev/daimini/FocusMode/breadcrumbs
LYN-5303 | Focus Mode - Add breadcrumb of the prefab hierarchy path when entering into the prefab editing mode
2021-09-30 13:37:48 -05:00
Chris Burel aa8594b491 Add a unit test for XcbInputDeviceKeyboard (#4393)
* Use XcbUniquePtr to manage xcb resources

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add a unit test for XcbInputDeviceKeyboard

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-09-30 11:19:23 -07:00
santorac 328cde0516 Updated the naming convention for material property "names" vs "IDs".
Merge pull request #4207 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes

A "property name" is the name of the just the property without regard to the group that it's in. A "group name" is the name of the group. And a "property ID" is the full unique name of a property in the form "groupName.propertyName". This is important preparation for upcoming changes where property sets can contain other property sets, and property IDs can be arbitrarily long like "layer1.baseColor.factor" for example.

The naming changes include variables, some code comments, and the .materialtype file format. All material types have been updated to use "name" instead of "id". If any users have made custom material types, they will need to search and replace "id" with "name" (there probably aren't many of these in the wild, and fixing any that do exist will be a very simple change, not worth the cruft of keeping backward compatibility code around IMO).

Testing:
Opened up materials in the material editor.
Ran AtomSampleViewer in dx12 and vulkan with no new failures.
RPI unit tests.

Signed-off-by: santorac 55155825+santorac@users.noreply.github.com
2021-09-30 10:59:17 -07:00
Danilo Aimini 225d9d3b3c Fixes to unit tests after merge
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-30 10:33:32 -07:00
Danilo Aimini d3bc7d8f12 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
2021-09-30 10:32:03 -07:00
bosnichd 3635e5ed35 Put the ShaderMetrics.json in the @user@ folder, plus an unrelated #include path fix. (#4402)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-09-30 11:09:04 -06:00
Danilo Aimini 8d67f184c8 LYN-7008 | Focus Mode - Selection unit tests (#4357)
* Refactor existing tests and fixtures, split them up in more granular tests, and add more comments.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Refactor test fixture for FocusMode to make it more reusable

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fixture rename, draft of selection test

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Split SetFocus and ClearFocus tests for Editor Focus Mode

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move BoundsTestComponent to its own file so that it can be reused in Focus Mode Selection tests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Making progress on selection test. Test compiles now, but selection doesn't seem to be working.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removed commented out code from previous iteration.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Move BoundsTestComponent under the UnitTest namespace

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Viewport selection tests + minor fixes.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-30 18:05:50 +01:00
puvvadar bee4346df8 Merge pull request #4401 from aws-lumberyard-dev/mp_unit_test_pass1
Quick updates to AzNetworking unit tests
2021-09-30 09:54:24 -07:00
santorac c0d8020786 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 2021-09-30 09:30:17 -07:00
lumberyard-employee-dm b1c82fc045 Updated references to Engine.pak to be lowercase engine.pak (#4397)
* Updated references to Engine.pak to be lowercase engine.pak

This makes the engine.pak file consistent with naming scheme of other pak files such as assets.pak.

It will also help avoid issues with mounting the file on Linux.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Engine.pak now loads correctly in release builds. The check for the file existing was failing in release builds because it was only checking inside packs. OpenPack first checks if the file exists, anyways, so it was safe to remove.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-09-30 10:57:54 -05:00
srikappa-amzn ffbc3f1c80 Fix a bug in recursion of prefab links when checking for dirty prefabs (#4392)
* Fix a bug in recursion of prefab links when checking for dirty prefabs

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Added a missing EntityId header

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-30 10:26:11 -05:00
Danilo Aimini 4d368fe329 Fix to capitalization in include via the UI
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-30 08:18:12 -07:00
Danilo Aimini 7b1d98535d Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 2021-09-30 08:16:11 -07:00
jonawals fa47b35580 Call sites for activating/deactivating viewport editor modes. (#4265)
* Provisional impl and testing of central state tracker.

Signed-off-by: John <jonawals@amazon.com>

* Add missing namespace comment.

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModeState -> ViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModesTracker -> ViewportEditorModeTracker

Signed-off-by: John <jonawals@amazon.com>

* GetEditorModeState ->GetViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* GetNumTrackedViewports -> GetTrackedViewportCount

Signed-off-by: John <jonawals@amazon.com>

* IsViewportStateBeingTracked -> IsViewportModeTracked

Signed-off-by: John <jonawals@amazon.com>

* Fix API comments.

Signed-off-by: John <jonawals@amazon.com>

* Delete hangover file.

Signed-off-by: John <jonawals@amazon.com>

* Delete more hangover files.

Signed-off-by: John <jonawals@amazon.com>

* Minor member name refactor.

Signed-off-by: John <jonawals@amazon.com>

* Refactor nonclemanture.

Signed-off-by: John <jonawals@amazon.com>

* Rename Enter/ExitMode to Register/UnregisterMode.

Signed-off-by: John <jonawals@amazon.com>

* Error and warning msgs now return AZ::Outcomes.

Signed-off-by: John <jonawals@amazon.com>

* Change all nomenclature to Activate/Deactivate for consistency.

Signed-off-by: John <jonawals@amazon.com>

* Change tense of notification bus methods.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format (again).

Signed-off-by: John <jonawals@amazon.com>

* Fix Linux warning.

Signed-off-by: John <jonawals@amazon.com>

* Call sites for editor mode activate/deactivate.

Signed-off-by: John <jonawals@amazon.com>

* Move Component editor mode logic to ComponentModeCollection.

Signed-off-by: John <jonawals@amazon.com>

* Delete non-source data.

Signed-off-by: John <jonawals@amazon.com>

* Remove line breaks and forward declare class.

Signed-off-by: John <jonawals@amazon.com>

* Remove constructors without ViewportEditorModeTrackerInterface ptr.

Signed-off-by: John <jonawals@amazon.com>

* Add integration tests for viewport editor modes.

Signed-off-by: John <jonawals@amazon.com>

* Address PR comments.

Signed-off-by: John <jonawals@amazon.com>
2021-09-30 15:36:42 +01:00
SergeyAMZN 08e020f2b1 Merge pull request #4251 from aws-lumberyard-dev/nvsickle/RevertFrameTimer
Revert "Refresh rate driven rendering tick logic (#3375)"
2021-09-30 14:51:45 +01:00
Guthrie Adams 9f2530ec6f Merge pull request #4325 from aws-lumberyard-dev/Atom/guthadam/material_component_supports_property_overrides_without_material_overrides
Atom/guthadam/material component supports property overrides without material overrides
2021-09-30 08:11:11 -05:00
amzn-sean 43748c37fd update joints to use cluster viewport ui. (#4352)
also some joints Component mode cleanup.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-09-30 13:39:22 +01:00
AMZN-Igarri 9eb9a13d99 Flipped CVar to activate the AssetBrowser Search View (#4370)
Signed-off-by: igarri <igarri@amazon.com>
2021-09-30 09:38:45 +01:00
santorac 62e268bec7 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 2021-09-30 01:36:42 -07:00
hultonha ab0aa4973f Remove camera LookAtAfterInterpolation (#4391)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-30 08:43:48 +01:00
Benjamin Jillich acea5b7da8 Animation Editor: Creating Motion Sets does not increment them correctly (#4368)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-09-30 09:12:41 +02:00
Danilo Aimini 742a84f587 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 2021-09-29 22:02:05 -07:00
Steve Pham c00a2b5ef4 Merge pull request #4407 from aws-lumberyard-dev/FixNonUnityBuildError
Fix missing include for AZStd::unordered_set in AssetEditorBus.h
2021-09-29 20:04:53 -07:00
Danilo Aimini 27c7e2dcb0 Add correct include in FocusModeInterface to fix non-Unity builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-29 19:13:30 -07:00
Danilo Aimini ea3435a9bb Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 2021-09-29 19:03:57 -07:00
Steve Pham 19bd934a43 Fix missing include for AZStd::unordered_set in AssetEditorBus.h
Signed-off-by: Steve Pham <spham@amazon.com>
2021-09-29 17:56:06 -07:00
lumberyard-employee-dm 090aa8f053 Removed ununeeded includes from EBus EBus.h and Policies.h (#4256)
* Removed ununeeded includes from EBus EBus.h and Policies.h

Updated the locations which needed those includes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding missing include for <memory> to AWsClientAuthBus.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove the while true loop in the EBusQueuePolicy Execute() function

The while true loop in Execute was for allowing additional functions to be queued in the middle of execution of current list of functions.
That functionality was dangerous, because if a queued function added itself during execution unconditionally, then it would result in an infinite loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetManager::DispatchEvents function to pump the AssetBus event queue until empty

Queued Events on the AssetBus is able to queue additional events on that Bus during execution of those events.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AssetManager::DispatchEvents function to only execute the
AssetBus queued events once

Changed the AssetJobsFloodTest.AssetWithNoLoadReference_LoadDependencies_BehaviorObeyed test to dispatch events until the OnAssetContainerReady callback is signaled.

This happens after every asset load to make sure that the
expiring AssetContainer instances are removed from `AssetManager::m_ownedAssetContainer` container before retrying to load the same asset.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a MaxTimeoutSeconds constant for the maximum amount of the time to run a single DispatchEvents loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 18:13:37 -05:00
Guthrie Adams f34e94d2f1 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides 2021-09-29 18:00:58 -05:00
lumberyard-employee-dm 816a623c97 Added missing EntityId.h include to FocusModeInterface.h (#4396)
* Added missing EntityId.h include to FocusModeInterface.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Non-unity build fix

Adding missing BehaviorContext.h includes to Multiplayer Gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added missing BehaviorContext.h include to NetworkCharacterComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 17:49:02 -05:00
jiaweig 0f4a9d70b5 Fix 3p path setting to the upper level (#4399)
Signed-off-by: jiaweig <jiaweig@amazon.com>
2021-09-29 17:46:35 -05:00
puvvadar 325294aef8 Remove magic number in AZN unit
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-29 15:28:57 -07:00
puvvadar c9ea34d45f Quick updates to AzNetworking unit tests
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-09-29 14:58:22 -07:00
Danilo Aimini a7f6bfbb50 Fix tests to work with new interface APIs using EditorEntityContextId
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-29 14:21:19 -07:00
AMZN-Phil 103dc6cfcf Merge pull request #4351 from aws-lumberyard-dev/Prism/AddRepoDialog
Add Add Gem Repo Dialog
2021-09-29 12:47:38 -07:00
Guthrie Adams 4c9f456ea5 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
2021-09-29 13:31:23 -05:00
Tommy Walton b79c2f385d Adding a temporary Orphan function to the InstanceDatabase (#4297)
* Adding a temporary Orphan function to the InstanceDatabase, which will remove an instance from the database so it will not be found using Find or FindOrCreate. The instance will still persist until its use-count drops to 0, at which point it will be deleted. This is to enable the model asset to remove existing buffer/modellod/model instances and replace them with new instances that have the up to date data. Added unit tests for testing.

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Fix an incorrect ceil and update ParallelInstance test cases for readability

Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-09-29 11:08:05 -07:00
Danilo Aimini 94bd95cee3 Solve merge issue
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-29 09:58:04 -07:00
Danilo Aimini 3b9c3f832a Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ViewportTitleDlg.cpp
2021-09-29 09:56:45 -07:00
nggieber 02987d9010 Fixed another non-unity build error
Signed-off-by: nggieber <nggieber@amazon.com>
2021-09-29 09:34:21 -07:00
Sean Sweeney a8559c4000 Merge pull request #4374 from aws-lumberyard-dev/lytt_linux_tests
Lytt linux tests
2021-09-29 09:31:44 -07:00
Artur K f44169f7fa Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 11:31:01 -05:00
Artur K bdc5cb1fff Replace PROFILE define with AZ_PROFILE_BUILD
It now follows the schema defined by `AZ_DEBUG_BUILD` define instead.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-09-29 09:30:38 -07:00
nggieber 6b75c3b9d7 Fixed non-unity compile error
Signed-off-by: nggieber <nggieber@amazon.com>
2021-09-29 08:55:04 -07:00
hultonha c34b6ffe3b Overhaul of how camera orbit/pivot behavior works (#4345)
* overhaul to how camera orbit/pivot behavior works

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update naming from orbit to pivot

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix camera unit tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional tests for new camera pivot behavior

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix comment and add additional info for tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-29 10:11:49 +01:00
Danilo Aimini b28f871b20 Fix casing of BreadCrumbs include in PrefabViewportFocusPathHandler.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-28 23:32:15 -07:00
Danilo Aimini 49ec488f2b Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 2021-09-28 23:29:28 -07:00
santorac 3753ee6f1c Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes 2021-09-28 22:12:18 -07:00
santorac c8d2f74ca1 Added backward-compatible support for the old "id" key in material type files, which is being renamed to "name".
This required the use of custom serializers, because the JSON serialization system does not have any means of supporting field name aliases through SerializeContext.

Testing: RPI unit test pass and AtomSampleViewer material screenshot test script passes.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-09-28 22:05:26 -07:00