Commit Graph

280 Commits

Author SHA1 Message Date
guthadam 58d516688f LYN-4251 fix confusing material component menu options 2021-06-16 22:57:20 -05:00
mnaumov b315c13488 [LYN-4544] Fixing thumbnail crashing on bad data 2021-06-16 20:26:04 -07:00
mrieggeramzn a505ed8a51 Merge pull request #1302 from aws-lumberyard-dev/Atom/mriegger/esmexponent2106
Atom/mriegger/esmexponent2106
2021-06-16 10:47:26 -07:00
AMZN-mnaumov c0dc0cb936 Merge pull request #1337 from aws-lumberyard-dev/mnaumov/StabilizationJun15
Stabilization to Development merge - 06/15/21
2021-06-15 15:42:04 -07:00
yuriy0 a9c55c1070 Update actor render bounding box (#991)
* Extend MeshFeatureProcessor to allow changing the mesh bbox, which requires re-compute the culling data for that mesh

* Update actor mesh bbox when EMFX actor instance bbox changes.

Also use the actor instance global bbox to compute the local bbox for the skinned render mesh, instead of the using the static bounds based bbox, as not every actor instance is going to be using the static bounds bbox.

* Store per-instance mesh AABB in the right place.

In the MeshInstanceData, which is unique per instance, instead of in the Model, which is shared between all instances.

For greater clarity, also remove Model::m_aabb and the corresponding getter and setter, as it isn't immediately obvious whether this gets the model asset bbox or the mesh instance bbox. Callers should instead be explicit about which bbox they want.

* Bug fix: model asset is not necessarily ready in AcquireMesh

* Remove now-unused forward declaration

* Update MockMeshFeatureProcessor with SetLocalAabb/GetLocalAabb
2021-06-15 13:09:30 -05:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
Ken Pruiksma 5165f6ad04 [ATOM-15769] Setting minimum angle to 0.5 degrees on disk lights to avoid visual artifacts that occur at values closer to 0. Also updating the outer cone angle max to be 90 degrees since it's measured from the center point, not all the way across. (#1260) 2021-06-14 19:09:27 -05:00
dmcdiarmid-ly 0f851b1d16 Merge pull request #1296 from aws-lumberyard-dev/Atom/dmcdiar/LYN-4346
[LYN-4346] Adding the Diffuse Global Illumination component crashes the Editor (Prefab Mode)
2021-06-14 10:18:13 -07:00
Benjamin Jillich f8cf4ba087 [LYN-3416] Animation: Attachment component does not update it's location automatically (#1305) 2021-06-14 17:34:29 +02:00
mriegger 4ac846383a Fixes from feedback 2021-06-13 23:13:43 -07:00
mriegger 86223703e4 removing tabs 2021-06-13 23:13:21 -07:00
mriegger 959ec14df6 Exposing esm exponent 2021-06-13 23:07:10 -07:00
Doug McDiarmid 8459cbe5c2 Removed the DiffuseGlobalIllumination component from the editor Entity Component list, it was intended to be a Level Component only.
Checked for a valid quality level in DiffuseGlobalIlluminationFeatureProcessor::SetQualityLevel.
Initialized the quality level to Low in DiffuseGlobalIlluminationComponentConfig.
2021-06-12 01:18:24 -07:00
AMZN-mnaumov 004549c618 Merge pull request #1201 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5389
[ATOM-5389] MeshComponent stats
2021-06-11 11:20:25 -07:00
mnaumov 68c0989aa1 MeshStats collapsed by default 2021-06-10 17:38:13 -07:00
mnaumov d53b5a0bed PR feedback 2021-06-10 14:37:02 -07:00
mnaumov e1d2115cab ElementName override 2021-06-10 12:05:30 -07:00
Terry Michaels 91fb8be535 Added toolbar icons, updated viewport header UX (#1240) 2021-06-10 11:42:25 -05:00
mnaumov 95465b18a4 Custom serializer for mesh stats to exclude from serializetion 2021-06-09 21:15:10 -07:00
mnaumov 1f2572fe8a PR feedback 2021-06-09 13:26:42 -07:00
mnaumov e07cf79bab removed duplicate decription 2021-06-08 19:37:43 -07:00
mnaumov 2923d8b962 some cleanup 2021-06-08 19:35:40 -07:00
mnaumov 672b9fd956 [ATOM-5389] MeshComponent stats 2021-06-08 19:21:40 -07:00
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