Commit Graph

57 Commits

Author SHA1 Message Date
Nicholas Van Sickle 3c5c692148 Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
2021-04-29 11:19:28 -07:00
AMZN-koppersr 5e4094b258 Revamped AzFramework::Scene (#332)
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.

Highlights of changes:

Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
2021-04-29 08:50:48 -07:00
nvsickle 9311dc4cb9 Fix RenderViewportWidget::ViewportWorldToScreen, which fixes box selection 2021-04-28 17:42:43 -07:00
Guthrie Adams 3c8421036a Merge pull request #389 from aws-lumberyard-dev/Atom/guthadam/ATOM-15371
ATOM-15371 Adding missing RHI dependency to Atom tools
2021-04-28 12:35:21 -05:00
Guthrie Adams 518c6cb760 Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
2021-04-28 12:34:54 -05:00
hershey5045 9ffca4df5d [SMC] UI Updates (#270)
* Update SMC prompt texts. Add progress dialog in shader variant generation script. Add "Generate Shader Variant List" command in context menu for shader files in Asset Browser.
2021-04-28 09:56:55 -07:00
guthadam 33749519db ATOM-15371 Adding missing RHI dependency to Atom tools
This was causing error message spam and possibly other issues when launching the tools.

https://jira.agscollab.com/browse/ATOM-15371
2021-04-28 11:10:55 -05:00
Guthrie Adams 428feb6967 Merge pull request #376 from aws-lumberyard-dev/Atom/guthadam/ATOM-15372
ATOM-15372 Restoring material browser filter logic
2021-04-28 11:00:45 -05:00
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
2021-04-28 00:17:58 -05:00
guthadam 5593350f84 ATOM-15372 Restoring material browser filter logic
Restoring material browser filter logic to only show folders with content that matches the filter.

This change was originally introduced with the functionality to create a new folder within the material browser.  Creating a new, empty folder would not display the folder in the browser because it did not have any content that matched the filter.  While that makes sense to address the issue with the create folder command, it makes it extremely difficult and navigate the browser to find assets that match the filter because every folder that does not match the filter is also displayed in the tree.  We can revisit issues with the create folder action later.

https://jira.agscollab.com/browse/ATOM-15372
2021-04-27 17:12:42 -05:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -07:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
nvsickle fb2ca8e02c Fix Editor crash in test teardown calling set_view_pane_layout
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
2021-04-23 00:26:09 -07:00
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 2021-04-22 16:56:56 -07:00
Guthrie Adams 62d2971103 Merge pull request #227 from aws-lumberyard-dev/Atom/guthadam/ATOM-15221_cherrypick
Cherry picking material editor error message box trace reporting from 1.0 to main
2021-04-22 09:41:07 -05:00
guthadam 215931a1ae Updating trace recorder to allow limiting the number of messages stored 2021-04-21 19:45:53 -05:00
guthadam 0e6fea21fc ATOM-15221 Material Editor: Capturing trace warnings and errors to display in error message boxes
https://jira.agscollab.com/browse/ATOM-15221
2021-04-21 19:45:19 -05:00
mnaumov af00191e82 merge from main 2021-04-21 15:21:03 -07:00
Nicholas Van Sickle 68cc939c6d Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
2021-04-20 12:32:26 -07:00
AMZN-mnaumov f4a57663fa Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
mnaumov d1ba2155c5 PR feedback 2021-04-19 15:55:58 -07:00
Guthrie Adams 2cd2550771 Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
ATOM-5921 Material Editor: Select newly created materials in the asset browser
2021-04-19 17:53:15 -05:00
mnaumov 34be0cd4b5 Fixing string search 2021-04-19 15:31:45 -07:00
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
nvsickle dd7334471f Fix comment punctuation 2021-04-19 15:13:08 -07:00
nvsickle d2fadcb0e3 Fix context menu handling in multi-viewport scenarios (the logic bugs here were many and nuanced, but we're narrowing in on something robust).
Specifically this:
-Ensures key/mouse up event propagation works across multiple viewports
-Ensures that mouse up events for manipulators only get delivered if there's a corresponding mouse down event
-Also tidies up the "are we done processing events this tick?" logic in ViewportManipulatorController
2021-04-19 15:13:06 -07:00
Guthrie Adams 3b4e424d38 Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
AMZN-mnaumov dc7cc77be6 Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
[ATOM-15269] disabling source control thumbnails in material editor
2021-04-19 10:57:03 -07:00
guthadam 8fead27c45 ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
Remove option from presets

Updated code to select current default options

Will data drive default options with editor settings or settings registry in upcoming tasks

https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
guthadam d614b357e5 ATOM-5921 Material Editor: Select newly created materials in the asset browser
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.

https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
mnaumov b3cc14dd5c disabling source control thumbnails in material editor 2021-04-16 18:59:21 -07:00
mnaumov db9b0f141f Double click launches Material Editor 2021-04-16 16:13:39 -07:00
AMZN-mnaumov 40bca24204 Merge pull request #116 from aws-lumberyard-dev/Atom/mnaumov/LYN-3004
[LYN-3004] Moving thumbnail assets to AtomLyIntegration so thumbnails work in Editor
2021-04-16 16:09:44 -07:00
Guthrie Adams c05b83915c Merge pull request #115 from aws-lumberyard-dev/Atom/guthadam/ATOM-15267
[ATOM-15267] Material Editor: Create material dialog respects default standard PBR selection
2021-04-16 17:30:37 -05:00
AMZN-mnaumov b8b90c42e2 Merge pull request #52 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15236
[ATOM-15236] Fixing camera panning and zooming
2021-04-16 15:10:47 -07:00
mnaumov 01a2ea6423 Moving thumbnail assets to AtomLyIntegration 2021-04-16 14:21:20 -07:00
guthadam 854167c68e Ensure default material selection works when dialog is opened
https://jira.agscollab.com/browse/ATOM-15267
2021-04-16 14:53:31 -05:00
AMZN-mnaumov c5c7332642 Merge pull request #92 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14101
[ATOM-14101] Adding "copy name" and "copy path" to Material Editor
2021-04-16 12:23:03 -07:00
guthadam e0b66223e4 Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes 2021-04-16 11:25:59 -05:00
mnaumov d3520ddcf1 Adding "copy name" and "copy path" to Material Editor 2021-04-15 17:59:09 -07:00
guthadam 2baa0db2de Standardizing dialog button boxes across material editor and component
Making dialogs modal

https://jira.agscollab.com/browse/ATOM-15173

https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
qingtao fa7f61cf0d ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
mnaumov 28ccb5d381 Fixing camera panning and zooming 2021-04-14 12:17:45 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
Alex Peterson 921eb742d4 Merge branch 'main' into github/staging 2021-04-13 09:46:26 -07:00
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 2021-04-09 12:40:43 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00