[VFX] Staging to Master #6172

PaulDemeulenaere · 2021-10-29T09:22:16Z

Purpose of this PR

Staging PR to sync with internal VFX changes.

Fixed

Move MinMaxAttribute to internal #292 @ludovic-theobald
Bounds helper feature polish #263 @ludovic-theobald
Collision with Depth + Physical camera is broken #270 @ludovic-theobald

Testing status

Yamato ⏳
Yamato Internal ⏳

Comments to reviewers

Updated all VFX & Applied the formatting

* Updated Changelog * Updated Blocks with Fixes and Missing Workflows * update VFX additions Co-authored-by: Thomas Iché <peeweek@gmail.com>

…put Particle Mesh / Connected Attributes (#139) * Reindex the TEXCOORD[n] * Update CHANGELOG.md Co-authored-by: Julien Fryer <julienf@unity3d.com>

Fix issue #1131 (comment) Fix issue #1131 (comment) Fix issue #1131 (comment)

* Add missing filter in CanLink function * Add editor test * *Update changelog.md * *Update comment * *Update Comment * Fix regression with subgraph * Add Subgraph_Event_Link_To_Spawn editor test

Add entry in the right place from 0009e53

…t to 10.x.x)

* Fix debug view material TODO : Add GraphicTest * Fix tab/space mix * Add HDRP debug scene * *Add reference image for HDRD_Debug(Property) * *Update changelog.md

…158)

* do not Create VFXGraph in import callbacks * error when graph missing. Better test code for asset creation

…n the asset inside the editor. (#118) * Added OnOpenAssetAttributeMode.Validate * added UNITY_2021_1 * remove the shaders has they are not edited in the editor. * Fix macro

# Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md

* Select node on create * Fix for right click in block and add doesn't deselect clicked block * fix for subgraph not being selected on drag and drop * Select converted node/block after convert subgraph * Fix for selection undo separate in some cases. Fixed flow anchor drag context selection. * Fix for undo of add subgraph operator

# Conflicts: # com.unity.render-pipelines.high-definition/Editor/Upgraders/UpgradeStandardShaderMaterials.cs # com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbeSystem.cs # com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/AOV/AOVRequestData.cs # com.unity.render-pipelines.universal/Editor/2D/Renderer2DUpgrader.cs # com.unity.render-pipelines.universal/Editor/2D/ShapeEditor/EditorTool/ScriptablePathInspector.cs # com.unity.render-pipelines.universal/Editor/2D/ShapeEditor/GUIFramework/Control.cs # com.unity.render-pipelines.universal/Editor/2D/ShapeEditor/GUIFramework/GUIAction.cs # com.unity.render-pipelines.universal/Editor/2D/ShapeEditor/View/Drawer.cs # com.unity.render-pipelines.universal/Editor/LightExplorer.cs # com.unity.render-pipelines.universal/Editor/ShaderGraph/AssetCallbacks/CreateSpriteLitShaderGraph.cs # com.unity.render-pipelines.universal/Editor/ShaderGraph/AssetCallbacks/CreateSpriteUnlitShaderGraph.cs # com.unity.render-pipelines.universal/Editor/ShaderGraph/AssetCallbacks/CreateUnlitShaderGraph.cs # com.unity.render-pipelines.universal/Runtime/External/LibTessDotNet/Tess.cs # com.unity.shadergraph/Editor/AssetCallbacks/CreateVFXShaderGraph.cs # com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs # com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs # com.unity.shadergraph/Editor/Data/Nodes/NodeClassCache.cs

… "New" when no asset is set. (#173) * Base Commit * Documentation * Updated Changelog * Fixed Typo Co-authored-by: Thomas ICHÉ <peeweek@gmail.com>

* Added excludeFromTAA setting to VFX outputs Added excludeFromTAA setting to VFX outputs. Currently it is only supported in HDRP suboutputs. Required adding ${VFXStencilForward} variable to forward pass templates * Update VFXHDRPSubOutput.cs suport exclude from TAA in transparent only * Added documentation to exclude from TAA property * Graphic test Added graphic test: 32_ExcludeFromTAA * Update graphic test background for better contrast * Update CHANGELOG.md Co-authored-by: Lewis Jordan <lewisjordan@unity3d.com>

@tristan

* Allow Set Spawn Count & Set Spawn Time TODO : List Spawn count in available variant * Fix reference lost in m_SerializableType No idea of implication of this :-/ * Squashed commit of the following: (retrieve fix from @tristan) commit c24981d7dad15100eb40a92a6a9370e9ba800acd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Oct 9 17:27:57 2020 +0200 Update message from @vlad suggestion Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/131#issuecomment-30757 commit a87ba18 Merge: 13b501e 296ffd3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Oct 9 09:25:02 2020 +0200 Merge branch 'vfx/staging' into vfx/fix/error-at-creation # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md commit 13b501e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Oct 9 09:24:27 2020 +0200 *Add warning for CollisionDepthBuffer Update & Fix Changelog.md commit 4bfb1e7 Author: Tristan Genevet <tristan@unity3d.com> Date: Thu Oct 8 18:10:42 2020 +0200 Fix for displaying error from the creation of a node. * Add error feedback on failing custom spawner reference * Revert "Allow Set Spawn Count & Set Spawn Time" This reverts commit 0a6c75c. # Conflicts: # com.unity.visualeffectgraph/Editor/Expressions/VFXAttributeExpression.cs * Remove unexpected change * *Revert change in changelog * *WIP* add ResolveCustomCallbackInstance Some refactor mark as "TODOPAUL" * Clean implementation : customBehavior & comment * *Add test to cover sanitize before modify references * Change namespace for builtin custom spawner & sanitize * Extend test to verify connexion * *Update changelog.md * Add specific error if customBehavior returns null * Fix corner case when ScriptableObject reference has been lost * Work but not idea with copy/past + potential leak * Better implementation : use directly "MonoScript" * Fix spawnerTest * Rename "Can't found" => "Can't find"

…pacity (#174) Issue introduced with https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/136 And more precisely https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/136/commits/27c041da92ec89407ae775fe4c4f24681f156cb8

* Add test * Add test to cover behavior from case 1271839

# Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset # com.unity.visualeffectgraph/CHANGELOG.md

* Move MinMaxAttribute to internal + fix changelog for bounds * move to 13.1.1 Co-authored-by: Paul Demeulenaere <pauld@unity3d.com>

+ Update VFXManager in test project

perl $HOME/unity-meta/Tools/Format/format.pl --nobackups --hgroot $(pwd) .

PaulDemeulenaere · 2021-11-02T08:33:24Z

com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicInitialize.cs

+                    manager.RegisterError("CullingFlagAlwaysSimulate", VFXErrorType.Warning,
+                        "Setting the system Bounds Mode to Automatic will switch the culling flags of the Visual Effect asset" +
+                        " to 'Always recompute bounds and simulate'.");
+                }


@ludovic-theobald @julienamsellem I had to resolve a conflict here, can you double check this change ? ⬆️

All good on my side for this change :)

PaulDemeulenaere · 2021-11-02T08:43:50Z

N.B.: We can expect failure in Smoke Test due to infinite import of material, see on master

julienf-unity

Another vfx assets update will probably be required when #5125 lands.

# Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/31_CameraBuffer.vfx

Needed after merge of #5125

PaulDemeulenaere · 2021-11-04T11:57:16Z

Another vfx assets update will probably be required when #5125 lands.

Done at 8065aea

ludovic-theobald · 2021-11-02T10:20:56Z

com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicInitialize.cs

+                    manager.RegisterError("CullingFlagAlwaysSimulate", VFXErrorType.Warning,
+                        "Setting the system Bounds Mode to Automatic will switch the culling flags of the Visual Effect asset" +
+                        " to 'Always recompute bounds and simulate'.");
+                }


