Commit Graph

11063 Commits

Author SHA1 Message Date
Gene Walters 7b3631444d Merge pull request #7058 from aws-lumberyard-dev/editor_log_fix
Temporary fix for editor log stomping during python tests
2022-01-24 08:08:28 -08:00
moraaar 37c0b661f9 Added blast asset, whose fbx works with Atom, to help testing Blast Gem (#7110)
Signed-off-by: moraaar <moraaar@amazon.com>
2022-01-24 15:49:33 +00:00
greerdv be877373f1 Merge pull request #7041 from aws-lumberyard-dev/quad-collider-2
Support for quad shape in PhysX shape collider component
2022-01-24 14:26:02 +00:00
greerdv 8d7500f9c3 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2022-01-24 12:39:08 +00:00
greerdv d412f3cc50 update with feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
2022-01-24 12:38:15 +00:00
Tom Hulton-Harrop 5940982244 Ensure render geometry is refreshed when the mesh component controller is moved (#6452)
* ensure render geometry is refreshed when the mesh component controller is moved

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* cache bus pointer and send update notification when mesh changes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add integration test to detect MeshComponentController notification to IntersectionNotificationBus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update build visibility for AtomLyIntegration editor static lib

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* move runtime dependencies to gem module

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-01-24 10:41:32 +00:00
SergeyAMZN a623e52331 Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix
LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
2022-01-24 10:25:51 +00:00
Steve Pham 3113b8be03 Fix for 'Cannot Find PThread' when using GCC (#7097)
* Fix for 'Cannot Find PThread' when using GCC

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix error when COMPILATION_C and COMPILATION_CXX handling in ly_append_configurations_options

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add missing 'PARENT_SCOPE' when appending to the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix appending of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Workaround for  C/C++ compilation flag settings for gcc. COMPILATION_C/COMPILATION_CXX is wiping out COMPILATION, so define each one separately with no sharing

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Remove unnecessary gcc ignore warnings for C files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-01-24 01:17:25 -06:00
lumberyard-employee-dm 878ba24a3f Removed unused AWSNativeSDK dependency from Editor (#7091)
* Removed unused AWSNativeSDK dependency from Editor

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

* Remove build dependencies on the aws-cpp-sdk library from the Editor


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-21 18:28:26 -06:00
lumberyard-employee-dm 1f7040c6b8 Updating mock calls in unit_test_manifest.py to fix test (#7090)
The manifest.py `get_all_templates` method was modified to add a call to
`get_all_gems` and `get_gem_templates`.
Those calls were not mocked, so they tried to load an o3de_manifest.json
file that was on user's machine, which failed on the CI node.

Also added a mock call for `load_o3de_manifest`, that validates that it
is not called to catch this issue during Automated Review.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-21 18:28:13 -06:00
chiyenteng dd7706f9fe Fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition (#7079)
* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* convert test AreaNodes_DependentComponentsAdded to use prefab system

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Prevent SetupEditorEntity being called twice

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
2022-01-21 16:23:31 -08:00
Mike Balfour dbd6ddbc1c Optimized Gradient Previewer (#7074)
* Faster method with older one commented out for profiling.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Removed commented-out code

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback, fixed subtle bug in interlace math.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed unrelated bug in terrain cmake file.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix linux compile error.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-21 18:05:19 -06:00
Esteban Papp a145d3c82f Issues/install missing assets (#7081)
* Fixes for missing assets in the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* delayed expansion to try to fix project_engineinstall_profile

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Improvements to build scripts to solve the project build from the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-21 15:07:27 -08:00
michabr 7fa6a82f55 Make ILyShine an AZ::Interface (#6923)
* Move ILyShine instance out of legacy code

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

* Remove last remaining reference of gEnv->pLyShine

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

* Make m_lyShine a unique pointer

Signed-off-by: abrmich <abrmich@amazon.com>
2022-01-21 15:03:57 -08:00
Chris Galvan cdf748a5ed Merge pull request #7084 from aws-lumberyard-dev/cgalvan/RefactorTableViewHeaderSectionStyling
Refactored the styling of TableView header sections
2022-01-21 16:35:14 -06:00
Danilo Aimini 86a0be2561 Prevent read-only entities from being duplicated via prefab workflows (#7076)
* Refactor the sanitation of the selection for prefab operations to prevent read-only entities from being deleted or duplicated.

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

* Fix comment.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-21 12:35:29 -08:00
Chris Galvan 7fc4e4bd10 Refactored the styling of TableView header sections
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-21 14:29:37 -06:00
michabr a8d97cf8aa Fix hi-res display issues in UI Editor (#6912)
* Fix dpi scaling issues in UI Editor

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

* Remove older method for getting dpi scaling factor

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

* Remove direct call to devicePixelRatioF()

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

* Use existing convenience function

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

* Fix one more text size

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

* Fix compile warning

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

* Remove unnecessary typecast

Signed-off-by: abrmich <abrmich@amazon.com>
2022-01-21 12:02:20 -08:00
Luis Sempé 090e12e712 Merge pull request #7075 from aws-lumberyard-dev/scripting/text_issues
Addressed a few Script Canvas translation issues
2022-01-21 11:59:24 -08:00
Sergey Pereslavtsev b21878d04e Removed unused variable
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-01-21 19:57:28 +00:00
michabr 837d6fc4fd Merge pull request #6991 from aws-lumberyard-dev/michabr/lyshine_crycommon
Move remaining two LyShine headers to the gem
2022-01-21 11:56:00 -08:00
jckand-amzn 2c33240b72 Converting Dynamic Vegetation and Gradient Signal tests to utilize prefab system (#7034)
* Adding on-disk prefabs for automated tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Resolving import conflict with cherrypick

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Updating DynVeg tests to use open_base_level function

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Converting initial set of DynVeg tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Finalizing DynVeg test conversion to use prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing old test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing unoptimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Adding wait_for_condition on level save for E2E tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2022-01-21 11:55:19 -08:00
Guthrie Adams 179277c67d Merge pull request #7052 from aws-lumberyard-dev/Atom/guthadam/atom_tools_update_autoload_gem_settings
Atom Tools: updating gem autoload settings registry for ME and SMC to disable script canvas developer gem
2022-01-21 12:29:40 -06:00
Guthrie Adams 27e121f23d Merge pull request #7051 from aws-lumberyard-dev/Atom/guthadam/atom_tools_deleting_unused_defines_from_me
Atom Tools: removing unused traits for ME executable extension
2022-01-21 12:29:18 -06:00
Mikhail Naumov d918991e27 Allowing instantiating of prefab without selecting an entity in outliner (#6763)
* Allowing instantiating of prefab without selecting an entity in outliner

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-21 10:04:47 -08:00
lsemp3d d5f7bc7c9b Consolidated navigation to file code
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-01-21 10:03:02 -08:00
Mikhail Naumov 238962be73 fixing crash when opening different level during simulation mode (#6762)
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-21 10:02:40 -08:00
abrmich cfbd88cb1e Merge remote-tracking branch 'upstream/development' into michabr/lyshine_crycommon 2022-01-21 10:02:28 -08:00
lsemp3d f684fe14ff Categorized Material Data under Rendering
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-01-21 09:45:27 -08:00
lsemp3d be2241bda9 Navigate to file after generating translation (only 1)
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-01-21 09:41:37 -08:00
lsemp3d 1d3b675f88 Regenerated the Input handler .names file
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-01-21 09:35:42 -08:00
Steve Pham edbebb5f47 Minor class definition updates for AWSGem (#7056)
* Move the queued-events constructors for AWSApiClientJob and ServiceRequestJob from public to protected, and add short description for them

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-01-21 09:19:54 -08:00
Scott Romero 807464c58d [development] updated Android build node configuration (#7007)
Added the NDK to the install list
Removed Android Java APIs prior to 28 from package list as they are unnecessary
Updated LY_NDK_DIR to point to the SDK manager version
Updated some inconsistencies in how the min Android native API is handled

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2022-01-21 09:08:24 -08:00
Scott Romero 09dd3a8729 [development] patch fix for launcher exit crash (#7050)
The launcher will crash on exit due to an access violation when clearing the BudgetTracker after CrySystem is unloaded. This is from a recent change to how the budget pointers are tracked making the BudgetTracker responsible for clearing them so the system can be re-entrant. Unfortunately, an assumption was made that all modules that use Budgets are managed by the ComponentApplication so they can be cleared prior to being unloaded. This is a patch to manually reset the BudgetTracker prior to unloading CrySystem until the legacy system can be removed (or converted to an AZ-like module).

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2022-01-21 09:06:14 -08:00
Scott Romero 526ee7644a [development] fixed configure error with monolithic builds (#7057)
The AWSNativeSDKTestLibs target is now only defined when tests are enabled

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2022-01-21 09:04:33 -08:00
Guthrie Adams 5fc40bbbf9 Merge pull request #7016 from aws-lumberyard-dev/Atom/guthadam/atom_tools_streamlining_smc
Atom Tools: Removing unnecessary modules, components, and dead code from SMC
2022-01-21 10:49:33 -06:00
Mike Balfour 145e3646a4 Asset catalog lock inversion fix. (#7045)
* Fix lock inversion.
This method was calling AssetCatalog->AssetManager at the same time that loading threads are calling AssetManager->AssetCatalog, causing a deadlock due to lock inversion. The fix is to make this method call AssetManager *outside* of the AssetCatalog call.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixing the root cause in EnumerateAssets.
Also added a unit test that failed with the previous EnumerateAssets logic, and succeeds with the new logic.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Make sure not to hold the secondary mutex lock either.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Remove unused alias.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-21 10:34:00 -06:00
Nicholas Lawson 9328f053bd Updates EXPAT to use the latest packages (#7053)
* Update EXPAT to be latest package version

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2022-01-21 08:00:45 -08:00
Sergey Pereslavtsev 56c6f81627 PR addressing. Removed RTTI from HeightMaterialPoint since it's just a struct of data with no intention being a part of class hierarchy
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-01-21 13:21:57 +00:00
Nicholas Van Sickle 32e2ba754b Add Dom::Path class for representing positions in a Dom (#7008)
* Add Dom::Path class for representing positions in a Dom

This also adds Value support for doing a path-based lookup.

The serialized representation is presently compliant with the JSON-pointer spec but the implementation supports Node types and may be later expanded if we require additional functionality (e.g. XPath style conditional querying).

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-01-20 16:53:33 -08:00
evanchia e2d157006c Temporary fix for editor log stomping during python tests
Signed-off-by: evanchia <evanchia@amazon.com>
2022-01-20 15:57:09 -08:00
Shirang Jia 858a92f394 Deduplicate Jenkins parameters (#7035)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
2022-01-20 15:47:53 -08:00
dmcdiarmid-ly 5ed7e91a62 Merge pull request #7022 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-17127
NumRaysPerProbe DiffuseProbeGrid setting
2022-01-20 16:14:53 -07:00
Guthrie Adams b49a7a9975 Atom Tools: updating gem autoload settings registry for ME and SMC to disable script canvas developer gem
Script canvas and related gems were already being disabled for some atom tools. The script canvas developer gem was not added initially because it’s not used in automated testing or other common projects.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-20 16:58:48 -06:00
Guthrie Adams dac77605d9 Atom Tools: removing unused traits for ME executable extension
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-20 16:29:11 -06:00
Nana Axel bd57a2832b Fix issues when configuring projects and gems (#7001)
The new `o3de_pal_dir` function raise an issue when configuring projects/gems. This commit apply a simple fix to pass parameters as strings.

Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
2022-01-20 16:27:29 -06:00
Guthrie Adams 3977edb21e Atom Tools: Removing unnecessary modules, components, and dead code from SMC
Looking toward creating a bare bones template for a standalone application, simplifying and removing any boilerplate wherever possible. SMC followed patterns established by material editor, subdividing everything into multiple modules, which required manually adding static modules, implementing system components with little to no functionality, and a bunch of unnecessary files for such a simple application. This change deletes unnecessary boilerplate code, moving everything into a single module, making the application class responsible for reflecting classes and buses.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-20 16:05:08 -06:00
Guthrie Adams dd9c4e3f66 Merge pull request #7023 from aws-lumberyard-dev/Atom/guthadam/atom_tools_streamlining_me
Atom Tools: Removing unnecessary modules, components, and dead code from ME
2022-01-20 15:36:22 -06:00
santorac 74c6fa5f94 Merge pull request #7010 from aws-lumberyard-dev/Atom/santorac/MaterialAssetDeferredBaking3
Fixed Material Builder To Avoid Reading Material Type Source File
2022-01-20 13:25:15 -08:00
Chris Galvan 514f0c1546 Merge pull request #6935 from RoddieKieley/issue5299
issue5299: Resolved via change to not disable custom window decorations.
2022-01-20 15:17:37 -06:00