Commit Graph

3417 Commits

Author SHA1 Message Date
Danilo Aimini 4be1e68bad Fix oversight from recent change to PrefabFocusHandler internals. (#5794)
* Fix oversight from recent change to PrefabFocusHandler internals.

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

* Introduce check for null instance in case this is called before the Prefab Focus Handler is initialized.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-19 10:45:06 -08:00
Nicholas Van Sickle 4ee2f341dc Fix several Prefab outliner ordering issues (#5747)
* Fix several Prefab outliner ordering issues

This change does a few things to address instability in entity order when prefabs are enabled:
- Changes ordering behavior on entity add to always be "insert after the last selected sibling of the new entity, or at the end if there is no selected sibling"
- Adds some logic to ensure selection stays frozen during prefab propagation to allow this behavior to be used
- Alters delta generation in `PrefabPublicHandler::CreateEntity` to use the template instead of reserializing the DOM - this avoids a whole bunch of patching issues caused by EditorEntitySortComponent doing post-hoc order fix-up and should generally be safer/faster as we're producing patches for the actual target for those patches
- Because the duplicate action is DOM-driven, and there's some thorniness around making changes that will affect the template during propagation, this adds `PrefabPublicHandler::AddNewEntityToSortOrder` to directly patch the DOM for the duplicate case

Two bits of this come from patches from the incredibly helpful @AMZN-daimini
- Alters `PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache` behavior for determining what's an override: we now check to see if we're part of the current focused instance but *not* owned by the focus instance directly. This lets entity order for nested prefabs get saved to the owning prefab instead of as an override. I'm putting this up for discussion without a feature flag gating it, but we may wish to make this a toggle or disable it outright for stabilization (in which case entity order won't be saved to the owning prefab)
- Adds a custom serializer for EditorEntitySortComponent. This isn't strictly necessary now, but it was very useful for debugging and ended up receiving much more manual testing its migration path and save/load path more than I've tested without using the serializer.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Add missing serializers

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Address some review feedback

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Generate patch in `PrefabPublicHandler::CreateEntity` using the instance's fully evaluated template in-memory

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix up comment

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix Linux build

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Try to make test less timing dependent (haven't been able to repro failure locally)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix another build issue

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix unit test failures

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix a duplicate issue with sanitization that was causing sporadic test failure (thanks, test!)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* One more Linux fix...

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2021-11-19 23:35:19 +05:30
John Jones-Steele 4ad35f424e Adds check to make sure that there are not too many samples created. (#5789)
* Adds check to make sure that there are not too many samples created.

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes made from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes made from PR 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-11-19 17:57:38 +00:00
Tom Hulton-Harrop ebb24d2285 Improvement for click detection when clicking quickly between mouse moves (#5786)
* improvement for click detection when clicking quickly between mouse moves

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

* remove magic number and introduce constant

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

* add missing update from camera test

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-19 16:52:44 +00:00
AMZN-Phil 092d125acf Merge pull request #5769 from aws-lumberyard-dev/Prism/RemoteGemWarning
Extra gem download failure handling
2021-11-19 07:30:25 -08:00
Tom Hulton-Harrop e50735c127 Improved look for viewport ui border close button (#5757)
* improved look for viewport ui border close button

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

* remove unused variable

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

* removed commented 'fixme' calls

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

* updates following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-19 11:04:49 +00:00
AMZN-Phil a465bf30a7 Iterate over dependent gems
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-18 17:30:52 -08:00
Alex Peterson 4ad6d3e9f7 Updated project manager backgrounds (#5770)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-18 16:54:04 -08:00
antonmic 9cbd323a3b Merge pull request #5763 from aws-lumberyard-dev/Atom/antonmic/AuxGeomFeedback
Capsule light aux geom: addressed feedback from previous PR plus some cleanup
2021-11-18 15:19:08 -08:00
Danilo Aimini ac959bcc01 Dragging an entity from outside the focused Prefab into it may crash the Editor (#5762)
* Replace Instance References with EntityId of the Prefab Container (WIP)

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

* Use the invalid entity id for the root instance and get the root instance every time to prevent weird Prefab EOS shenanigans.

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

* Revert unnecessary changes, fix IsOwningPrefabBeingFocused to match previous behavior. Disable some tests that no longer apply correctly due to the testing environment not relying on the Prefab EOS.

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

* Fix minor typo in test comment

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-18 15:06:58 -08:00
AMZN-Phil 7e43b53d16 Extra gem download failure handling
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-18 15:01:11 -08:00
Danilo Aimini e8576acbb0 Replace old Developer Preview release name with Stable 21.11 (#5759)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-18 14:16:56 -08:00
antonmic cf4ef5e73b Addressed feedback from previous PR plus some cleanup
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-18 13:37:06 -08:00
AMZN-Phil 78263b7f13 Merge pull request #5681 from aws-lumberyard-dev/Prism/CLIDisplayLastError
Show python errors in Project Manager
2021-11-18 08:37:23 -08:00
Tom Hulton-Harrop bf4f52e146 Updates and fixes to viewport placement (#5712)
* updates to use more modern viewport intersection logic

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

* updates to editor viewport ray intersection for object placement

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

* make ed_defaultEntityPlacementDistance visible to Viewport.cpp

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

* fix link error for AZ_CVAR variable

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

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-18 10:58:18 +00:00
santorac 734c2fb693 Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 15:11:32 -08:00
AMZN-Phil 7787ceb04c Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 14:43:03 -08:00
amzn-mike 555776fd7f Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575) (#5664)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 63713ca284)
2021-11-17 14:40:45 -08:00
AMZN-Phil c375f07339 Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart
Display Gem Cart in Gem Catalog Right Panel
2021-11-17 14:30:43 -08:00
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 14:03:24 -08:00
Danilo Aimini a8dcfbbb13 Prevent settings from being saved to setreg files on editor close. Limiting this to avoid a bigger blast radius. (#5717)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-17 13:27:57 -08:00
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 12:15:57 -08:00
AMZN-Phil 95c8398c79 Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
2021-11-17 12:14:24 -08:00
jonawals a1cf76ec65 Merge pull request #5652 from aws-lumberyard-dev/viewport/EditorModeUIBackButton
Viewport/editor mode UI back button
2021-11-17 18:32:46 +00:00
AMZN-nggieber 7de4628747 Merge branch 'stabilization/2110' into Prism/FixGemCart 2021-11-17 10:19:47 -08:00
nggieber 8d26251c93 Include DownloadController
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-17 10:16:41 -08:00
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 10:01:00 -08:00
Qing Tao d0ebe4ee10 Follow up fix for ATOM-13512 (#5689)
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-17 10:00:31 -08:00
Tom Hulton-Harrop e34ea3bcaa Fixes for viewport selection issues (#5494)
* improvements to editor selection in the viewport

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

* fix issue with being able to select icons that are not showing for entities inside entity containers

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

* update comment after review feedback

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

* updates to viewport picking code to simplify the api

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

* add test to replicate near clip intersection issue

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

* small tidy-up changes

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

* updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up

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

* add some more tests for ViewportInteractionImpl

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

* minor tweaks before PR feedback

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

* fix typo in fix

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

* fix for manipulator test framework tests

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

* updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ

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

* add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors

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

* add PrintTo functions for Screen* types

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

* downgrade error to warning temporarily

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

* check incoming view is null

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

* remove pragma optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 17:12:21 +00:00
Tom Hulton-Harrop 593f03efb4 Camera fixes follow-up (#5703)
* allow unconstrained camera when tracking transform and fix some camera interpolation issues

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

* tests for interpolation fixes

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

* add test for camera constraints change

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

* updates following review feeedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 16:23:01 +00:00
AMZN-Phil a7e90fd6c8 Fix copy paste variable name
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 08:15:41 -08:00
Chris Burel 9f9aa8f2a6 [Linux] Avoid duplicating inotify watches in forked AssetBuilder processes (#5683)
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-17 07:34:56 -08:00
Tom Hulton-Harrop a6164ca2cd Fix for camera roll behavior when in 'Be this camera' mode (#5658)
* fix for camera roll behavior when in 'Be this camera' mode

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

* updates for camera tests

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

* fix for failing unit test - require default function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 12:27:23 +00:00
John 8ee6f1a7f4 Fix back icon scaling.
Signed-off-by: John <jonawals@amazon.com>
2021-11-17 11:08:22 +00:00
AMZN-Phil ba5102b37d Change to optionally show all python error strings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-16 17:40:12 -08:00
Mike Balfour 551e6010dd Add support for getting the level entity when prefabs are enabled. (#5680)
* Add support for getting the level entity when prefabs are enabled.

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

* Made a little prettier.

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

* Addressed PR feedback plus fixed the crash when the level component failed to add.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-16 19:23:53 -06:00
nggieber dcd50d90c9 Forward declared QVBoxLayout
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 17:08:36 -08:00
nggieber c2308de8ee Added in missed suggestions from previous PR
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 16:29:12 -08:00
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 16:04:06 -08:00
nggieber de67bb70c9 Added comment why GemRepos isn't included in ContainsScreen
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 16:01:25 -08:00
nggieber 95da89d0cc Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 15:58:14 -08:00
AMZN-nggieber 0d17e575a7 Fix: Display Repo Gems on Repo Screen Correctly (#5638)
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 15:53:51 -08:00
nggieber 5d2be299d8 Moved includes to forward declarations on GemCatalogScreen
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 15:36:32 -08:00
Qing Tao 2ae8477683 ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild (#5639)
Changes include:
- Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies.
- Change GetSuggestedPreset function so it can return certain preset for certain file name.
- Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used.
- Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch.
- Expose GetFileHash function in AssetBuilderSDK api.


Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-16 15:25:13 -08:00
Alex Peterson fc805594d0 Fixes for misc gem download issues (#5665)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-16 14:51:28 -08:00
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-16 14:24:02 -08:00
amzn-phist 6651ae3d78 Fix for python load errors on Linux (#5627)
* Explicitly load libpython on Linux

Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag.  This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.

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

* Fix misspelled function name

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

* Addressing PR feedback

- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.

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

* Address further feedback

Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-16 15:32:24 -06:00
nggieber df36067ef3 Configure gems option added to projects button to go directly to gem catalog
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 13:22:52 -08:00
nggieber 1aae84537d Makes project settings screen scrollable
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 12:37:20 -08:00
AMZN-Phil 4854023eb1 Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq
Store whether O3DE Project Manager built the project successfully
2021-11-16 12:22:20 -08:00