[VFX] Fix soft particles (to 10.x.x) #5454
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 73b6768 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Aug 27 09:55:58 2021 +0200 Fix changelog.md commit 129edd3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Aug 27 09:50:59 2021 +0200 Fix after merge Apply VFXSampleDepth for URP on the correct file commit a29197d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Jul 5 14:05:45 2021 +0200 [VFX] Fix soft particles (#4733) * Update changelog # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md * Different depth computation for orthographic camera # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md * Restore change from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/211/commits/8169e083d9b68114bd7a248ebba1dfba38fca3f5 But using URP specific helper "LinearDepthToEyeDepth" * FIx issue 1330697 Correctly applying the flip-y when appropriate while sampling * Fix scaling using dedicated URP helper It's simpler than reimplement the space transform and equivalent * Update com.unity.render-pipelines.universal/Runtime/VFXGraph/Shaders/VFXCommon.hlsl Fix comment Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com> * Fix issue #4733 (comment) Remove VFXLinearEyeDepth & VFXLinearEyeDepthOrthographic from the SRP specific implementation Synchronize implementation for VFXLinearEyeDepth in VFXCommonCompute.hlsl (not used anyway) TODO : Move LinearDepthToEyeDepth in core for 21.2 Co-authored-by: Ludovic Theobald <ludovic.theobald@unity3d.com> Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com> # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.render-pipelines.universal/Runtime/VFXGraph/Shaders/VFXCommon.hlsl # com.unity.visualeffectgraph/CHANGELOG.md (cherry picked from commit b38a9eb72b46d39f1f1cb052a85fffb1f7142380) # Conflicts: # com.unity.render-pipelines.universal/CHANGELOG.md # com.unity.visualeffectgraph/CHANGELOG.md
ellioman
approved these changes
Sep 6, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of this PR
Backport of #4733
Testing status
Awaiting for Yamato ⏳
Comments to reviewers
N/A