[VFX] HDRP Decal Output #4601

ludovic-theobald · 2021-05-21T10:33:45Z

[VFX] HDRP Decal Output

Design Doc

Checklist for PR maker

Have you added a backport label (if needed)? For example, the need-backport-* label. After you backport the PR, the label changes to backported-*.
Have you updated the changelog? Each package has a CHANGELOG.md file.
Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR. If you do add documentation, make sure to add the relevant Graphics Docs team member as a reviewer of the PR. If you are not sure which person to add, see the Docs team contacts sheet.
Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.

Purpose of this PR

We want to be able to output decals that affect not only the base color, but also the other physical properties of the affected material (Normal, Smoothness, Metallic, AO).
The goal is to match as much as possible the features available for the HDRP decals.
This feature will be HDRP-exclusive.

Testing status

Extensive testing by QA can be found here : https://docs.google.com/document/d/1lAurKH3M2Qbwtq3lb-37yQkn4DWsGsAHKkDTlHEaBZE/edit

Comments to reviewers

At this stage, you need to enable Decal Layers in the HDRP asset for the feature to work. (temporary)

…cals

…cals # Conflicts: # com.unity.visualeffectgraph/Shaders/RenderPipeline/Legacy/VFXCommon.hlsl

…decals

github-actions · 2021-07-06T15:07:02Z

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics
Search for your PR branch using the sidebar on the left, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

HDRP
/.yamato%252Fall-hdrp.yml%2523PR_HDRP_2021.2

VFX
/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

…chnologies/Graphics into vfx/feature/hdrp-decals

…cals

julienf-unity

Seems like the new GFX tests wasnt added to the test list for automation.

Doc is missing

Apart from that it looks good. Nice work!

julienf-unity · 2021-07-09T07:33:06Z

...nes.high-definition/Editor/VFXGraph/Shaders/Templates/HDRPDecal/PassForwardEmissive.template

+
+
+
+//EndTODO


This can be removed

julienf-unity · 2021-07-09T07:33:43Z

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/VFXDecal.template

@@ -0,0 +1,201 @@
+
+//TODO : Check for unnecessary includes / and for necessary ones


Is that still relevant?

julienf-unity · 2021-07-09T07:34:45Z

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/VFXDecal.template

+	// Decal layer of the decal
+	DecodeFromDecalPrepass(i.pos.xy, material);
+
+	if ((decalLayerMask & material.decalLayerMask) == 0)


Yes idea is at some point to rely completely on SG for render pipe specific code and simplify/factorize our templates a lot. But we're not there yet

Added Output Particle HDRP Lit Decal doc Please check Input Types are accurate.

Vic-Cooper

Added documentation. @ludovic-theobald Please double-check the Types are accurate. I also changed the intro based on your suggestion on the google doc.

ludovic-theobald · 2021-07-12T11:13:26Z

Adding @julienamsellem to review the part on the MinMaxSlider.
(VFXMinMaxSliderField.cs + Vector2PropertyRM.cs + VFXControls.uss)

com.unity.visualeffectgraph/Editor/Types/VFXPropertyAttribute.cs

com.unity.visualeffectgraph/Editor/GraphView/Views/Properties/Vector2PropertyRM.cs

com.unity.visualeffectgraph/Editor/Controls/VFXMinMaxSliderField.cs

julienamsellem

All good for me

This reverts commit b8bfebb.

This class has been recently introduced by #4601

@ludovic-theobald

* Use abstraction to compute screen space uv The URP implementation relies on screen scale & graphics api See https://github.com/Unity-Technologies/Graphics/blob/b468fa4627d191f06200a0f33df3d9cddee2c3f9/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl#L347 * *Add Graphics Test * Experiment : Revert Pass.template from #4601 * Enable GraphicTest & add RenderScale * Revert "Experiment : Revert Pass.template from #4601" This reverts commit b8bfebb. * Fix overlay decal * *Update test Scene * *Remove 104_Decal_And_SoftParticle (Graphic Test can't capture correctly overlay when there is a renderScale) * Remove unexpected "if (_ProjectionParams.x < 0)" & Update ChangeLog In discussion with @ludovic-theobald about this behavior. * Restore actually correct _ProjectionParams.x test There is probably something wrong in SetPerCameraShaderVariables * Revert change in URP * Minor: Apply suggestion from @julienf #5401 (comment) * Unexpected change in changelog * Unexpected modification in CHANGELOG.md * Fix changelog ordering Co-authored-by: julienf-unity <julienf@unity3D.com>

