Commit Graph

102 Commits

Author SHA1 Message Date
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:19 -05:00
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:17 -05:00
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:14 -05:00
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:12 -05:00
Dayo Lawal 81c3414cd1 Adding back OnOutput to MaterialEditor for override
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:10 -05:00
Dayo Lawal e45028c9d8 Fixing MaterialEditorApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:03 -05:00
Dayo Lawal 31a2ccb041 Addressing change requests for pull request
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:29:01 -05:00
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:28:58 -05:00
Dayo Lawal 5872138671 AzQtApplication 2
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:28:53 -05:00
Dayo Lawal d3d9b600f9 AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:28:51 -05:00
Dayo Lawal 975be6a480 MaterialEditor inheriting from ToolsApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-07-13 19:28:49 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-29 14:00:11 -05:00
guthadam 104e24519c ATOM-15861 fixed material editor screen capture and test scripts 2021-06-25 11:57:29 -05:00
Qing Tao c29cfaafa4 ATOM-15287 Materials Disappear When Hot Reloading Parent Materials (#1532)
The issue was because the material wasn't compiled when creating the draw packet
2021-06-23 16:23:40 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
mnaumov 5a276b11b0 Fixing includes 2021-06-21 16:56:06 -07:00
mnaumov 4de1d90994 [ATOM-15292] Camera no longer resets when typing something 2021-06-21 16:52:05 -07:00
guthadam 7e231c8e36 LYN-4547 prepending O3DE to the material editor application name 2021-06-16 23:37:43 -05:00
guthadam 1339d453fc Adding PAL implementation for Linux 2021-06-09 13:21:59 -05:00
guthadam af42705bc9 Fixing linux build 2021-06-09 12:49:35 -05:00
guthadam 6675d06b67 Fixing linux build 2021-06-09 12:32:55 -05:00
guthadam 0fbeec7f17 Enabling linux compilation 2021-06-09 11:57:21 -05:00
guthadam d67628d88c ATOM-15701 changed material inspector highlight color 2021-06-07 18:23:40 -05:00
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
2021-05-28 13:38:56 -07:00
guthadam c2822a4063 ATOM-15649 sorting material types in create material dialog 2021-05-27 13:17:51 -05:00
greerdv d8b74110ff Merge branch 'main' into transform-float-scale 2021-05-25 16:28:28 +01:00
AMZN-mnaumov 5788c379bb Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
2021-05-24 21:51:33 -07:00
mnaumov 78451c5898 PR feedback 2021-05-24 17:34:04 -07:00
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 2021-05-24 23:01:29 +01:00
AMZN-mnaumov 26a1b96380 Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463
[ATOM-15463] Adjusting combo box width
2021-05-24 12:03:37 -07:00
guthadam a05b131cc8 ATOM-15612 fix material editor crash when group doesn't exist 2021-05-24 10:39:55 -05:00
greerdv 945f55378e merge from main 2021-05-24 11:27:43 +01:00
mnaumov 6ee8c6daa5 [ATOM-15538] Material Editor camera zoom speed adjusts to model size 2021-05-21 20:34:42 -07:00
mnaumov 5c18c6ee47 Adjusting combo box width 2021-05-21 19:54:13 -07:00
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
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.
2021-05-13 09:39:01 -07:00
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
2021-05-12 23:28:05 -07:00
Chris Santora 37a1b77d50 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-12 17:45:28 -07:00
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.
2021-05-12 17:06:57 -07:00
Guthrie Adams e915133bbf Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128
ATOM-15128 replacing material editor icon
2021-05-11 13:10:09 -05:00
guthadam cf0d3af78e ATOM-15128 replacing material editor icon 2021-05-10 18:02:26 -05:00
guthadam 9725c9beab Recording/restoring viewport settings group expansion 2021-05-10 12:05:15 -05:00
guthadam 5437843390 Created material editor settings dialog
Activated settings menu option
Moved viewport camera controller initialization before viewport settings restoration
2021-05-09 12:34:55 -05:00
guthadam 1dda6dabe4 Added support for expanding/collapsing material inspector groups by name
Saving/restoring material inspector group expansion state
2021-05-08 00:57:16 -05:00
guthadam 9de3071e21 Merge branch 'main' into Atom/guthadam/ATOM-15486 2021-05-07 20:20:17 -05:00
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
2021-05-07 20:16:05 -05:00
AMZN-mnaumov 1743d9631b Merge pull request #634 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14850
[ATOM-14850] Re-adding 'Create Material' to folder context menu
2021-05-07 12:04:44 -07:00
mnaumov ff75a39526 Restoring 'Create New Material' to folder context menu 2021-05-06 20:02:10 -07:00
mnaumov dfd0cbb0fd Material Editor camera controller zoom respects viewport boundary 2021-05-06 13:10:55 -07:00