Commit Graph

5523 Commits

Author SHA1 Message Date
igarri 9d2b99b558 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
2021-08-06 10:18:26 +01: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
Tom "spot" Callaway 6b2452379f pull CryCommon/ISystem.h include out of _RELEASE conditional (#2633)
Signed-off-by: Tom spot Callaway <spotaws@amazon.com>
2021-08-05 20:18:31 -05: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
Esteban Papp 94a7bcc60e Merge pull request #1448 from aws-lumberyard-dev/cmake/SPEC-2513_w4267
SPEC-2513 Fixing w4267
2021-08-05 17:15:23 -07:00
Cynthia Lin 72cecfaaae performance metrics: Upload benchmark results to local index for locally-run builds. (#2816)
Signed-off-by: Cynthia Lin <cyntlin@amazon.com>
2021-08-05 14:59:09 -07:00
lumberyard-employee-dm a65b326558 Fixed the enable-gem command unit test (#2880)
* Fixed the enable-gem command unit test

The enable-gem unit test would fail if there wasn't an
o3de_manifest.json file in the users $HOME/.o3de directory

The change now is to patch the call to load the o3de manifest

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

* Adjustments to the enable-gem command unit test to pass on Linux

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-05 16:58:57 -05:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -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
Scott Romero 96740ba74d [development] installer work - added 'files in use' page and fixed toolset path propagation (#2855)
Enable files in use dialog in bootstrap installer to close running o3de tools during uninstall or repair
Fixed installer toolset path propagation after variable name change

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-08-05 13:41:30 -07: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
amzn-sean 34afed6792 fixed Ragdoll component can crash on deactivate (#2834)
fixes #2650
The root of the crash was connecting/disconnecting to the AZ::Event SceneSimulationStart when not on the main thread, as that is not thread safe.

The connection/disconnection was originally handled from Enable/EnableQueued and Disable/DisabledQueued which can be called from other threads within EmotionFX. I've moved the connection/disconnection to the Constructor / destructor, as the handler is responsible for executing the queued enable/disable actions and it makes sense to have that connection happen external to the Enable/disable path.

Signed-off-by: amzn-sean 75276488+amzn-sean@users.noreply.github.com
2021-08-05 14:27:31 +01: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
AMZN-AlexOteiza e55c31d959 Improve ui object tree to show the actual instance class (#2844)
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-08-05 12:03:02 +02: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
Royal OBrien fa3b309c67 Merge pull request #2836 from o3de/update-language
Update language
2021-08-04 16:36:54 -07:00
Chris Galvan 44593e5ea5 Merge pull request #2849 from aws-lumberyard-dev/cgalvan/FixDefaultGroundPlaneAssetName
Fixed asset name for default groundplane.
2021-08-04 17:48:50 -05:00
Chris Galvan 1e4c147e0b Fixed asset name for default groundplane.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-04 15:34:22 -05:00
jackalbe b7e69a1d1d turning off editor.blast.tests due to AR failures on suite shutdown (#2837)
removed unused code

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-08-04 14:11:10 -05:00
nemerle 627dcc49f1 GetActivePathName was using default - constructed enum DocumentEditingMode()
Also, SaveLevel was not using destName when constructing newFilePath

Other code changes:

* LogLoadTime is simplified by using QFile
* reduce nesting in DoSaveDocument by using early return.
* marked a few eligible methods as const
* Simplified OnEnvironmentPropertyChanged a bit

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-04 21:01:52 +02:00
lumberyard-employee-dm 21ca3a4aea The enable-gem command registers gem with project if not registered (#2817)
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json

Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.

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

* Adding quoting around the invocation of the OpenProjectManager command

The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-04 13:13:28 -05:00
Luis Sempé 52e9083b9d Merge pull request #2812 from aws-lumberyard-dev/scripting/vector_direction_nodes
Added Get Direction Vector node for Vector2,3 and 4
2021-08-04 10:49:05 -07:00
Chris Aniszczyk b3901b3251 fix space
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2021-08-04 12:27:19 -05:00
Jacob Hilliard 6d345512c1 Visualizer: switch to erase_if to improve performance (#2779)
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-04 10:26:06 -07:00
moraaar dbb6c1ae46 Fixed EntitySpawnTicket move constructor (#2832)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-08-04 17:57:48 +01:00
Chris Aniszczyk 26c6d41e63 Update language
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2021-08-04 11:14:25 -05:00
lsemp3d 2c96556576 Removed unnecessary argument in node generic macro
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:47:37 -07:00
lsemp3d 1f0fcf2aa2 Updates GetDirectionVector nodes to also return the distance between the points
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:42:26 -07:00
Guthrie Adams 531a801d91 Merge pull request #2810 from aws-lumberyard-dev/Atom/guthadam/fixing_material_editor_and_smc_startup_and_scripts
Fixing issues with shader management console startup
2021-08-04 10:38:17 -05:00
lsemp3d 760acdcdcc Updated DirectionTo tooltips in the translation file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:21:41 -07:00
lsemp3d 20515c46be Updated DirectionTo node's tooltips to match the translation file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-04 08:20:41 -07:00
aaguilea c9e16c1c42 Erased some legacy function that are no longer necessary
Signed-off-by: aaguilea <aaguilea@amazon.com>
2021-08-04 14:44:50 +01:00
amzn-sean 6d2765ef42 moved default location of surfacetypemateriallibrary.physmaterial (#2786)
from 'project root' to 'project root/Assets/Physics'

The functionality of creating / using the default physmaterial file has only change in related to the file location, other functionality is unchanged.

The following situations can occur:
    This will not affect have any project that uses a custom physmaterial file.
    This will not affect have any project that uses the default from the old location, as the configuration will still point there.
    New projects created will get the default physmaterial file at the new location.
    A Project that fails to load (or deletes) the selected physmaterial file, will get the default physmaterial file at the new location (this happens only on startup of the editor).

Issue: #2765

Signed-off-by: amzn-sean 75276488+amzn-sean@users.noreply.github.com
2021-08-04 13:10:17 +01:00
aaguilea d06ec45aaa changes to the move rotate and scale
Signed-off-by: aaguilea <aaguilea@amazon.com>
2021-08-04 13:05:00 +01:00
igarri 6fb250c66b Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
2021-08-04 09:52:42 +01:00
AMZN-AlexOteiza 45ebf57d3f Fixed bug in hash_table that made rehash() function run forever (#2745)
* Fixed bug in hash_table that made rehash() function to run infinitely on specific conditions when inserting an already existing element

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Replaced erasing to happen in the source list instead

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* minor comment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small commment improvement

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small comment fix

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Added assert and fixed code with incorrect hashing

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* .

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments, reverted to void* as it size_t hash is different

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Fixed build on linux

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed PR comments

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-08-03 20:38:18 -05:00
lsemp3d 6188df4b49 Added Get Direction Vector node for Vector2,3 and 4
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-03 15:36:56 -07:00
Guthrie Adams b594132a47 using command line parameter instead of member
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-03 17:19:30 -05:00
Guthrie Adams f269d222b7 Fixing issues with shader management console startup
Updating test scripts

Synchronizing SMC and ME application classes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-03 17:07:03 -05:00
Chris Burel 24740b3f86 Update the cloth rule to look for optimized meshes (#2737)
The cloth rule stores the name of a mesh node that is used to retrieve
cloth data from. However, at asset processing time, the model builder
switches things to look for the optimized version of a mesh. The cloth
rule was not doing this, so it would return the cloth data for the
unoptimized mesh. This resulted in the final mesh having some data from
the optimized mesh and cloth data from the non-optimized mesh.

This changes the cloth rule to use the optimized version of a mesh, if
it exists, and fall back to the unoptimized mesh when it does not exist.

This closes issue 2454.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-03 14:52:53 -07:00
jromnoa a0f3379999 Adds Light component tests (non-GPU portion) to AutomatedTesting from AtomTest (#2758)
* Fixed Vegetation Layer Spawner documentation link.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
Signed-off-by: jromnoa <jromnoa@amazon.com>

* add remaining non-GPU test portions for Light component test

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

* make non-GPU light component test more robust

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

* remove redundant logging, convert LIGHT_TYPES from list to dict, remove redundant f-string

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

Co-authored-by: Chris Galvan <chgalvan@amazon.com>
2021-08-03 14:08:59 -07:00
puvvadar 1e94bb8a76 Merge pull request #2754 from aws-lumberyard-dev/mp_connectionset_timeout
Add connection interface timeout config and remove Ctrl+G timer
2021-08-03 13:47:52 -07:00
sharmajs-amzn 69bde80de3 Nighly build test fixes (#2727)
Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
2021-08-03 11:15:23 -07:00