@ludovic-theobald

* Use abstraction to compute screen space uv The URP implementation relies on screen scale & graphics api See https://github.com/Unity-Technologies/Graphics/blob/b468fa4627d191f06200a0f33df3d9cddee2c3f9/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl#L347 * *Add Graphics Test * Experiment : Revert Pass.template from #4601 * Enable GraphicTest & add RenderScale * Revert "Experiment : Revert Pass.template from #4601" This reverts commit b8bfebb. * Fix overlay decal * *Update test Scene * *Remove 104_Decal_And_SoftParticle (Graphic Test can't capture correctly overlay when there is a renderScale) * Remove unexpected "if (_ProjectionParams.x < 0)" & Update ChangeLog In discussion with @ludovic-theobald about this behavior. * Restore actually correct _ProjectionParams.x test There is probably something wrong in SetPerCameraShaderVariables * Revert change in URP * Minor: Apply suggestion from @julienf #5401 (comment) * Unexpected change in changelog * Unexpected modification in CHANGELOG.md * Fix changelog ordering Co-authored-by: julienf-unity <julienf@unity3D.com> # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md

@ludovic-theobald

* Use abstraction to compute screen space uv The URP implementation relies on screen scale & graphics api See https://github.com/Unity-Technologies/Graphics/blob/b468fa4627d191f06200a0f33df3d9cddee2c3f9/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl#L347 * *Add Graphics Test * Experiment : Revert Pass.template from #4601 * Enable GraphicTest & add RenderScale * Revert "Experiment : Revert Pass.template from #4601" This reverts commit b8bfebb. * Fix overlay decal * *Update test Scene * *Remove 104_Decal_And_SoftParticle (Graphic Test can't capture correctly overlay when there is a renderScale) * Remove unexpected "if (_ProjectionParams.x < 0)" & Update ChangeLog In discussion with @ludovic-theobald about this behavior. * Restore actually correct _ProjectionParams.x test There is probably something wrong in SetPerCameraShaderVariables * Revert change in URP * Minor: Apply suggestion from @julienf #5401 (comment) * Unexpected change in changelog * Unexpected modification in CHANGELOG.md * Fix changelog ordering Co-authored-by: julienf-unity <julienf@unity3D.com> # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md

https://jira.unity3d.com/browse/UUM-2115 When one component of a Vector2 node was set to indeterminate value the other component was not set to indeterminate. ![Unity_0MhemJIp02](https://media.github.cds.internal.unity3d.com/user/4003/files/f8c486cc-e33d-445a-bc75-570afb84ad2a) This regression has been introduced by this [PR](#4601)

https://jira.unity3d.com/browse/UUM-6665 Original PR: https://github.cds.internal.unity3d.com/unity/unity/pull/11138 When one component of a Vector2 node was set to indeterminate value the other component was not set to indeterminate. ![Unity_0MhemJIp02](https://media.github.cds.internal.unity3d.com/user/4003/files/f8c486cc-e33d-445a-bc75-570afb84ad2a) This regression has been introduced by this [PR](Unity-Technologies#4601)

ludovic-theobald added 9 commits May 10, 2021 10:52

Blend Sources with additional defines

240d517

First attempt at factorizing a little + forward emissive

077daa3

Decal layers in output context

f9fdd0d

Merge remote-tracking branch 'origin/master' into vfx/feature/hdrp-de…

14d83e5

…cals

Fix compilation with new master

0b3004a

Merge remote-tracking branch 'origin/master' into vfx/feature/hdrp-de…

c064a52

…cals

Decal Layers enabled

8886fe7

Fix Orthographic mode

757e21f

Crashing implem of MinMaxSlider attribute....

dc64a2a

github-actions bot added the HDRP label May 21, 2021

ludovic-theobald added 9 commits May 25, 2021 11:13

Temp fix, force blend mode to opaque

9d0d474

Orthographic linear eye

219b30b

Merge remote-tracking branch 'origin/master' into vfx/feature/hdrp-de…

1cf3d17

…cals # Conflicts: # com.unity.visualeffectgraph/Shaders/RenderPipeline/Legacy/VFXCommon.hlsl

Proper Decal varyings

0b47f1b

Intermediate class between HDRP Lit Outputs and ShadergraphOutputs

f8f044f

remove isLitShader from decal outputs

d3681da

Remove unnecessary members

5372013

Mask scale effective

a99e310

Merge branch 'vfx/feature/hdrp-decal-refactor' into vfx/feature/hdrp-…

aa06f41

…decals

