Commit Graph

128 Commits (40f4e8de93791f70a989deae69ff488c25910cfc)

Author SHA1 Message Date
guthadam d7fffe1d80 Merge branch 'main' into Atom/guthadam/LYN-3871_LYN-3872_material_assignment_json_serializer_for_prefabs 5 years ago
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
5 years ago
guthadam d115eae84a LYN-3871/3872 Added JSON serializer for MaterialAssignment property overrides 5 years ago
Chris Santora bc687530e8 Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002 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
greerdv 34abf7376e Merge branch 'main' into transform-float-scale-3 5 years ago
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
5 years ago
greerdv d73566565e remove most vector scale functions from transform bus 5 years ago
greerdv e1e1217c6a
Merge pull request #984 from aws-lumberyard-dev/attachments-transform-scale
update usages of transform vector scale
5 years ago
greerdv c4dafc8495 update usages of transform vector scale 5 years ago
dmcdiarmid-ly 592114bd4f
Merge pull request #887 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-5034
[ATOM-5034] Bake DiffuseProbeGrid textures
5 years ago
Doug McDiarmid 74bdf2b069 Minor changes: Updated comments and removed an include file. 5 years ago
AMZN-mnaumov dd3907c8c4
Merge pull request #951 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15464
[ATOM-15464] Fixing Material Editor crash on shutdown
5 years ago
Doug McDiarmid 045def6ce1 Merge branch 'main' into Atom/dmcdiar/ATOM-5034 5 years ago
mnaumov 09c5bb8d65 [ATOM-15464] Fixing Material Editor crash on shutdown 5 years ago
greerdv 78afeb8047 update more calls to Transform to use uniform scale 5 years ago
greerdv bdf9ac31fb update to use uniform scale calls to Transform 5 years ago
greerdv 92311ddf0d more tidying up 5 years ago
greerdv 945f55378e merge from main 5 years ago
dmcdiar 45ab467274 Merge branch 'main' into Atom/dmcdiar/ATOM-5034
# Conflicts:
#	Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
5 years ago
dmcdiar d6e25bbb33 Added DiffuseProbeGrid texture baking 5 years ago
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.
5 years ago
Chris Santora 8799d1ab54 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 5 years ago
Chris Santora f3099aa7d5 Merge remote-tracking branch 'origin/main' into Atom/santorac/NewLayeringWorkflow 5 years ago
mnaumov 19664dccd2 Merge main 5 years ago
mnaumov 9fc01ea24d AR fixes 5 years ago
greerdv 7def4741cd merge from main 5 years ago
mnaumov 06784a8026 cleanup 5 years ago
mnaumov 44601b7a38 Some refactoring 5 years ago
mnaumov db7afee383 Adding parameters to ACES tone mapping 5 years ago
mrieggeramzn aab4b4a126
Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
Making shadow res of 1024 and bicubic pcf the default
5 years ago
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
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
mriegger 124ca1618a Making shadow res of 1024 and bicubic pcf the default 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
greerdv 655d71e0dd update compatibility of atom components with NonUniformScaleService 5 years ago
mnaumov 7342e62680 Hiding "Open Material" when material asset is assigned 5 years ago
Guthrie Adams ff9d8f7a87
Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
ATOM-15486 Material Editor: Implement layout and user settings
5 years ago
pruiksma 7957d3f8b6 Merge branch 'main' into pruiksma/ATOM-15515 5 years ago
mrieggeramzn d7c72a249c
Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
5 years ago
pruiksma e37b3989be ATOM-15515 Fixing nullptr reference in OnShapeChanged() when visibility is turned back on for shapeless punctual light types. 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
karlberg 1df2fe1d48 Merging latest origin 5 years ago
mrieggeramzn 4d56debe0f
Merge pull request #632 from aws-lumberyard-dev/Atom/mriegger/heatmap
Atom/mriegger/heatmap
5 years ago
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
5 years ago
dmcdiar 4cf9af6c06 Released probe handle when deactivating the controller 5 years ago
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago