Commit Graph

7824 Commits

Author SHA1 Message Date
Guthrie Adams 21c84fc47b Merge branch 'development' into Atom/guthadam/shared_preview_renderer_as_interface 2021-10-14 23:44:53 -05:00
Guthrie Adams ed9ecb3906 adding missing includes to fix build
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-14 23:43:35 -05:00
Guthrie Adams c8be25a9ce Converted preview renderer to use AZ::Interface
Made some files private when exposing public interfaces
Updated a few comments

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-14 20:22:48 -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
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
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
Chris Galvan f83c8bcb5a Added gem template for custom tool in C++.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-13 16:28:56 -05:00
Danilo Aimini f7e2d07a4b LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. (#4620)
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.

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

* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.

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

* Minor code adjustments

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

* Minor fixes and optimizations

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-13 14:17:09 -07:00
sweeneys 2b7262f566 Mock additional popen calls
Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-10-13 14:14:01 -07:00
brianherrera b792ff3d33 Fix command formatting
Signed-off-by: brianherrera <briher@amazon.com>
2021-10-13 14:12:18 -07:00
Nicholas Lawson 5ba30f9a37 Update tiff to the new package revision (fixes IOS TIFF package) (#4638)
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
2021-10-13 13:46:20 -07:00
brianherrera 4625e6d315 Fix indentation
Signed-off-by: brianherrera <briher@amazon.com>
2021-10-13 13:35:44 -07:00
Danilo Aimini 3c3cde99be LYN-7189 | Outliner - Disable context menu if right clicking on disabled entity (#4651)
* Don't allow right clicking on a non selectable entity in the Outliner

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

* Also check that the index is valid to still allow the right click context menu to appear on empty areas of the widget.

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

* Change if check to a more readable bool.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-13 13:33:59 -07:00
allisaurus 3934ac24e0 Add field titles, tooltips to AWSClientAuth AWSCognitoUserManagementRequestBus nodes (#4613)
Signed-off-by: Stanko <stankoa@amazon.com>
2021-10-13 13:25:19 -07:00
amzn-phist 29b62c7b84 Various updates to get pak builds working (#4552)
* Various updates to get pak builds working

-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.

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

* Reverting a change that caused some test failures.

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

* Change tabs to spaces

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-10-13 15:22:25 -05:00
amzn-mike e7d7720d02 Procedural Prefabs: Don't activate prefab when saving to manifest (#4663)
* Generate prefab group dom without activating prefab

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

* Fix bad merge

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-13 15:14:14 -05:00
Scott Murray 718fc97bb6 changes from review feedback
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-13 12:57:31 -07:00
AMZN-nggieber 10ab1a369f Adds Download status info UI to Gem Catalog (#4602)
* Adds Download status info UI to Gem Catalog

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

* Removed test code

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

* Remove unused variable

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

* Addressed PR feedback

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

* Fixed Open3DEngine spelling

Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-13 12:52:44 -07:00
Danilo Aimini da3a39a6a0 LYN-7121 | Focus Mode - Make editing a prefab an undoable operation (#4582)
* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.

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

* Fix selection code to avoid warning message

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

* Removed changed property from PrefabFocusUndo node

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

* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged

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

* condense if check on Prefab Edit context menu item setup

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

* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)

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

* Remove rej file that was included by mistake

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

* Fix missing interface initialization in PrefabFocusTests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-13 12:37:07 -07:00
sweeneys f1fa0acbb4 Stabilize asset processor immediately exiting
Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-10-13 11:44:15 -07:00
Guthrie Adams afdf35a925 updated material editor skybox and changed property icons
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-13 13:41:31 -05:00
Guthrie Adams 7415277eed fixing ME shutdown
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-13 13:35:46 -05:00