ludovic-theobald requested review from MarieGuff and VitaVFX May 26, 2021 08:13

ludovic-theobald added 9 commits May 26, 2021 11:01

No angle fade if no decal layers

b889cfc

New "Affect xxx" settings. Sliders still appear in context

b6c79a1

Template to accept "Affect xxx"

62354ad

Enables "Affect xxx"

b3530d4

Works without decal layers

a602098

Change Angle Fade default value

58012da

Attempt to make pass enableDecalLayer as uniform

ea7725e

Gather Varyings in VFXDecalVaryings.template

db2df27

Do not transfert the blendMode setting to decal outputs

83b9292

ludovic-theobald added 4 commits July 7, 2021 11:25

remove preformat.back

be36a89

Merge branch 'vfx/feature/hdrp-decals' of https://github.com/Unity-Te…

9e85350

…chnologies/Graphics into vfx/feature/hdrp-decals

cleanup

65dfdd8

Merge remote-tracking branch 'origin/master' into vfx/feature/hdrp-de…

e425e1d

…cals

julienf-unity approved these changes Jul 9, 2021

View reviewed changes

julienf-unity requested a review from Vic-Cooper July 9, 2021 07:43

Added doc

dc212d0

Added Output Particle HDRP Lit Decal doc Please check Input Types are accurate.

Vic-Cooper approved these changes Jul 9, 2021

View reviewed changes

Vic-Cooper and others added 3 commits July 9, 2021 14:19

Doc fixes

7ebdec2

Clean outdated comments

ba22c1b

Docs: set Fade Factor type

a4e68b8

ludovic-theobald requested a review from julienamsellem July 12, 2021 11:11

julienamsellem reviewed Jul 12, 2021

View reviewed changes

UI review fix

0660fde

julienamsellem approved these changes Jul 13, 2021

View reviewed changes

ludovic-theobald merged commit f4702b4 into master Jul 13, 2021

ludovic-theobald deleted the vfx/feature/hdrp-decals branch July 13, 2021 10:26

PaulDemeulenaere added a commit that referenced this pull request Aug 18, 2021

Experiment : Revert Pass.template from #4601

b8bfebb

PaulDemeulenaere added a commit that referenced this pull request Aug 19, 2021

Revert "Experiment : Revert Pass.template from #4601"

50b6bae

This reverts commit b8bfebb.

PaulDemeulenaere mentioned this pull request Aug 19, 2021

[VFX/URP] Fix decal with overlay & scale #5401

Merged

PaulDemeulenaere added a commit that referenced this pull request Aug 24, 2021

Fix unexpected public API for VFXHDRPSettingsUtility

7ed4fc2

This class has been recently introduced by #4601

PaulDemeulenaere mentioned this pull request Aug 24, 2021

[VFX] Unexpected public API #5425

Merged

sebastienlagarde pushed a commit that referenced this pull request Aug 25, 2021

Fix unexpected public API for VFXHDRPSettingsUtility (#5425)

73ef535

This class has been recently introduced by #4601

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[VFX] HDRP Decal Output #4601

[VFX] HDRP Decal Output #4601

ludovic-theobald commented May 21, 2021 •

edited by Vic-Cooper

Loading

github-actions bot commented Jul 6, 2021

julienf-unity left a comment

julienf-unity Jul 9, 2021

julienf-unity Jul 9, 2021

julienf-unity Jul 9, 2021

Vic-Cooper left a comment

ludovic-theobald commented Jul 12, 2021

julienamsellem left a comment

		@@ -0,0 +1,201 @@

		//TODO : Check for unnecessary includes / and for necessary ones




		//EndTODO

[VFX] HDRP Decal Output #4601

[VFX] HDRP Decal Output #4601

Conversation

ludovic-theobald commented May 21, 2021 • edited by Vic-Cooper Loading

[VFX] HDRP Decal Output

Design Doc

Checklist for PR maker

Purpose of this PR

Testing status

Comments to reviewers

github-actions bot commented Jul 6, 2021

julienf-unity left a comment

Choose a reason for hiding this comment

julienf-unity Jul 9, 2021

Choose a reason for hiding this comment

julienf-unity Jul 9, 2021

Choose a reason for hiding this comment

julienf-unity Jul 9, 2021

Choose a reason for hiding this comment

Vic-Cooper left a comment

Choose a reason for hiding this comment

ludovic-theobald commented Jul 12, 2021

julienamsellem left a comment

Choose a reason for hiding this comment

ludovic-theobald commented May 21, 2021 •

edited by Vic-Cooper

Loading