Commit Graph

46 Commits (c29cfaafa4972f02410f0609a84a3e2e5c6375a3)

Author SHA1 Message Date
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
guthadam 7e231c8e36 LYN-4547 prepending O3DE to the material editor application name 5 years ago
guthadam af42705bc9 Fixing linux build 5 years ago
guthadam 6675d06b67 Fixing linux build 5 years ago
guthadam d67628d88c ATOM-15701 changed material inspector highlight color 5 years ago
Chris Santora de4e6957e8 Made a bunch of display name and description updates to core material types.
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
5 years ago
guthadam c2822a4063 ATOM-15649 sorting material types in create material dialog 5 years ago
mnaumov 5c18c6ee47 Adjusting combo box width 5 years ago
Chris Santora 70c8ef99ef Updates in response to code review, from gadams3.
Cleaned up code around MaterialFunctor's QueryMaterialPropertyMetadata and QueryMaterialPropertyGroupMetadata.
Removed unnecessary "groupHeader->setObjectName(...)"
Simplified code in MaterialInspector::OnDocumentPropertyGroupVisibilityChanged.
5 years ago
Chris Santora e429c8e06a Fixed issues after merging latest main, as well as some edge cases I didn't notice before.
The structure of InspectorWidget::m_groups changed, so I had to update my new code accordingly.
Updated the InspectorWidget::m_groups code a bit to be more readable.
Discovered the initial property group visiblity state wasn't being set correctly when a material was first opened, so groups weren't initially hidden when they should have been. This had to be fixed in different ways for MaterialEditor's inspector and MaterialComponent's inspector.

ATOM-14688 Disable Individual Layers
5 years ago
Chris Santora 37a1b77d50 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 5 years ago
Chris Santora 53188a12da Made StandardMultilayerPBR hide a layer's property groups when that layer is disabled.
ATOM-14688 Disable Individual Layers

- Added new SetMaterialPropertyGroupVisibility functions to the material functors.
- Updated the MaterialFunctor::EditorContext to include parameters for handling material property group metadata.
- Updated the material inspector(s) to apply the property group visiblity changes from the material functor, to hide or show the property groups.
- Moved some code from MaterialPropertyDescriptor.h/cpp to a new MaterialDynamicMetadata.h/cpp, since these aren't really related to the MaterialPropertyDescriptor code. It's more for material functors to use.
- Also fixed the casing for the "GetMaterialPropertyValue_Image" lua function, since I was already in this code (ATOM-14793 "Fix Inconsistent Casing For LuaMaterialFunctorRuntimeContext")

Tested in MaterialEditor and in in the main Editor's MaterialComponent property override inspector.
5 years ago
Guthrie Adams e915133bbf
Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128
ATOM-15128 replacing material editor icon
5 years ago
guthadam cf0d3af78e ATOM-15128 replacing material editor icon 5 years ago
guthadam 9725c9beab Recording/restoring viewport settings group expansion 5 years ago
guthadam 5437843390 Created material editor settings dialog
Activated settings menu option
Moved viewport camera controller initialization before viewport settings restoration
5 years ago
guthadam 1dda6dabe4 Added support for expanding/collapsing material inspector groups by name
Saving/restoring material inspector group expansion state
5 years ago
guthadam 9de3071e21 Merge branch 'main' into Atom/guthadam/ATOM-15486 5 years ago
guthadam e9165ed911 Added save state keys to most of the RPEs in the material editor and component to save expand/collapse state
Saving main window fancy docking state so all of the dock widgets save/restore visibly and positioning

Added window decoration wrapper inside material editor main window for saving/restoring window position, size, state

Added object names to several QT widgets so that their state could be captured and restored
5 years ago
mnaumov ff75a39526 Restoring 'Create New Material' to folder context menu 5 years ago
guthadam e80de63d55 ATOM-15486 Saving material editor user settings
https://jira.agscollab.com/browse/ATOM-15486
5 years ago
guthadam 80f692118b ATOM-15451 always bring material editor and foreground when launching
Bus, command line option, and handler to activate material editor window
Made sure that material editor action in Ly tools menu is not checked/checkable
Ly editor pushes command line option to use the same RHI

https://jira.agscollab.com/browse/LYN-2610
https://jira.agscollab.com/browse/ATOM-15451
https://jira.agscollab.com/browse/ATOM-13742
5 years ago
mnaumov 6a0df12de2 PR feedback 5 years ago
mnaumov 3ae4bb22df Adding tone mapping option to Material Editor 5 years ago
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
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
mnaumov af00191e82 merge from main 5 years ago
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…
5 years ago
mnaumov d1ba2155c5 PR feedback 5 years ago
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
5 years ago
mnaumov 34be0cd4b5 Fixing string search 5 years ago
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
5 years ago
AMZN-mnaumov dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
[ATOM-15269] disabling source control thumbnails in material editor
5 years ago
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
5 years ago
mnaumov b3cc14dd5c disabling source control thumbnails in material editor 5 years ago
mnaumov db9b0f141f Double click launches Material Editor 5 years ago
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
5 years ago
guthadam 854167c68e Ensure default material selection works when dialog is opened
https://jira.agscollab.com/browse/ATOM-15267
5 years ago
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
5 years ago
mnaumov d3520ddcf1 Adding "copy name" and "copy path" to Material Editor 5 years ago
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
5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago