Add import dialog to add a new diffusion profile to the global settings #4743

FrancescoC-unity · 2021-06-01T16:23:02Z

Addressing https://unity.slack.com/archives/C6Y79CZM0/p1621941147179000

This PR introduces a dialog on import of a material with a diffusion profile. The user can then add a diffusion profile automatically to the global settings if there is space for it.

diffusionProfileLoad.mp4

Added Vic as I am not sure the wording on the dialog box is good enough :D

Adding @alelievr as I remember you worked on diffusion profiles? Ignore this review if I am misremembering.

What did I test: can see the video above, I also tested that an already added profile doesn't prompt a dialog box and if there is no space in the diffusion profile list similarly no dialog is displayed.

* Fix AxF debug output in certain configurations. * Update comment

* Fix white flash * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Show info box when ray tracing is enabled. * Changelog * Move below MSAA Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

…phics Compositor enabled (#4593) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Reconstruct jittered projection matrix far plane (for Infinite ) * Changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

…DRP's lifecycle. (#4688) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix overdraw in custom pass utils blur function * Updated changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix * changelog * Force sync compilation for TAA Co-authored-by: CifaCia <f.cifariellociardi@gmail.com> Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

…4599)" This reverts commit 2325e3f.

…side is updated. (case 1335737, related to 1314040) (#4691) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

…positor (#4599)"" This reverts commit 30fffd5.

… the Graphi

…ing only the RTSSS Data (case 1332904). (#4626) * Fixed the ray traced sub subsurface scattering debug mode not displaying only the RTSSS Data (case 1332904). * Add test scene Co-authored-by: Remi Chapelain <remi.chapelain@unity3d.com> Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

…e refraction and probe refraction (#4653) * Delete the second transmittance mul * Changelog Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

#4636) * Initialize the shading normal to a non-zero value for anisotropy * Changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix VfX lit particle aov output color space * Update comment Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed issue with transparent unlit. * Updated changelog. * Reverted accidental change to default mtl. Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

…cal volumetric fog volume (#4728) * Fixed nullref when deleting the 3D mask of a density volume (case 1339330) * Updated changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

FrancescoC-unity · 2021-06-02T09:43:21Z

Quickly tested with importing material samples since there's 7 differents diff profile there.

And the only thing that fails is for Eye shader. There's this node that takes 2 diff profile in input that are not included in the batch in material importer. Is there something we can do about this since this is node accessible by everyone in utility SG nodes ?

Also, since there's an upper limit of diffusion profile that can be added (weirdly 15), when your list is nearly full, when importing new materials with new diff profile, the new one gets added and then when the list is full, the rest are just skipped without info, is there a way to have either some sort of pop up telling you that the list is full, or a warning for each diffusion profile skipped and the reason why, for the users to know that something just failed silently ? :)

Thanks !

Oh didn't know about the Eye diffusion profiles, I can look into that later on today, though I am not entirely what I can do about it.

Regarding the silently fail, I thought about that but then if you load a lot of assets, you'll end up with potentially a lot of dialog stopping the process saying the same thing which sounds annoying.

I guess what I can do the warning at the end of process in the console.

Vic-Cooper

One small adjustment to the changelog.

Vic-Cooper · 2021-06-02T09:47:35Z

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a slider that controls how much the volumetric clouds erosion value affects the ambient occlusion term.
 - Added three animation curves to control the density, erosion, and ambient occlusion in the custom submode of the simple controls.
 - Added support for the camera bridge in the graphics compositor
+- Added a dialog box on import to add a diffusion profile to the global settings.


Tweaked for clarity:

Added a dialog box when you import a Material that has a diffusion profile to add the diffusion profile to global settings.

remi-chapelain · 2021-06-02T10:13:22Z

I guess what I can do the warning at the end of process in the console.

I am fine with this solution, I agree, it can be hassle when importing huge asset pack !

remi-chapelain

Issues have been addressed :), approving ✔️

alelievr · 2021-06-02T15:11:24Z

com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs

+                AddDiffusionProfileToSettings("_DiffusionProfileAsset");
+
+                // Special Eye case that uses a node with diffusion profiles.
+                if (HDShaderUtils.GetShaderIDsFromShader(material.shader).Item1 == HDShaderUtils.ShaderID.SG_Eye)


All shadergraphs can have a diffusion profile now with the diffusion profile type in the blackboard:

This leads to this code being generated:

[DiffusionProfile]gtuiewwg("gtuiewwg", Float) = 0 [HideInInspector]gtuiewwg_Asset("gtuiewwg", Vector) = (0, 0, 0, 0)

Thus, you can check that a property is a diffusion profile with the [DiffusionProfile] attribute on it. You can get that with this function: https://docs.unity3d.com/ScriptReference/Shader.GetPropertyAttributes.html

sebastienlagarde · 2021-06-07T20:10:14Z

note to self: retarget to master once hd/bugfix is merge

sebastienlagarde · 2021-06-07T23:04:35Z

for unknow reasins it break test package: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics/tree/HDRP%252Fdiffusion-profile-import-add/.yamato%252F_projectcontext.yml%2523test_all_project_OSX_trunk/7157649/job/artifacts

FrancescoC-unity · 2021-06-08T07:20:51Z

for unknow reasins it break test package: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics/tree/HDRP%252Fdiffusion-profile-import-add/.yamato%252F_projectcontext.yml%2523test_all_project_OSX_trunk/7157649/job/artifacts

I'll check!

Vic-Cooper

Looks good :)

sebastienlagarde · 2021-06-08T12:36:00Z

it works, thanks :)

…l settings #4743

…l settings #4743 (#5288)

pmavridis and others added 30 commits May 26, 2021 19:23

[HDRP] Fix AxF debug output in certain configurations (#4641)

5945333

* Fix AxF debug output in certain configurations. * Update comment

Fix SSR accumulation white flash (#4648)

64a6c13

* Fix white flash * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Display Info Box when MSAA + ray tracing is onr (#4627)

f49b710

* Show info box when ray tracing is enabled. * Changelog * Move below MSAA Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Fix distortion when resizing the window in player builds with the Gra…

05cc16a

…phics Compositor enabled (#4593) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Add support for the camera bridge in the graphics compositor (#4599)

2325e3f

Merge branch 'master' into hd/bugfix

c09379f

Fix Jittered Project Matrix Infinite Far Clip Plane (#4638)

b5962c9

* Reconstruct jittered projection matrix far plane (for Infinite ) * Changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Fixed a memory leak related to not disposing of the RTAS at the end H…

77b6b7f

…DRP's lifecycle. (#4688) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Fix custom pass utils Blur + Copy overdraw. (#4623)

bf941a9

* Fix overdraw in custom pass utils blur function * Updated changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Fix draw procedural invalid pass idx 1 on first template load (#4632)

806dfbe

* Fix * changelog * Force sync compilation for TAA Co-authored-by: CifaCia <f.cifariellociardi@gmail.com> Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Changed light reset to preserve type (#4624)

88779ea

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Revert "Add support for the camera bridge in the graphics compositor (#…

30fffd5

…4599)" This reverts commit 2325e3f.

AxF carpaint: Fix a compilation issue on Vulkan until the cpp HLSLcc …

aabbb4b

…side is updated. (case 1335737, related to 1314040) (#4691) Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Revert "Revert "Add support for the camera bridge in the graphics com…

dfdb311

…positor (#4599)"" This reverts commit 30fffd5.

revert: Fix distortion when resizing the window in player builds with…

891fda0

… the Graphi

Merge branch 'master' into hd/bugfix

7b17e06

Merge branch 'master' into hd/bugfix

32df1bf

Fix for discrepancies in saturation and intensity between screen spac…

0032b9c

…e refraction and probe refraction (#4653) * Delete the second transmittance mul * Changelog Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

Fix a Divide-by-Zero Warning for some Anisotropic Models (Fabric, Lit) (

41716f0

#4636) * Initialize the shading normal to a non-zero value for anisotropy * Changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

[HDRP] Fix VfX lit particle AOV output color space (#4646)

333c800

* Fix VfX lit particle aov output color space * Update comment Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

[HDRP][Path Tracing] Fixed transparent unlit (#4605)

809316c

* Fixed issue with transparent unlit. * Updated changelog. * Reverted accidental change to default mtl. Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Merge branch 'master' into hd/bugfix

7b1ad29

Fix distortion with MSAA (#4711)

08a578d

Fix contact shadow debug views (#4720)

3c418c0

* Fix * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Update Decal-Projector.md (#4695)

352f65d

[HDRP] Fixed nullref when deleting the texture asset assigned in a lo…

acc5073

…cal volumetric fog volume (#4728) * Fixed nullref when deleting the 3D mask of a density volume (case 1339330) * Updated changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

Merge branch 'master' into hd/bugfix

fd54a00

Add import dialog for diffusion profile import

ee4320f

Don't display pop up if we can't add it.

04b03fc

Vic-Cooper requested changes Jun 2, 2021

View reviewed changes

FrancescoC-unity added 2 commits June 2, 2021 16:41

Review code fixes

87db1ec

changelog

81b6b60

remi-chapelain approved these changes Jun 2, 2021

View reviewed changes

remi-chapelain requested a review from Vic-Cooper June 2, 2021 15:00

alelievr reviewed Jun 2, 2021

View reviewed changes

Check tag instead of name for SG

c23f321

alelievr approved these changes Jun 2, 2021

View reviewed changes

sebastienlagarde approved these changes Jun 7, 2021

View reviewed changes

sebastienlagarde changed the base branch from hd/bugfix to master June 7, 2021 20:09

sebastienlagarde changed the base branch from master to hd/bugfix June 7, 2021 20:09

sebastienlagarde changed the base branch from hd/bugfix to master June 7, 2021 22:20

sebastienlagarde added 2 commits June 8, 2021 00:20

Merge branch 'master' into HDRP/diffusion-profile-import-add

27f3a55

Merge branch 'master' into HDRP/diffusion-profile-import-add

72f9bda

sebastienlagarde marked this pull request as ready for review June 7, 2021 22:22

Adding early guard as a tentative fix for yamato.

e4068e2

Vic-Cooper approved these changes Jun 8, 2021

View reviewed changes

Merge branch 'master' into HDRP/diffusion-profile-import-add

991813a

sebastienlagarde merged commit 28e2493 into master Jun 8, 2021

sebastienlagarde deleted the HDRP/diffusion-profile-import-add branch June 8, 2021 12:37

adrien-de-tocqueville mentioned this pull request Jul 12, 2021

[Hold] EditorWindow for diffusion profiles registration #5116

Closed

sebastienlagarde added a commit that referenced this pull request Aug 3, 2021

Revert: Add import dialog to add a new diffusion profile to the globa…

06efd2f

…l settings #4743

sebastienlagarde mentioned this pull request Aug 3, 2021

Revert: https://github.com/Unity-Technologies/Graphics/pull/4743 #5288

Merged

sebastienlagarde added a commit that referenced this pull request Aug 3, 2021

Revert: Add import dialog to add a new diffusion profile to the globa…

5782561

…l settings #4743 (#5288)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add import dialog to add a new diffusion profile to the global settings #4743

Add import dialog to add a new diffusion profile to the global settings #4743

Uh oh!

FrancescoC-unity commented Jun 1, 2021 •

edited

Loading

Uh oh!

FrancescoC-unity commented Jun 2, 2021 •

edited

Loading

Uh oh!

Vic-Cooper left a comment

Uh oh!

Vic-Cooper Jun 2, 2021

Uh oh!

remi-chapelain commented Jun 2, 2021

Uh oh!

remi-chapelain left a comment

Uh oh!

alelievr Jun 2, 2021

Uh oh!

sebastienlagarde commented Jun 7, 2021

Uh oh!

sebastienlagarde commented Jun 7, 2021

Uh oh!

FrancescoC-unity commented Jun 8, 2021

Uh oh!

Vic-Cooper left a comment

Uh oh!

sebastienlagarde commented Jun 8, 2021

Uh oh!

Uh oh!

Add import dialog to add a new diffusion profile to the global settings #4743

Add import dialog to add a new diffusion profile to the global settings #4743

Uh oh!

Conversation

FrancescoC-unity commented Jun 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FrancescoC-unity commented Jun 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Vic-Cooper left a comment

Choose a reason for hiding this comment

Uh oh!

Vic-Cooper Jun 2, 2021

Choose a reason for hiding this comment

Uh oh!

remi-chapelain commented Jun 2, 2021

Uh oh!

remi-chapelain left a comment

Choose a reason for hiding this comment

Uh oh!

alelievr Jun 2, 2021

Choose a reason for hiding this comment

Uh oh!

sebastienlagarde commented Jun 7, 2021

Uh oh!

sebastienlagarde commented Jun 7, 2021

Uh oh!

FrancescoC-unity commented Jun 8, 2021

Uh oh!

Vic-Cooper left a comment

Choose a reason for hiding this comment

Uh oh!

sebastienlagarde commented Jun 8, 2021

Uh oh!

Uh oh!

FrancescoC-unity commented Jun 1, 2021 •

edited

Loading

FrancescoC-unity commented Jun 2, 2021 •

edited

Loading