Commit Graph

7840 Commits

Author SHA1 Message Date
Guthrie Adams c9c87b1ca8 Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor 2021-10-15 10:58:58 -05:00
Esteban Papp 7651ba621c Remove old "Integ" functionality from tests (#4688)
* fixes some warnings for newer versions of VS2022

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

* more warning fixes

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

* remove integ test filters from AzTest

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

* remove integ test handling from AzTestRunner

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

* changes integ tests of gridmate to regular tests and disables failing ones

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

* removes the Integ from the EMotionFX tests, but leaves them disabled since they are failing

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

* removes the Integ from the HttpRequestor tests and disables it since is not passing

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

* changing integ tests for DISABLED, these ones are using files that are not there

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

* fixes linux build
gridmate tests that were Integ are now disabled

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

* fixes linux warnings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-15 08:53:26 -07:00
Guthrie Adams 42130bc1ff Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor 2021-10-15 10:17:06 -05:00
Guthrie Adams b434d29899 Merge pull request #4652 from aws-lumberyard-dev/Atom/guthadam/thumbnail_and_preview_refactor
Material preview images update to reflect property changes
2021-10-15 09:56:59 -05:00
hultonha 9aafc51ff5 Add first pass version of click feedback while in Focus Mode (#4693)
* add first pass version of click feedback while in Focus Mode

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

* add more WIP experimental feedback ideas for Focus Mode

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

* small updates after UX feedback to improve focus mode feedback

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

* refactor and improve invalid click feedback

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

* update comments from review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-15 15:25:27 +01:00
srikappa-amzn 87533d80c1 Delay propagation for all template updates in detach prefab workflow (#4707)
* Delay propagation for all template updates in detach prefab workflow

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

* Some minor changes to the PrefabUndo constructor

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-10-15 13:55:26 +01:00
amzn-mike 969a55170e Procedural Prefabs: Entity parenting fixes (#4669)
* Parent top level entities to container entity when creating prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add to_json method to PythonProxyObject to allow serializing any AZ serialializable type

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update scene_mesh_to_prefab.py to parent entities in a chain

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove redundant eval

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Improve error handling in ToJson

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add maybe_unused for commonRoot since it's not used

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-15 07:33:01 -05:00
Allen Jackson d84bb6a72f {LYN5384} splitting Blast builder and processor Python scripts (#4712)
splitting the asset builder and asset processor Python scripts for the Blast processor
This fixes a mulitiple build issue found while developing other scripts

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-10-15 07:32:10 -05:00
Michael Pollind 716c561cb7 bugfix: correct broken layout when searching global preferences (#4689)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-10-15 12:56:20 +01:00
hultonha 5c8a1b573e Add support for border in Focus Mode (#4692)
* restore component mode border

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

* add viewport border for focus mode, remove dead code in ObjectManager

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

* ensure the focus mode border is restored when leaving component mode

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

* update FocusModeNotification call order after merge from development

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-15 12:56:05 +01:00
greerdv bcc0861623 Merge pull request #4700 from aws-lumberyard-dev/physx-tooltips
Physx tooltips
2021-10-15 11:33:14 +01:00
ffarahmand-DPS 606de5427b Fixes debug console autocomplete issues (#4223)
* Fixed a crash caused by large autocomplete results in the debug console. A fixed vector was growing beyond its allocated size.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes printing duplicate autocomplete results, caused by looping over multiple CVARs registered with the same name. Also adds an erase to prevent undefined behavior.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Adds a test case for autocomplete duplication in the event of multiple cvars existing under the same name. Two matching cvars are created and checked against the number of matches produced by autocomplete.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Added two safety checks and made a pointer const as per reviewer feedback.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
2021-10-15 10:30:48 +01:00
greerdv 0f40aae8fa merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-15 09:58:36 +01:00
AMZN-Igarri f7eb906516 Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660)
* removed references to maxNumberOfItemsShownInSearch

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

* Move Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings

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

* Fixed extra spaces

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

* Code review feedback

Signed-off-by: igarri <igarri@amazon.com>
2021-10-15 09:55:41 +01:00
moraaar 3b9762142a Triangle Mesh with a Kinematic PhysX Rigid Body warns the user instead of error. (#4657)
Using triangle mesh with a kinematic rigid body is allowed, but the options "Compute COM", "Compute Mass" and "Compute Inertia" are not supported by PhysX and an error in logged that default values for COM, Mass and Inertia will be used. Now this situation is captured and an explanatory warning is used instead.

- Improved RigidBody::UpdateMassProperties function to apply the same logic in the treatment of shapes for all three parameters: COM, Mass and Inertia.
- Improved UpdateMassProperties function by using references for the override parameters instead of pointers.
- Improved function that computes the Center of Mass UpdateCenterOfMass (renamed from UpdateComputedCenterOfMass), to include the same shapes that the compute mass and inertia functions in physx updateMassAndInertia, which is to include all shapes if includeAllShapesInMassCalculation is true, else include only the shapes with eSIMULATION_SHAPE flag.
- Removed unused private function RigidBody::ComputeInertia.
- Added unit test to check when the warnings are fired correctly when COM, Mass or Inertia are asked to be computed on a rigid body with triangle mesh shapes.
- Improved MassComputeFixture tests by not only using Box shape, but also sphere and capture, plus improved the PossibleMassComputeFlags parameters to include all possible variations of the MassComputeFlags flags.

Fixes #3322
Fixes #3979

Signed-off-by: moraaar <moraaar@amazon.com>
2021-10-15 08:58:18 +01:00
Guthrie Adams 7a143572d1 Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor 2021-10-14 23:47:33 -05:00
antonmic 16e60a94af Merge pull request #4711 from aws-lumberyard-dev/rgba16f/PalifyRenderDocIncludeDirectories
Palify RenderDoc cmake include directories
2021-10-14 17:53:45 -07:00
rgba16f 0ace221eb8 Add '.' path to render doc include directories on windows
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-10-14 18:13:32 -05:00
Danilo Aimini bcf3980de6 LYN-7191 + LYN-7194 | Adjust Prefab operations to conform with Prefab Focus/Edit workflows. (#4684)
* Disable ability to delete container entity of focused prefab. Default entity creation to parent to container entity of focused prefab.

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

* Disable detach and duplicate operations for the container of the focused prefab. Update the context menu accordingly.

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

* Fix spacing

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

* Address minor issues from PR (error message, optimization in RetrieveAndSortPrefabEntitiesAndInstances).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-14 15:32:34 -07:00
rgba16f c510ef1050 Palify RenderDoc cmake include directories
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-10-14 16:44:14 -05:00
Steve Pham 16a7b896ee Fix to prevent using legacy windows based logic to create a Path on Linx (#4704)
Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-14 12:58:53 -07:00
Chris Galvan 6c447cb9ee Merge pull request #4678 from aws-lumberyard-dev/cgalvan/CreatedCustomToolTemplate
Added gem template for custom tool in C++
2021-10-14 14:17:20 -05:00
AMZN-koppersr aabb519452 Merge pull request #4565 from aws-lumberyard-dev/mnaumov/LYN-7227
Fixing crash creating new level when simulate mode is on
2021-10-14 11:20:02 -07:00
Mike Balfour c7e6907064 Flipped y value on uv so that the macro material lines up with the corresponding height data. (#4701)
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-10-14 13:03:19 -05:00
Jeremy Ong 0c670b1123 Merge pull request #4646 from aws-lumberyard-dev/rgba16f/LinuxRenderDocFixes
Fixes to allow cmake to find files inside the render doc linux tar
2021-10-14 11:06:56 -06:00
amzn-mike 63ece6e3ca Change Asset Hint fixup code to not request assets be queued for load. (#4664)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-14 11:54:13 -05:00
Mikhail Naumov e36be1ee95 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-7227
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-10-14 11:38:00 -05:00
Chris Galvan 4d4f99767f Merge pull request #4594 from pollend/chore/update-IntersectSegment-cleanup
Clean-up IntersectSegment  and improve documentation
2021-10-14 11:33:01 -05:00
Chris Galvan 9cf7c96322 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/CreatedCustomToolTemplate 2021-10-14 11:15:39 -05:00
Chris Galvan 1fc69aa9c5 Set EDITOR_TEST_SUPPORTED to false for Android/iOS in the template.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-14 11:15:21 -05:00
Tommy Walton 2dd00e2983 Move wrinkle mask data out of default object srg (#4578)
* Refactored depth, shadow, and motion vector shaders to support custom object srgs. Added a new skin object srg and moved wrinklemask data out of the default object srg. Added a new minimal morph target asset for testing wrinkle masks to AutomatedTesting.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Fix copyright header

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-14 08:58:50 -07:00
greerdv cff2315654 small correction to wording
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-14 16:55:07 +01:00
Steve Pham 999ec261c9 Update linux AP connection settings to connect to remote AP and wait for the connection (#4685)
Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-14 08:28:36 -07:00
Steve Pham 8d7b03c859 Implement open in file browser for Linux (#4677)
* Add support to open folder browser for Linux
* PAL'ified DesktopUtilities.cpp

Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-14 08:27:43 -07:00
Guthrie Adams f30965eed9 Merge pull request #4641 from aws-lumberyard-dev/Atom/scottmur/Atom-16573
PostFX Shape Weight Modifier component P0 parallel tests
2021-10-14 10:14:28 -05:00
greerdv 4d6fa26681 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-14 16:07:05 +01:00
greerdv ec10bb078e improve wording for all PhysX gem tooltips apart from pipeline, fixes 3898
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-14 16:06:13 +01:00
Chris Burel 5967b419a2 Only enable the Keyboard device in the XcbKeyboard unit tests (#4682)
This prevents other input devices from interfering with the expected calls
that the Keyboard tests should make.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-10-14 08:45:44 -06:00
Michael Pollind 5a204dc80b chore: remove equality from boolean expression
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-10-13 21:26:03 -07:00
jromnoa 922a991443 change expected_lines to something that appears in both AR + locally (#4680)
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-14 00:15:29 -04:00
Guthrie Adams 8679f13bc2 Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor 2021-10-13 20:37:36 -05:00
Guthrie Adams 66c25f3a02 Making sure that all capture requests are cleaned up before the preview renderer gets destroyed
A request was captured and held onto to by a lambda that was not getting cleared before the system was destroyed
This caused an entity to be destroyed late, accessing the culling system that was already torn down
Solution is to only store the success and failure callbacks inside of the attachment pass read back callback lambda so the rest of the content can be released

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-13 20:36:15 -05:00
Vincent Liu 6823ea2274 Add GameLift matchmaking backfill server support (#4622)
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
2021-10-13 16:59:37 -07:00
Scott Murray 408e27e0f1 wait_for_condition added and merged development
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-13 15:01:58 -07:00
lumberyard-employee-dm 2474ffc5a1 Fixed contains check in the Global AnimNode Map macros (#4674)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-13 16:59:46 -05:00
Ken Pruiksma 937c2b2e88 Terrain FP supports macro material component (#4587)
* Adding basic support for TerrainMacroMaterialNotificationBus. Tracking macro materials in list.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit b4773454334de940d730620ffff300b46d6c611d)

* Adding bus connection

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 66c99f503adb24f4be4f81716b544202d8e237d9)

* Additions to indexed data vector to allow for getting an index from the data or deleting data with a reference to the data itself instead of the index.
Additions to the feature processor for tracking macro material indices in sectors.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 06365dbde5454e18e5fdf941f03b17b0d632027c)

* Macro materials updating which macro materials are used in which sectors. Correctly handling construction / destruction.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating the terrain macro material type to have the correct properties and also not attempt to render. Refactored some of the update loop in the TerrainFP to only rebuild the sectors when necessary, otherwise just update the srgs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed up macro material to not try to actually render anything with shaders or hook to any shader data
Terrain FP now pulls data pulling from macro material instance to use in the terrain material
Various bug fixes around when terrain sectors needed reprocessing

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding basic support for TerrainMacroMaterialNotificationBus. Tracking macro materials in list.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit b4773454334de940d730620ffff300b46d6c611d)

* Adding bus connection

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 66c99f503adb24f4be4f81716b544202d8e237d9)

* Additions to indexed data vector to allow for getting an index from the data or deleting data with a reference to the data itself instead of the index.
Additions to the feature processor for tracking macro material indices in sectors.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
(cherry picked from commit 06365dbde5454e18e5fdf941f03b17b0d632027c)

* Macro materials updating which macro materials are used in which sectors. Correctly handling construction / destruction.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating the terrain macro material type to have the correct properties and also not attempt to render. Refactored some of the update loop in the TerrainFP to only rebuild the sectors when necessary, otherwise just update the srgs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed up macro material to not try to actually render anything with shaders or hook to any shader data
Terrain FP now pulls data pulling from macro material instance to use in the terrain material
Various bug fixes around when terrain sectors needed reprocessing

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Constify all the things

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updates from PR review.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-10-13 16:58:23 -05:00
Brian Herrera b4c9f20fb9 Add step to verify drive is in an offline state (#4668) 2021-10-13 14:53:30 -07:00
Sean Sweeney bdbc2eabff Merge pull request #4671 from aws-lumberyard-dev/ap_fix
Stabilize asset processor immediately exiting
2021-10-13 14:51:58 -07:00
amzn-phist 80dcc34e6f Add "Registry" folders as scan folders (#4583)
* Add "Registry" folders as scan folders

For projects, Gems, and Engine, add the "Registry" folder as scan
folders.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change params for adding scan folder

Also add trailing newlines to setreg files.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Adjust the priority order for project templates

Scan folder orders were way too high, they should be very low to become
highest priority order.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes change of default assets folder to Assets

Need to revert this change so it can be done separately.
Renamed the scan folder to 'Project/Assets' to prep for Assets folder
change later on.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update platform configuration test to pass

Adjusted expectation of scan folder count from 1 to 2 per Gem for
'Assets' and 'Registry' now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-10-13 16:46:30 -05:00
Guthrie Adams 0217f45f3f Merge pull request #4673 from aws-lumberyard-dev/Atom/guthadam/update_material_editor_icons
updated material editor skybox and changed property icons
2021-10-13 16:29:42 -05:00