All good on my side for this change :)

julienamsellem

Tested multi-vfx windows locally and it's all good.

julienf-unity and others added 30 commits October 29, 2020 11:39

Merge remote-tracking branch 'graphics/master' into vfx/staging

818adb6

Vfx/fix/additional subgraphs 2 (#155)

ef6eeaf

* Updated Changelog * Updated Blocks with Fixes and Missing Workflows * update VFX additions Co-authored-by: Thomas Iché <peeweek@gmail.com>

Fix 1255182 Compile errors using Baked GI (default UV settings) / Out…

15df881

…put Particle Mesh / Connected Attributes (#139) * Reindex the TEXCOORD[n] * Update CHANGELOG.md Co-authored-by: Julien Fryer <julienf@unity3d.com>

Fix serveral minor issues (#103)

fe924b0

Fix issue #1131 (comment) Fix issue #1131 (comment) Fix issue #1131 (comment)

Update rebuild all script to take subgraph into account

5e1b25c

Update VFX assets

dedb913

Fix URP vfx assets

1e7ae1b

Merge remote-tracking branch 'graphics/master' into vfx/staging

249de48

Merge remote-tracking branch 'graphics/master' into vfx/staging

4a0458e

Fix Event connected directly to Output Event (revival) (#154)

0009e53

* Add missing filter in CanLink function * Add editor test * *Update changelog.md * *Update comment * *Update Comment * Fix regression with subgraph * Add Subgraph_Event_Link_To_Spawn editor test

Fix changelog

ee55b98

Add entry in the right place from 0009e53

Restore disabled 26_NonUnifomScale due to a wrong merge (need backpor…

f181b2d

…t to 10.x.x)

[HDRP] Fix debug view material (albedo/normal/...) (#163)

0c4cf10

* Fix debug view material TODO : Add GraphicTest * Fix tab/space mix * Add HDRP debug scene * *Add reference image for HDRD_Debug(Property) * *Update changelog.md

Force ui update when shader might be reimported in StaticMeshOutput (#…

981e074

…158)

Don't create VFXGraph during import callbacks (#148)

1443b7d

* do not Create VFXGraph in import callbacks * error when graph missing. Better test code for asset creation

Add the necessary openasset callback for the system to know if we ope…

47ce7f8

…n the asset inside the editor. (#118) * Added OnOpenAssetAttributeMode.Validate * added UNITY_2021_1 * remove the shaders has they are not edited in the editor. * Fix macro

Merge branch 'master' into vfx/staging

960eea5

# Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md

Merge remote-tracking branch 'graphics/master' into vfx/staging

0a7f877

“Refactor”

1f63413

"Refactor" bis (some file has been missed)

b6d84e9

Dont flag dirty in vfxgraph is the model modified is a copy (#165)

b514cc6

Workflow improvement : Change VisualEffect inspector "Edit" button to…

1f96809

… "New" when no asset is set. (#173) * Base Commit * Documentation * Updated Changelog * Fixed Typo Co-authored-by: Thomas ICHÉ <peeweek@gmail.com>

Missing Reference image for test 32_ExcludeFromTAA

5015bd6

Add test to cover case exposed by 1258022 (#54)

cc36c16

[Test] Add test to cover "Thread Group Size" error (#104)

cf3b4ae

* Add test * Add test to cover behavior from case 1271839

PaulDemeulenaere and others added 2 commits October 29, 2021 11:05

Merge branch 'master' into vfx/staging

476ed12

# Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset # com.unity.visualeffectgraph/CHANGELOG.md

[Fix] Move MinMaxAttribute to internal + Fix changelog for bounds (#292)

225e1b8

* Move MinMaxAttribute to internal + fix changelog for bounds * move to 13.1.1 Co-authored-by: Paul Demeulenaere <pauld@unity3d.com>

github-actions bot added HDRP vfx labels Oct 29, 2021

Unity-Technologies deleted a comment from github-actions bot Oct 29, 2021

*Update all serialized vfx

a5ca47b

+ Update VFXManager in test project

Unity-Technologies deleted a comment from github-actions bot Oct 29, 2021

*Re-Apply Formatting

8a8f15c

perl $HOME/unity-meta/Tools/Format/format.pl --nobackups --hgroot $(pwd) .

Unity-Technologies deleted a comment from github-actions bot Oct 29, 2021

PaulDemeulenaere requested review from ludovic-theobald and julienf-unity October 29, 2021 10:34

Merge branch 'master' into vfx/staging

a952bd6

PaulDemeulenaere commented Nov 2, 2021

View reviewed changes

PaulDemeulenaere requested a review from julienamsellem November 2, 2021 08:37

Unity-Technologies deleted a comment from github-actions bot Nov 2, 2021

julienf-unity approved these changes Nov 2, 2021

View reviewed changes

Merge branch 'master' into vfx/staging

f1bd5b3

# Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/31_CameraBuffer.vfx

Unity-Technologies deleted a comment from github-actions bot Nov 4, 2021

PaulDemeulenaere added 2 commits November 4, 2021 11:07

Add missing meta

73bcb5e

*Update All VFX

8065aea

Needed after merge of #5125

Unity-Technologies deleted a comment from github-actions bot Nov 4, 2021

PaulDemeulenaere marked this pull request as ready for review November 4, 2021 13:16

github-actions bot added the testing label Nov 4, 2021

ludovic-theobald approved these changes Nov 4, 2021

View reviewed changes

julienamsellem approved these changes Nov 4, 2021

View reviewed changes

PaulDemeulenaere merged commit b64eebe into master Nov 4, 2021

PaulDemeulenaere deleted the vfx/staging branch November 4, 2021 17:22

PaulDemeulenaere restored the vfx/staging branch November 4, 2021 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[VFX] Staging to Master #6172

[VFX] Staging to Master #6172

Uh oh!

PaulDemeulenaere commented Oct 29, 2021 •

edited

Loading

Uh oh!

PaulDemeulenaere Nov 2, 2021 •

edited

Loading

Uh oh!

ludovic-theobald Nov 2, 2021

Uh oh!

PaulDemeulenaere commented Nov 2, 2021

Uh oh!

julienf-unity left a comment

Uh oh!

PaulDemeulenaere commented Nov 4, 2021

Uh oh!

ludovic-theobald Nov 2, 2021

Uh oh!

julienamsellem left a comment

Uh oh!

Uh oh!

[VFX] Staging to Master #6172

[VFX] Staging to Master #6172

Uh oh!

Conversation

PaulDemeulenaere commented Oct 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose of this PR

Testing status

Comments to reviewers

Uh oh!

PaulDemeulenaere Nov 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ludovic-theobald Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

PaulDemeulenaere commented Nov 2, 2021

Uh oh!

julienf-unity left a comment

Choose a reason for hiding this comment

Uh oh!

PaulDemeulenaere commented Nov 4, 2021

Uh oh!

ludovic-theobald Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

julienamsellem left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

PaulDemeulenaere commented Oct 29, 2021 •

edited

Loading

PaulDemeulenaere Nov 2, 2021 •

edited

Loading