b407e501e3
Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion
2021-07-30 14:54:14 -07:00
13679a7cc3
Reverted partial support for property overrides on default material assignments. This needs more UI design discussion first.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:15 -07:00
1a478608a7
Restored the previous behavior of preventing material property overrides when there is no explicit material override assignment.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:12 -07:00
b19a895889
Reverted accidentally commented out code.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:10 -07:00
6fa891848d
Factored out redundant call to GetMaterialSlots().
...
Removed code that was intended to handle duplicate default material assignments, but duplicacate default material assignments aren't possible yet.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:09 -07:00
21d5baa184
Fixed an issue where I had changed prior functionality by mistake, preventing exported materials from replacing material assignments.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:07 -07:00
abec7a4f5b
Fixed an issue where a default material should show up as a filled-in value in the UI even though it should appear as empty, indicating the default is being used.
...
Also, I'm going back on what I said in my last commit, and removing the converter for version 3 in EditorMaterialComponent::ConvertVersion. The code that I had put in before wouldn't work because it was relying on the new m_defaultMaterialAsset which will be empty for old data. The only way we could support version conversion is if we preserve legacy versions of multiple types like EditorMaterialComponentSlot and MaterialAssignmentId. Since this serialization version is old and pre-dates the public release of O3DE, it's unlikely that we need to continue supporting this version so isn't worth maintaining.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:06 -07:00
75b4d62dcb
Restored the version converter EditorMaterialComponent::ConvertVersion for version 3, which wasn't possible with an earlier version of my changes.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:04 -07:00
fec79a7d53
Moved the material slot list from ModelLodAsset to ModelAsset, so all the slots live in one main list. This removes data duplication between LODs and cleans up the code a bit.
...
I had to update the ModelLod class to take in both the ModelLodAsset and ModelAsset for initialization so it can fetch the slots for each mesh.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:02 -07:00
28671c8546
Addressed suggestions from gadams3 to make EditorMaterialComponent get the default material assets from its own data rather than fetching them from the asset. Presumably this should give more reliable behavior.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:40:57 -07:00
e145ce1d01
Updated EditorMaterialComponentSlot to support editing property overrides and UV overrides for the material, regardless of whether there is a material override or not.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:40:56 -07:00
670dd6c5bc
Removed the GetLabelByAssetId function since now we can use the display name that comes with the ModelMaterialSlot.
...
Updated OpenMaterialExporter() to account for the fact that multiple material slots can have the same default material asset.
Updated the material inspector to sort material slots by name to match the order in the Material Component.
Updated ExportItem to protect its data members, which makes it more clear that assetId and materialSlotName are readonly inputs.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:40:54 -07:00
e3ceaa477e
Added a version converter for MaterialAssignmentId. This allowed me to successfully load the Sponza level in AtomTest.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:40:53 -07:00
14d2e38b90
Refactored how model material slots work in preparation to support more flexible material conversion options for the scene asset pipeline. The material slot IDs are based on the MaterialUid that come from SceneAPI. Since these IDs are also used as the AssetId sub-ID for the converted material assets, the system was just checking the material asset sub-ID to determine the material slot ID. But in order to support certain FBX material conversion options, we needed to break this tie, so the slot ID is separate from the AssetId of the material in that slot. This will allow some other material to be used in the slot, instead of being forced to use one that was generated from the FBX.
...
Here we inttroduce a new struct ModelMaterialSlot which formalizes the concept of material slot, with an ID, display name, and default material assignment. The ID still comes from the MaterialUid like before. The display name is built-in, rather than being parsed out from the asset file name. And the default material assignment can be any material asset, it doesn't have to come from the FBX (or other scene file).
This commit is just the preliminary set of changes. Cursory testing shows that it works pretty well but more testing is needed (and likely some fixes) before merging.
Here is what's left to do...
Add serialization version converters to preserve prior prefab data.
See if we can get rid of GetLabelByAssetId function only rely on the display name inside ModelMaterialSlot.
I'm not sure if the condition for enabling the "Edit Material Instance..." context menu item is correct.
Test actors
Lots more testing in general
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:40:51 -07:00
ffbeb903c1
Material Component: Add functions to lookup material ids by name
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-07-29 18:09:40 -05:00
33c408f654
Expose shadow bias to component & feature processors. ( #2406 )
...
* Expose shadow bias to component & feature processors. Shadow bias now works more consistently with various near / far shadow planes and caster positions. Bias now also affects esm shadows which helps eliminate acne in certain situations.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Adding jira comment to light configuration serialization version. Improved comment on final adjustment to bias before its sent to the shader.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Hooking up bias to behavior context.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-27 11:31:05 -07:00
9639003a7d
LYN-4774 Fix missing box icons inside the main Viewport ( #2297 )
...
* LYN-4774 Fix missing box icons inside the main Viewport
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* V2 icons
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Bug fixes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-07-21 16:33:04 -07:00
e76b65fce9
Reduce inclusion overhead a little bit
...
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-07-20 02:31:38 +02:00
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com >
2021-07-16 15:25:48 -07:00
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-12 10:45:23 -05:00
ed33b429aa
Updating some labels in the directional light and light components… ( #1996 )
...
* Updating some labels in the directional light and light components to make them more readable and consistent with standards. Removed hard caps on directional light intensity.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-09 13:56:46 -07:00
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-08 13:56:47 -05:00
6d9230e292
ATOM-15939 Add support to capture attachment for ParentPass ( #1887 )
...
* ATOM-15939 Add support to capture attachment for ParentPass
- Moved the attachment read back support to Pass class so it supports both ParentPass and RenderPass.
- Added support to output input or output state of an InputOutput attachment.
- Enabled showing ParentPass attachments in PassTree tool.
Signed-off-by: Tao <qingtao@amazon.com >
2021-07-08 08:23:37 -07:00
6c0264862e
Removing unnecessary code
...
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-07 18:05:36 -05:00
a75b8eb636
[LYN-3913] Fix conversion to unsupported photometric unit on light type change.
...
When converting to a light type that doesn't support the currently used photometric unit, the editor component will convert the photometric unit to the universally supported lumen.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-07 18:00:40 -05:00
b9964bbb5a
Fixed Material Editor not launching ( #1920 )
...
* Fixed Material Editor not launching
Explicitly providing project-path as part of launch parameters.
Signed-off-by: Lloyd Tullues <lloyd@carbonated.com >
* Update Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Signed-off-by: Lloyd Tullues <lloyd@carbonated.com >
* Minor - adding whitespace for consistency
Signed-off-by: Lloyd Tullues <lloyd@carbonated.com >
Co-authored-by: Lloyd Tullues <lloyd@carbonated.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-07 15:16:09 -07:00
02922806a5
Updated gem.json for all top-level Gems. ( #1715 ) ( #1917 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com >
2021-07-07 13:29:33 -05:00
aca8a730a6
Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
...
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-06 19:42:12 -05:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
40f9761f86
Fixed more copyright header issues caused by script replacement
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:21:26 -05:00
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
e9dd032a75
Updated gem.json for all top-level Gems. ( #1715 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-02 15:23:10 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
e13b9ca829
[ATOM-15926] Fixing light delegates which were always calculating the attenuation radius automatically for their debug display instead of respecting the user-set attenuation radius. ( #1732 )
...
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-01 21:49:32 -05:00
e14000e2e2
Merge pull request #1713 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15922
...
[ATOM-15922] ReflectionProbe does not refresh when changed to use an Authored cubemap
2021-07-01 13:24:31 -07:00
4c4be73bd5
First pass FBX -> Scene File conversion. ( #1699 )
...
This is the simple pass, minimizing code changes and focused on comments.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-07-01 08:53:47 -07:00
ff9d52d38e
Merge pull request #1705 from aws-lumberyard-dev/Atom/guthadam/ATOM-15908
...
ATOM-15908 Fixed material component exporter to use correct relative paths
2021-07-01 10:32:16 -05:00
658c974db9
Properly handled reinitializing the cubemap asset when it is changed between Baked and Authored
...
Signed-off-by: dmcdiar <dmcdiar@amazon.com >
2021-06-30 20:15:30 -07:00
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
4c28c9d894
ATOM-15908 Fixed material component exporter to use correct relative paths
...
Signed-off-by: guthadam <guthadam@amazon.com >
2021-06-30 17:14:34 -05:00
89f4872469
Merge pull request #1674 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15902
...
[ATOM-15902] Reflection probes occasionally fail to hot-reload
2021-06-30 11:36:52 -07:00
09aba94da7
Fixes for ReflectionProbe hot reloading
...
Signed-off-by: dmcdiar <dmcdiar@amazon.com >
2021-06-30 00:40:30 -07:00
c4a20405e2
Merge pull request #1666 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14526
...
[ATOM-14526] DiffuseProbeGrid and ReflectionProbe components alter box shape size
2021-06-29 23:27:38 -07:00
48c5854666
Merge pull request #1621 from aws-lumberyard-dev/Atom/mnaumov/LYN-4544cherryPick
...
[LYN-4544] Fixing thumbnail crashing on bad data
2021-06-29 18:48:41 -07:00
64186b4ec6
ATOM-15892 fixing material component clear overrides button
...
The clear material override properties button was not sending the notification to update the entity or undo state.
Signed-off-by: guthadam <guthadam@amazon.com >
2021-06-29 18:45:40 -05:00
b65a2da548
Changed the DiffuseProbeGrid and ReflectionProbe components to only override the Box size if it's at the default (unit)
...
Signed-off-by: dmcdiar <dmcdiar@amazon.com >
2021-06-29 16:10:03 -07:00
f905b71844
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 13:48:45 -07:00
c45ec34f16
Add max value for editor bloom intensity. ( #1630 )
...
Signed-off-by: Robin <rbarrand@amazon.com >
2021-06-28 19:20:03 -07:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
0b28c15637
[LYN-4544] Fixing thumbnail crashing on bad data
...
Signed-off-by: mnaumov <mnaumov@amazon.com >
2021-06-28 11:17:49 -07:00
santorac
Chris Santora
Guthrie Adams
Ken Pruiksma
sphrose
nemerle
Steve Pham
Chris Galvan
Qing Tao
Twolewis
lumberyard-employee-dm
Mike Cronin
dmcdiarmid-ly
AMZN-stankowi
Guthrie Adams
dmcdiar
AMZN-mnaumov
Gene Walters
hershey5045
mnaumov