Commit Graph

7746 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Junbo Liang 26d53690b9 [GameLift][FlexMatch] Add client side change for match acceptance (#4634)
* [GameLift][FlexMatch] Add client side change for match acceptance required

Signed-off-by: Junbo Liang <junbo@amazon.com>
2021-10-13 11:34:13 -07:00
jromnoa 150060441e Re-add pytest.mark.test_case_id markers (#4621)
* add some test case id markers

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

* re-added pytest.mark.test_case_id markers for test cases

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

* re-add directional light log lines that were missing and re-add directional light test case id

Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-13 09:50:44 -07:00
Benjamin Jillich b6a1f62dec EMotion FX: Fix for broken workspaces after asset path change (#4662)
Some days ago an impactful change deprecated @assets@ and @root@ keywords from paths which our workspaces used. Some workspaces used these and were broken. This change makes them backward compatible and loads the assets correctly again. It also auto fixes broken paths that were present in some of the saved workspaces + making sure new workspaces are saved correctly.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-10-13 18:20:48 +02:00
lumberyard-employee-dm 97e9f4dc7d [LYN-6838] Various Monolithic shutdown fixes for the GameLauncher (#4564)
* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.

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

* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.

This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn

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

* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator

Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.

This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.

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

* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available

Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary

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

* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance

Updated the EnvironmentVariable instance to store the NameDictionary as a
value.

Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.

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

* Clang 6.0.0 build fixes

The C++17 std::launder feature isn't available in that compiler version

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-13 09:38:36 -05:00
Adi Bar-Lev 3af07e5117 Hair - creating parent class for raster pass as prep for ShortCut technique (#4560)
Signed-off-by: Adi-Amazon <barlev@amazon.com>
2021-10-13 09:37:47 -04:00
amzn-sean 5bf7330f35 made some physX tests less flaky (#4632)
Joints_BallLeadFollowerCollide - changed the idle_wait to a wait_for_condition of the lead and follower colliding with a 10 second timeout. It was a 2 second timeout which is on the edge of the time from start to collision (~1.5sec).

Joints_HingeNoLimitsConstrained - now measures the angle the joint is at and waits for the follower to raise up and over the lead, or fail after a 10sec timeout. This use to 'catch' the follower joint in a force region and check the position of the follower to determine pass/fail.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-10-13 12:50:11 +01:00
hultonha 48a74ca93d Remove clearFocus from EditorTransformComponentSelection duplicate Entity (#4571)
* remove clearFocus from EditorTransformComponentSelection duplicate entity

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

* remove extra unneeded calls to RequestWrite

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

* update PrefabPublicHandler to use SetSelectedEntities

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-13 10:18:21 +01:00
Benjamin Jillich da1fde8314 ImGui histogram container improvements (#4630)
* Added auto scale mode that uses a running average to expand and shrink the visible vertical range.
* Added option to set the move direction and either push new values to the front of the buffer (left) and make the histogram move to the right or the inverse.
* Changed the camera monitor to use auto scaling as well as the current one was not showing anything because of an outlier.
* Pre-fill the histogram with zeros so that the first pushed sample moves in without horizontal scaling effects which made it hard to read out any information from the histogram.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-10-13 09:57:15 +02:00
Benjamin Jillich 2b79abb8c4 EMotion FX: A parameter’s text box of Blend Space 2D and 1D Motions only takes one numerical input value including fractions (#4626)
The on value changed event was recevied too often - with every newly typed character. As we're updating elements outside of the value spinbox, we need to wait for the actual done editing signal. This can be achieved by not tracking the keyboard for the spinbox.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-10-13 09:13:19 +02:00
Steve Pham ccd60513f1 Fix prefab close dialog Editor crash on Linux (#4623)
Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-12 18:34:55 -07:00
Danilo Aimini 1cb26a31f8 LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers for entities out of focus + selection shortcut adjustments (#4615)
* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.

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

* When Escape is pressed, clear the Prefab Focus.

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

* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.

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

* Remove redundant comments and reduce footprint of tests.

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

* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-12 15:53:38 -07:00
Luis Sempé 3b78132833 Split StyleHelper.h into a header and source file (#4614)
* Split StyleHelper.h into a header and source file

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing file from commit

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed incorrect path

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Fixed includes

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed unnecessary comment

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing include

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-10-12 15:45:41 -07:00
Guthrie Adams 2b72f7b100 Merge pull request #4642 from aws-lumberyard-dev/Atom/guthadam/overriding_property_asset_ctrl_thumbnails
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail image
2021-10-12 17:27:03 -05:00
Sean Sweeney 1ea472bdeb Merge pull request #4589 from aws-lumberyard-dev/lytt_integ_linux
Platform manager and sanity tests for Linux
2021-10-12 15:11:12 -07:00
Steve Pham 70636572ff Fix casing of editor_xml filenames to match casing in .ly files (#4640)
Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-12 15:08:07 -07:00
Artur K 80db67e90a Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

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

* Remove a few more dead config vars

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

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-10-12 17:06:15 -05:00
Guthrie Adams f34811c373 Merge pull request #4639 from aws-lumberyard-dev/Atom/guthadam/thumbnail_bus_passes_const_qpixmap
Updated thumbnail notification bus to use const QPixmap&
2021-10-12 16:47:26 -05:00
Guthrie Adams 4f539b0eb7 fixed comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-12 16:17:19 -05:00
Sean Sweeney 960e3fc1b9 Merge pull request #4427 from aws-lumberyard-dev/sample_editor_for_qa_automation
Sample Editor test for QA Automation project
2021-10-12 14:08:01 -07:00
Guthrie Adams f7e08d1c4b PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail images
• PropertyAssetCtrl was previously extended with ThumbnailPropertyCtrl to optionally display a thumbnail and floating zoomed in preview of the selected asset.
• This change allows overriding the image that comes from the thumbnail system with a custom image provided as an attribute. The custom image can be specified as either a file path or a buffer containing a serialized QPixmap.
• This will be used by the material system in the editor to provide a dynamically rendered image of the material with property overrides applied so that the image will update as the user customizes their material.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-12 15:36:19 -05:00
Danilo Aimini 6318247b3d LYN-7279 + LYN-7192 | Focus Mode - Container unit tests + Clear container entity open state on new level load (#4558)
* Change SetContainerOpenState to SetContainerOpen.

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

* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.

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

* Minor FocusMode fixture refactors to support ContainerEntity tests

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

* Introduce tests for the ContainerEntity API

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

* Add include to fix issue with EntityContextId not being defined.

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

* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.

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

* Use default editor context id in ContainerEntitySystemComponent

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

* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-12 13:34:51 -07:00
mrieggeramzn c38c9739da Adding vertexNormal to the Surface structure and using it for shadows (#4617)
* Adding vertex shadow and using it for all shadows
* Fixing small issue with it not being initialized
* Adis recommendations for hair

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-12 13:32:47 -07:00
Chris Galvan 190cf92f9d Merge pull request #4637 from aws-lumberyard-dev/cgalvan/FixPythonScriptsTreeItems
Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
2021-10-12 15:30:57 -05:00
moudgils 5cefd552a6 - Optimize SRG compilation to not update the whole SRG if not needed across all backends (#4499)
- Each resource type is tracked and updated separately
- Added caching ability for Raytracing srg to save ~2ms for a scene containing 100 x 50 vegetation patch

Signed-off-by: moudgils <moudgils@amazon.com>
2021-10-12 13:24:40 -07:00
Guthrie Adams 8487373b0c Updated thumbnail notification bus to use const QPixmap&
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-12 14:41:26 -05:00
Adi Bar-Lev 05767f2d2b Atom Timer fix - changed milliseconds to seconds (#4631)
* Atom Timer fix - changed milliseconds to seconds

- Tested on both fog and EyeAdaptation animations - both are the only affected and were broken before
- This is a small fix for pull #3969 that replaced the timer mechanism: https://github.com/o3de/o3de/pull/3969

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Atom Timer fix - using seconds to begin with and removing obsolete variable

Signed-off-by: Adi-Amazon <barlev@amazon.com>
2021-10-12 15:40:12 -04:00
AMZN-Phil c355c162ab Merge pull request #4486 from aws-lumberyard-dev/Prism/ShowRepoList
repo.jsons can be listed and and access through CLI and is Integrated with Project Manager
2021-10-12 12:38:49 -07:00
Chris Galvan 94c938496e Fixed logic error causing Python Scripts tree items to only show extension intead of filename.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-12 13:46:54 -05:00
smurly 7fcaeb16c4 PostFX Layer component P0 parallel test (#4619)
* PostFX Layer component P0 parallel test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* removing an unused import

Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-12 14:23:29 -04:00
Junbo Liang 736c2fe27b [O3DE][GameLift] Add client side change for starting and stopping matchmaking (#4536)
* [O3DE][GameLift] Add client side change for starting and stopping matchmaking

Signed-off-by: Junbo Liang <junbo@amazon.com>
2021-10-12 10:41:27 -07:00
Terry Michaels ff14c2d991 Merge pull request #4471 from aws-lumberyard-dev/jckand/LCXfailUpdate
Removing xfail from optimized Landscape Canvas suite and disabling non-optimized suites
2021-10-12 12:24:00 -05:00
Qing Tao 01448c5c49 ATOM-16658 Remove PBSreferenceMaterials gem which is a gem for legacy cry3dengine (#4616)
Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-12 09:11:50 -07:00
Roman 129d249cb4 Do not delete the actor instance if it's belong to an entity. (#4624)
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-12 17:53:30 +02:00
jckand-amzn 0d9bb2e9b4 Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate 2021-10-12 10:37:44 -05:00
Benjamin Jillich ccb686b0fc Bug report template improvement suggestions (#4478)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-10-12 11:15:56 +02:00
Michael Pollind 7ca85460f7 Bug Fix: Improve display of Viewport UI (#4596)
- always show controls on top of main ui
- Tool window does not show visually in toolbar

issue: https://github.com/o3de/o3de/issues/4380

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-10-12 09:41:11 +01:00
jckand-amzn 52ced4a4ee Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate 2021-10-11 18:29:39 -05:00
smurly 9dee92a708 Mateiral component P0 tests editor script (#4585)
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-11 16:09:11 -07:00
Qing Tao 89e6df1c7f ATOM-16575 clean up image builder presets files (#4611)
ATOM-16575 clean up image builder presets files
Removed unused image builder presets
Deprecating preset UUID and use preset name as unique id
Delete all .exportsettings file which were only used for legacy imageProcessing gem.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-11 15:18:39 -07:00
Scott Romero a95c609bd8 [development] Migrate Atom CPU timing stats tracking to use global stats profiler (#4549)
This change is a preparation for moving the CPU profiler/visualization system from Atom into its own Gem by removing the dependency on local time tracking object AZ::RHI::CpuTimingStatistics

Full changes include:
- Removed all usage of AZ::RHI::CpuTimingStatistics
-- Replaced with pushing to AZ::Statistics::StatisticalProfilerProxy global instance
- Promoted VariableTimer from AZ::RHI to AZ::Debug
- Removed now unused CpuTimingStatistics.h

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-10-11 14:00:42 -07:00