Commit Graph

128 Commits

Author SHA1 Message Date
guthadam d7fffe1d80 Merge branch 'main' into Atom/guthadam/LYN-3871_LYN-3872_material_assignment_json_serializer_for_prefabs 2021-06-02 11:21:57 -05:00
Tom Hulton-Harrop 4a5b7edbfe Updates to kd-tree ray intersection - ATOM-15673 (#1026)
* updates to kd-tree ray intersection

* update tests for kd-tree

* add one more test for kd-tree intersection

* updates to ModelKdTree following review feedback

* improve api doc comment for RayIntersection in ModelKdTree

* updates following review feedback

* update .clang-format to stack parameters if they do not all fit on one line
2021-06-02 09:20:45 +01:00
guthadam d115eae84a LYN-3871/3872 Added JSON serializer for MaterialAssignment property overrides 2021-06-01 11:43:05 -05:00
Chris Santora bc687530e8 Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002 2021-05-28 14:37:41 -07: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
greerdv 34abf7376e Merge branch 'main' into transform-float-scale-3 2021-05-28 19:14:45 +01:00
Tom Hulton-Harrop 36ceff84c9 Support mesh intersection for camera orbit (#982)
* wip support for mesh intersection with intersector bus

* WIP camera mesh intersection orbit logic

* remove unneeded template argument

* add bus connect/disconnect

* fix intersection logic

* small updates, additional comments, some tidy-up

* update formatting options slightly

* use aznumeric_cast

* temp workaround for negative distances with RayIntersection
2021-05-28 14:37:17 +01:00
greerdv d73566565e remove most vector scale functions from transform bus 2021-05-28 14:18:26 +01:00
greerdv e1e1217c6a Merge pull request #984 from aws-lumberyard-dev/attachments-transform-scale
update usages of transform vector scale
2021-05-27 18:24:16 +01:00
greerdv c4dafc8495 update usages of transform vector scale 2021-05-27 12:54:13 +01:00
dmcdiarmid-ly 592114bd4f Merge pull request #887 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-5034
[ATOM-5034] Bake DiffuseProbeGrid textures
2021-05-27 00:03:54 -07:00
Doug McDiarmid 74bdf2b069 Minor changes: Updated comments and removed an include file. 2021-05-26 20:25:48 -07:00
AMZN-mnaumov dd3907c8c4 Merge pull request #951 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15464
[ATOM-15464] Fixing Material Editor crash on shutdown
2021-05-26 20:23:04 -07:00
Doug McDiarmid 045def6ce1 Merge branch 'main' into Atom/dmcdiar/ATOM-5034 2021-05-26 19:23:06 -07:00
mnaumov 09c5bb8d65 [ATOM-15464] Fixing Material Editor crash on shutdown 2021-05-26 06:29:09 -07:00
greerdv 78afeb8047 update more calls to Transform to use uniform scale 2021-05-26 10:26:26 +01:00
greerdv bdf9ac31fb update to use uniform scale calls to Transform 2021-05-25 22:31:41 +01:00
greerdv 92311ddf0d more tidying up 2021-05-25 15:43:04 +01:00
greerdv 945f55378e merge from main 2021-05-24 11:27:43 +01:00
dmcdiar 45ab467274 Merge branch 'main' into Atom/dmcdiar/ATOM-5034
# Conflicts:
#	Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
2021-05-21 18:22:59 -07:00
dmcdiar d6e25bbb33 Added DiffuseProbeGrid texture baking 2021-05-21 03:26:29 -07:00
Chris Santora bffc72794b ATOM-15597 Accessing Material Instance Panel Crashes Editor
There were two issues fixed here. First, I broke the material inspector with my changes at 53188a12da which added support for hiding entire property groups. I'm not sure how this happened because I definitely tested the MaterialComponent's material inspector. Perhaps there was a bad merge or something otherwise got clobbered after testing and before committing. Anyway, this issue was I accidentally delete the code that prepared the list of material properties for functor processing.

The second issue was the MaterialFunctor class needs to return null when metadata can't be found; it was proceeding to dereference an end iterator.

Testing:
Successfully opened the material inspector through the MaterialComponent. Was able to change property flags in the inspector and see other properties change visibility as expected.
2021-05-20 22:24:19 -07:00
Chris Santora 8799d1ab54 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-20 09:07:08 -07:00
Chris Santora f3099aa7d5 Merge remote-tracking branch 'origin/main' into Atom/santorac/NewLayeringWorkflow 2021-05-19 16:57:49 -07:00
mnaumov 19664dccd2 Merge main 2021-05-19 16:10:44 -07:00
mnaumov 9fc01ea24d AR fixes 2021-05-19 11:51:42 -07:00
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
mnaumov 06784a8026 cleanup 2021-05-18 22:50:13 -07:00
mnaumov 44601b7a38 Some refactoring 2021-05-18 22:45:43 -07:00
mnaumov db7afee383 Adding parameters to ACES tone mapping 2021-05-18 22:38:27 -07:00
mrieggeramzn aab4b4a126 Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
Making shadow res of 1024 and bicubic pcf the default
2021-05-18 09:13:49 -07:00
AMZN-mnaumov d0daab4fe0 Merge pull request #710 from aws-lumberyard-dev/Atom/mnaumov/LYN-3529
[LYN-3529] Hiding "Open Material Editor" when material asset is assigned
2021-05-13 17:15:03 -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
mriegger 124ca1618a Making shadow res of 1024 and bicubic pcf the default 2021-05-12 20:51:56 -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
greerdv 655d71e0dd update compatibility of atom components with NonUniformScaleService 2021-05-12 22:16:14 +01:00
mnaumov 7342e62680 Hiding "Open Material" when material asset is assigned 2021-05-11 19:33:46 -07:00
Guthrie Adams ff9d8f7a87 Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
ATOM-15486 Material Editor: Implement layout and user settings
2021-05-11 13:09:39 -05:00
pruiksma 7957d3f8b6 Merge branch 'main' into pruiksma/ATOM-15515 2021-05-10 19:45:09 -05:00
mrieggeramzn d7c72a249c Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
pruiksma e37b3989be ATOM-15515 Fixing nullptr reference in OnShapeChanged() when visibility is turned back on for shapeless punctual light types. 2021-05-10 15:31:33 -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
karlberg 1df2fe1d48 Merging latest origin 2021-05-07 16:28:11 -07:00
mrieggeramzn 4d56debe0f Merge pull request #632 from aws-lumberyard-dev/Atom/mriegger/heatmap
Atom/mriegger/heatmap
2021-05-07 09:43:53 -07:00
dmcdiarmid-ly 8afb35cb10 Merge pull request #633 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15063
[ATOM-15063] Toggling visibility on a reflection probe does not disable rendering
2021-05-06 20:54:56 -07:00
dmcdiar 4cf9af6c06 Released probe handle when deactivating the controller 2021-05-06 19:47:35 -07:00
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-06 19:40:09 -07:00