Skip to content

[VFX] Staging to Master #6048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 447 commits into from
Oct 22, 2021
Merged

[VFX] Staging to Master #6048

merged 447 commits into from
Oct 22, 2021

Conversation

PaulDemeulenaere
Copy link
Contributor

@PaulDemeulenaere PaulDemeulenaere commented Oct 18, 2021


Purpose of this PR

Most of these changes are already in 21.2, vfx/staging is a bit ahead master (see #5709)

Changed

  • Added missing nodes for Attribute>Curve and added a new category level #282 @julienamsellem New

Fixed


Testing status

Yamato 🟢
Yamato internal 🟠 (It will require an update PR for 31_CameraBuffer)


Comments to reviewers

I manually graft the change fe2edd6 to fix test in edit mode

iTris666 and others added 30 commits October 28, 2020 11:38
* Diffusion profile has PropertyType.Float but isn't castable in Vector1ShaderProperty : safeprof code

* Unity serialization produced a beast with object.ReferenceEquals(null) != 0 and instanceID == 0 foolProof code for this

* Update CHANGELOG.md
* Prevent exceptions from making notification stay. Prevent exception in errors to potential break the ui

* Prevent list from being badly deserialized.
* Add missing filter in CanLink function

* Add editor test

* *Update changelog.md

* *Update comment

* *Update Comment
* Vfx/feature/strips improvements (#265)

* Add spanwIndexInStrip attribute

* Fix particleCountInStrip in Init

* Add OrientStrip block

* Remove some useless code

* Add From Target Position mode in Orient Strip

* Update changelog

* Fix SpawnOverDistance

* Fix reference images

* Fix changelog

* Merge Orient and OrientStrip blocks

* Remove FaceCameraPlane from strips

* Sanitize quad strip orientation

* Update VFX

* Update changelog

* Add error feedback

* Use IsPerspectiveProjection

* Fix GetStripTangent for lines

* Add subpixel AA to head and trails template system

* Add strip variant for intialize in menu

* Fix for errors not appearing after convert output

* Update graph version

* Fix ribbon VFX

* Fix spawnIndexInStrip (tooltip + init)

* Fix issue with inspector not triggering OnSettingChanged

* Check that a converted output could keep the same flow links.

Co-authored-by: Tristan Genevet <tristan@unity3d.com>
* 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>
* 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
* 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
* 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
julienamsellem and others added 9 commits September 23, 2021 13:44
# Conflicts:
#	TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset
#	com.unity.visualeffectgraph/CHANGELOG.md
#	com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
# Conflicts:
#	TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset
#	com.unity.visualeffectgraph/CHANGELOG.md
#	com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
#282)

* Added missing nodes for Attribute>Curve and added a new category level

* Reorganize block nodes in the search filter window

Put first the attribute and then the composition to make it easier to find expected block.

* Improved VFXLibrary perfs to absorb the cost of new variants

Simplified a bit how names are displayed (removed "path")
Optimized a few loops and property accessor
Prevent some useless UI stuff to be triggered while build the VFXLibrary

* Made the new Variant class a bit more generic

* Fixed missing call to invalidate when instancing blocks

* Fixed missing some inline operators

* Moved all "set position" to "value/set"

* Include the sample mode in the name of map nodes

* Added more composition for custom attribute

Also changed the name of the operator so it's more consistend with other attributes

* Set attribute with Uniform sample mode was duplicated

* Applied code review comments

* Renamed "Value" category to "Composition"

* Added a change log entry
* Fix incorrect condition for GPUEvent

Mistake introduced at #4457

* *Add some editorTest

* Add some test to covers corners case

See https://unity.slack.com/archives/G1BTWN88Z/p1632919330247400

* *WIP* Improve incorrect connection handling

* Fix multiple type in output of initialize part

* Fix Update to Update which is actually allowed

* *Update changelog.md

* Fix missing case for VFX.Update tyep

* Rename confusing "primaryType"
# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md
@Unity-Technologies Unity-Technologies deleted a comment from github-actions bot Oct 18, 2021
Mainly due to this PR #5646
We renabled this test on vfx/staging but the background color is slighlty different
@Unity-Technologies Unity-Technologies deleted a comment from github-actions bot Oct 18, 2021
@PaulDemeulenaere PaulDemeulenaere marked this pull request as ready for review October 19, 2021 07:21
@PaulDemeulenaere PaulDemeulenaere requested review from a team as code owners October 19, 2021 07:21
#define CameraBuffer Texture2D
#define VFXSamplerCameraBuffer VFXSampler2D
#endif

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@Verasl Verasl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@PaulDemeulenaere PaulDemeulenaere merged commit 84569f3 into master Oct 22, 2021
@PaulDemeulenaere PaulDemeulenaere deleted the vfx/staging branch October 22, 2021 10:04
@Wilfrid-Unity Wilfrid-Unity restored the vfx/staging branch December 6, 2021 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants