Commit Graph

157 Commits

Author SHA1 Message Date
dmcdiarmid-ly d19d2aff9d Merge pull request #1110 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15517
[ATOM-15517] Software Occlusion Culling
2021-06-04 15:21:39 -07:00
dmcdiarmid-ly 579f4ca9d6 Merge pull request #1138 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15718
[ATOM-15718] DiffuseProbeGrid quality level
2021-06-04 15:14:47 -07:00
Guthrie Adams 4a8375748f Merge pull request #1147 from aws-lumberyard-dev/Atom/guthadam/LYN-3871_LYN-3872_material_slot_version_handling
LYN-3871_LYN-3872 Added version handling for removed serialize context fields
2021-06-04 16:05:35 -05:00
guthadam b10ed227c0 Added version handling for removed fields 2021-06-04 13:54:45 -05:00
AMZN-mnaumov 8fa6d5d1b0 Merge pull request #1050 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15631
[ATOM-15631] First pass on exposing Display Mapper properties to Behavior Context
2021-06-04 10:30:04 -07:00
Doug McDiarmid fefa46dd6a Added DiffuseGlobalIlluminationFeatureProcessor and moved the DiffuseProbeGrid files to the DiffuseGlobalIllumination directory 2021-06-04 02:39:25 -07:00
Nicholas Van Sickle 34449e2fc9 Guard GridComponent against arbitrarily high grid sizes (#1135)
Also do bounds checking at runtime in the controller for safety.
2021-06-03 20:09:04 -07:00
Doug McDiarmid 92130b4ac7 Merge branch 'main' into Atom/dmcdiar/ATOM-15718 2021-06-03 18:45:53 -07:00
dmcdiarmid-ly 8ae800f579 Merge pull request #1106 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-13890
[ATOM-13890] Reflection probe quality levels
2021-06-03 17:00:20 -07:00
mnaumov 856204a5ea merge from main 2021-06-03 16:01:27 -07:00
Doug McDiarmid ef05412063 Merge branch 'main' into Atom/dmcdiar/ATOM-15517 2021-06-03 13:31:18 -07:00
Doug McDiarmid ed0fab894b Added DiffuseGlobalIllumination level component 2021-06-03 13:30:28 -07:00
AMZN-mnaumov c155271167 Merge pull request #1095 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15692
[ATOM-15692] Ebus for registering custom feature processors for thumbnail generation
2021-06-03 13:29:37 -07:00
mnaumov 8704b9233a build fix 2021-06-03 10:53:00 -07:00
Doug McDiarmid d63edf9b84 Merge branch 'main' into Atom/dmcdiar/ATOM-15517 2021-06-02 19:09:48 -07:00
mnaumov c3df73bed8 PR feedback and fixing TrackView 2021-06-02 18:48:50 -07:00
Doug McDiarmid 9dbe596e40 Added reflection probe cubemap quality levels 2021-06-02 18:39:05 -07:00
mnaumov 4f72e49ad4 Merge main 2021-06-02 13:40:33 -07:00
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
Doug McDiarmid 35d7ee5e53 Merge branch 'main' into Atom/dmcdiar/ATOM-15517 2021-06-02 00:10:55 -07:00
mnaumov d7ae88c17b Adding cmake change 2021-06-01 20:24:52 -07:00
mnaumov 3fcc1b64fc [ATOM-15692] Ebus for registering custom feature processors for thumbnail generation 2021-06-01 20:24:23 -07:00
mnaumov 38819c630a PR feedback 2021-06-01 15:34:01 -07:00
guthadam d115eae84a LYN-3871/3872 Added JSON serializer for MaterialAssignment property overrides 2021-06-01 11:43:05 -05:00
Doug McDiarmid 59ab6edaef Added occlusion culling plane visualization 2021-05-31 01:38:13 -07:00
mnaumov ab45ea7efa [ATOM-15631] First pass on exposing Display Mapper properties to Behavior Context 2021-05-28 17:15:20 -07:00
Chris Santora bc687530e8 Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002 2021-05-28 14:37:41 -07:00
Doug McDiarmid 1b235e0b16 Merge branch 'main' into Atom/dmcdiar/ATOM-15517 2021-05-28 13:43:26 -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
Doug McDiarmid 1d3322f881 Merge branch 'main' into Atom/dmcdiar/ATOM-15517 2021-05-27 01:25:38 -07: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
Doug McDiarmid 17e9c17f31 Added Occlusion Culling Planes and RPI Culling support for Masked Occlusion Culling 2021-05-26 19:18:18 -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