Commit Graph

2153 Commits

Author SHA1 Message Date
Esteban Papp 6db7488939 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
2021-08-06 10:08:37 -07:00
Esteban Papp 03cf71b12d android fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-06 10:01:20 -07:00
Esteban Papp 8adf8fd7a1 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-06 10:00:58 -07:00
Esteban Papp ae9d15c977 Mac/iOS fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-06 09:59:35 -07:00
moraaar 9e0b8c564d Fixed AzToolsFramework tests (#2887)
* Fixed AzToolsFramework unit tests.

Signed-off-by: moraaar <moraaar@amazon.com>

* Include missing header.

Signed-off-by: moraaar <moraaar@amazon.com>

* Using util's class to generate temp directory, instead of qt.

Signed-off-by: moraaar <moraaar@amazon.com>

* Added empty line

Signed-off-by: moraaar <moraaar@amazon.com>

* Fixed warning in MessageTest fixture that CacheProjectRootFolder was not set

Signed-off-by: moraaar <moraaar@amazon.com>

* Additional checks in CreateDefaultEditorEntity helper function.

Signed-off-by: moraaar <moraaar@amazon.com>

* Updated the AzToolsFrameworkTest logic to set the project cache path

The Project Cache Path and Project Path is set through the CommandLine functionality of the ComponentApplication.
This allows those Project Cache Path and Project Path to be set within the Settings Registry during the ComponentApplication constructor

Removed the explicitly calls to delete the temporary directory and fixed the ScopedTemporaryDirectory class to recursively delete the temporary directory

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

* Setup correctly @assets@ alias for PlatformAddressedAssetCatalogManagerTest and AssetSeedManagerTest fixtures.

- These 2 test fixtures need to manually set the @asset@ alias to not include the platform at the end (which it does by default), because they are looping over platforms in their setup.
- Also initializing pointers to nullptr, so if setup fail in the future the teardown doesn't crash trying to delete garbage.

Signed-off-by: moraaar <moraaar@amazon.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-06 11:07:15 -05:00
Chris Galvan c2c59eae05 Merge pull request #2932 from aws-lumberyard-dev/cgalvan/FixAssetBrowserPathMenuOptions
Fixed Asset Browser path related context menu options.
2021-08-06 10:27:50 -05:00
AMZN-nggieber 2c7f6f9742 Adds Links to Gem Directory and Documentation for Gems (#2922)
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link

Signed-off-by: nggieber <nggieber@amazon.com>

* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable

Signed-off-by: nggieber <nggieber@amazon.com>

* Fixed a couple of the documentation links

Signed-off-by: nggieber <nggieber@amazon.com>

* Added documentation url to edit gem properties script and updated unit tests

Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-06 10:19:35 -05:00
Jeremy Ong 5a05fe93d4 Merge pull request #2815 from aws-lumberyard-dev/AzCore/JobGraph
Add initial TaskGraph prototype
2021-08-06 08:54:31 -06:00
Chris Galvan eeb1b68a72 Updated string to string_view per PR feedback.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-06 09:23:33 -05:00
hultonha 1cb0860d4d Editor code: tidy up BOOLs,NULLs and overrides pt4.
Merge pull request #2875 from nemerle/tidy_up_editor_code_a_bit_split4
2021-08-06 12:57:15 +01:00
Chris Galvan 3986a11396 Fixed Asset Browser path related context menu options.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-06 06:52:11 -05:00
hultonha ff8c4dce00 Ensure we disconnect from EditorInteractionSystemViewportSelectionRequestBus while recreating m_interactionRequests (#2884)
Fixes a crash while selecting an entity in the viewport while in 'pick' mode.
2021-08-06 12:50:31 +01:00
hultonha 9a711cbb8c Editor code: tidy up BOOLs,NULLs and overrides pt6.
Merge pull request #2877 from nemerle/tidy_up_editor_code_a_bit_split6
2021-08-06 12:49:05 +01:00
hultonha 9612fe3def Editor code: tidy up BOOLs,NULLs and overrides pt3.
Merge pull request #2874 from nemerle/tidy_up_editor_code_a_bit_split3
2021-08-06 10:28:51 +01:00
Jeremy Ong 4f9c2cf693 Remove TaskGraph::Drain which was only added initially for testing
The drain function was used only before the API gained the ability to
wait on the completion of a graph. This is the correct way to "drain"
the task executor of work.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-06 03:03:04 -06:00
hultonha 70ae5c2d40 Editor code: tidy up BOOLs,NULLs and overrides pt1.
Merge pull request #2872 from nemerle/tidy_up_editor_code_a_bit_split1
2021-08-06 09:44:14 +01:00
Esteban Papp c85e5a6886 Some more build fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 21:49:00 -07:00
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-05 20:05:25 -07:00
Esteban Papp 4358b6eb27 runtime fixes (Editor running)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:31:12 -07:00
Esteban Papp 6d79f1beee more replacements of A functions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:30:52 -07:00
Esteban Papp 895dc09176 addressing PR comments/suggestions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:30:09 -07:00
Esteban Papp 84623dfb66 FixedMaxPathString replacement
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 19:25:26 -07:00
Artur K e193e5b353 EnvironmentVariableHolder: reduce the size of template instantiation. (#2857)
* EnvironmentVariableHolder: reduce the size of template instantiation.

Move almost all destruction logic to EnvironmentVariableHolderBase::UnregisterAndDestroy.
Specialized templates have DestructDispatchNoLock instead that can either destroy the held value,
or the holder itself.

UnregisterAndDestroy has been moved to the cpp file.

All of these changes reduce the profile build time and size on linux
Here, the size of bin/profile goes down by ~200MB.

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

* Requested changes/fixups.

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

* Use scoped_lock to simplify mutex management.

Updated comments.

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

* Hopefully a fix for env variables released at a wrong time

Conditional was using incorrect variable

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

* Comment fixup

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

* Missing negation in conditional

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

* Cleanup the internal logic in UnregisterAndDestroy

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 20:15:37 -05:00
Artur K 6c22e92db6 Use lambda instead of AZStd::bind (#2658)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 20:10:26 -05:00
Jeremy Ong 4743ca8bc1 Fix segfault when checking detached graph completion status
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 17:32:57 -06:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00
Esteban Papp 0dc829891a fixing build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 14:30:04 -07:00
Artur K 7448bccea3 Bunch of small bug fixes (#2813)
* fix an error with addr_impl_ref assignment operator

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

* chrono duration unary '+' was missing a return

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

* HierarchyMenu constructor logic fix

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

* at least assert in case of invalid arguments to ring_buffer::insert

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

* EditorSettings using incorrect string_view::find result comparison

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 14:10:08 -07:00
Artur K 4d82d9625c Fix memory leak in ProcessLauncher::LaunchProcess (#2823)
Inner scope numEnvironmentVars was shadowing the outer scope, and prevented env variable memory from being freed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 14:04:19 -07:00
Artur K 08c85a40bc Fix logic in ReadConnectionSettingsFromSettingsRegistry (#2825)
In case an asset platform setting is missing it was supposed to be set to a 'pc' value.
Instead it was set to an empty string.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-05 14:01:45 -07:00
Jeremy Ong eaa6e087cf JobGraph -> TaskGraph (and associated classes/files)
This commit also addresses all PR feedback

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:39:06 -06:00
Jeremy Ong d2f2a186cb Add forward declaration needed on clang
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:39:04 -06:00
Jeremy Ong 4d058f329b Use exponential backoff during job submission when ring buffers are full
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:39:02 -06:00
Jeremy Ong 6ac74ad41e Resolve clang compiler error
"If constexpr" branches are evaluated at template instantiation time,
but static assertions receiving false are triggered even earlier.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:39:01 -06:00
Jeremy Ong d1c06e9c80 Add JobGraph::Reset, streamline execution, address feedback
Also, came up with more useful benchmarks that actually measure the
enqueue/dequeue operations for various simple workflows. For retained
graphs, time-of-flight from submission to execution is ~1us per job,
indicating job granularity should be >20us for retained jobs. For
dynamic jobs, where we need to pay the cost of allocation, a granularity
of ~100+ us may be advised.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:38:59 -06:00
Jeremy Ong 2f57d72561 Add initial JobGraph prototype
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-05 14:38:58 -06:00
Esteban Papp aa12434728 removing some dead code, commented code referring old types, static AZStd::strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 12:47:36 -07:00
Esteban Papp 0545ce4f59 More PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 12:46:50 -07:00
Esteban Papp d955189a31 Removal of unused files from Code/Editor
XmlHistoryManager.cpp was being compiled but unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 12:43:46 -07:00
Esteban Papp 9a82005cb8 PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-05 12:42:33 -07:00
Nemerle 769fd78189 Editor code: tidy up BOOLs,NULLs and overrides pt6.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 6 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:52:43 +02:00
Nemerle 1a80d313e5 Editor code: tidy up BOOLs,NULLs and overrides pt4.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 4 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:49:02 +02:00
Nemerle c6760d8935 Editor code: tidy up BOOLs,NULLs and overrides pt3.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 3 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:48:00 +02:00
Nemerle b8bed115f0 Editor code: tidy up BOOLs,NULLs and overrides pt1.
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 1 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
2021-08-05 16:37:43 +02:00
Terry Michaels 92a5fb6df2 Add a toggle to clear console every time ctrl+G is activated
LYN-3705 As a dev I want a toggle to clear console every time I hit ctrl+G
2021-08-05 08:11:31 -05:00
hultonha 6c7365918b Fix a few issues in CCryEditDoc
Merge pull request #2846 from nemerle/cryedit_fixups_try2
2021-08-05 10:36:08 +01:00
hultonha 5640880aea Changes to update where some viewport actions are called from (legacy removal)
Merge pull request #2828 from aws-lumberyard-dev/legacy_shortcut_update

This change removes code from CCryEditApp that no longer needs to be there
2021-08-05 09:56:56 +01:00
sphrose 126280bb93 Merge branch 'development' into LYN-3705-2 2021-08-05 09:51:31 +01:00
hultonha 1169c82b98 Make camera controller priority customizable (#2826)
* make 'should handle' logic customizable

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

* updates to get priority function

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

* minor comment tweak

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-05 09:45:03 +01:00
srikappa-amzn 7404622b48 Clear prefab templates on new level creations and loads (#2842)
* Clear prefab templates on new level creations and loads

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

* Fixed failing prefab unit tests after change to clear templates

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-08-04 16:54:40 -07:00