Skip to content

Commit 69598fc

Browse files
julienf-unityiTris666peeweekThomas IchéPaulDemeulenaere
authored
[VFX] small uss fixes + package description (#1324)
* property attributes not serialized (#253) * Initial tests * Fix typo * Change the VFXPropertyAttribute class * Use VFXPropertyAttributes in VFXProperty * Refactor interface * Remove old VFXPropertyAttribute class * More fixes * Fix bug in DataAnchorController * Fix invalid cast typo * Remove shader warnings (#261) * Fix shader warnings in test projects * Update changelog * Vfx/feature/filter enum (#243) * Allow filtering enums values in VFXModels. * Add an explicit GetHashCode() to default NameNType. * Update CHANGELOG.md * Update VFXHDRPSubOutput.cs * fix based on review * Remove raytracing enumerator filter as it was removed from HDRP enum * Remove irrelevant render queues from some HDRP outputs (#263) * Remove AfterPostProcessing render queue for lit outputs * Remove render queue field from distortion outputs * Update changelog * Update HDRP changelog instead of VFX * Fix issue when converting outputs with invalid render queue # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md * Fixed Flipbook Texture Names * Update CHANGELOG.md * Fix exception when creating new category on new visual effect asset. * Forward port - Dont remove suboutputs objects if it cannot be deserialized (#205) * Fix to graft : support for flag enum in inspector * *Update changelog * Revert "Fix Enum Flag" (#15) * "Fix Enum Flag" (#16) This reverts commit f26a487b09e7f4941b833479b335f179b7dcc241. * Fix for Initial Event field height, (#17) * Fix for Initial Event field height, that were clipping the bottom of legged letters * Update CHANGELOG.md * Vfx/fix colorfield height (#19) * Fix color field height * changelog * Mesh Sampling (revival) (#1) * Squashed commit of the following: commit 4cd4cb244d720c87580c3386a75209532f2b8629 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 18:13:24 2020 +0200 Minor change to ease graphViz output view commit a6f9f78ecff57045899508f8a7bb03c9cc731c29 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 18:11:09 2020 +0200 Fix VFXObjectValue initial flag (cc @tristan) : Store ContentType & return it in VFXObjectValue directly (VFXObjectValue become an extension of VFXValue) Fix regression introduced by my change at 7abaf9bbf27c587033ad621301778b15748793e4 (due to missing in PropagateParentsFlags) Add OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant & OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant_Propagation to ease the check of expected behavior commit 7c11de30553cbc378926e3a1d6775f361921ad7a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 14:54:57 2020 +0200 *Update 007 SampleMesh to cover more cases commit 0baa1401f6fad276323d6369eb4330ef717c978f Merge: 40749ce2ba a9338688a6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 31 18:04:49 2020 +0200 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit 40749ce2ba015f004c6e161d75c4063edefd0f3a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 26 21:50:40 2020 +0100 *Reupdate Image (HDRP, there was an issue with shaderGraph) commit fa7ecbf9656db5316a60aadd450414b4d790e9ff Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 26 21:46:02 2020 +0100 *Update reference Image & .vfx (always in HDRP project) commit 7abaf9bbf27c587033ad621301778b15748793e4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 26 15:13:20 2020 +0100 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r44714 : set InvalidConstant directly on VFXValueType of Mesh commit c5a7a3ed477af8732da0095091c080692c9c64b2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 26 14:52:07 2020 +0100 Add graphic test to cover constant folding (TODO : Update all images) commit 27e3c7464d60659905f13f172c79a79a94b7ac56 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 26 13:37:38 2020 +0100 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r44714 commit 128101bc638d98d9628dc90be078450e1f706534 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 24 12:39:39 2020 +0100 Minor : forgot a punctation commit 8c395cd600dfd8301cf6c83d1354ba457e49e889 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 24 11:01:30 2020 +0100 *Update documentation from @lewis feedback https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-18488 commit 28f0ca20a0c422c5a5f1e64e1401271f63762ade Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 23 09:33:39 2020 +0100 Fix documentation image link (bis) commit 1b102c1c1ef3d3da69c9aa4332737e3f935959fa Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 23 09:24:13 2020 +0100 *Fix path in documentation commit 662d086481c228491536d1463dfe61198048a263 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 23 09:06:12 2020 +0100 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43790 commit 241ca5edf7451345ecce30da9310b19e24ee37d5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 23 08:21:56 2020 +0100 *Update documentation commit d89f307aca40f88bdda2dc0e9a0324556e296400 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 20 17:50:44 2020 +0100 *Update documentation commit 9f79d5a48e22881011ccf978217b21ce44ed9a37 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 20 15:59:56 2020 +0100 first draft of documentation commit f84300e560bfd3698e27da58a4e93236209ac513 Merge: 9c5bd4e887 c04b64c1b3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 20 13:22:28 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit 9c5bd4e88764d91371d0551fdf3fe64654c2e63f Merge: f8284406c8 ec959d5de3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 16 10:13:09 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit f8284406c8a99ceb442c13e20049ca14efd3cd7d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 16 10:12:08 2020 +0100 Fix issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43071 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43068 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43067 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#pullrequestreview-50944 Split Texture & Buffer commit 39328fb09e1d470727becea05842cd48ceb7c5e2 Author: Tristan Genevet <tristan@unity3d.com> Date: Wed Mar 11 11:42:23 2020 +0100 Fix delegate set that must not be postponed commit 9ddac63551eea34f630ddea0380035728b97bf3a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 10 17:48:44 2020 +0100 Add sample test for case 1226578 (TODO : fix HDRP 007_SimpleMaterial) commit e04224320d5404e44c969e49470eec827622916f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 10 15:30:46 2020 +0100 Fix after merge commit fb7dbd291fc063640295b35a24caf87ddccef1f9 Merge: 302ae40d59 5bdcd30bd9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 10 15:15:42 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit 302ae40d59ec0c3dd214405392853de8097373ca Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 25 10:48:54 2020 +0100 Fix build & behavior commit 61ce50e6dd9e08987bb7273f678e064edc01d110 Merge: 70c93148d4 5d2dfe278f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 25 10:18:17 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling # Conflicts: # com.unity.visualeffectgraph/Editor/Compiler/VFXShaderWriter.cs commit 70c93148d49f776dc68a47c28053258f8a713f54 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Feb 12 09:04:23 2020 +0100 Relate to issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36772 Add adressing mode in Position (Mesh) too & Update Tooltips commit e5d35ed0d6b6398c7d25d02166a32ca7d2afec65 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 17:18:28 2020 +0100 *Update reference image for HDRP (clear color isn't exactly the same) commit 65883b0f521cd1e1438890084593081400d594a2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 16:09:18 2020 +0100 Fix Color Sampling test commit 3e7ab2cddca5556855280709d18395df1229be57 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 15:54:25 2020 +0100 *Update Mesh Sampling vfx commit b46ffc745a55347e4d310e617afd1a40f2c2a804 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 15:47:06 2020 +0100 Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-15567 commit 03dff8383f4cc7acb383a630f0745871db2b7303 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 15:31:48 2020 +0100 Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-15555 Remove output count from the SampleMesh for consistency commit 0d6620339efc53b56906226e78b005ab06a0ab53 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 15:26:24 2020 +0100 *Update test using vertex mesh sampling commit 33433a4ccacc91c5861957b4f1d414d91eb1abb5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 15:17:00 2020 +0100 *Use flag in inspector as @julienf suggested commit f6d9f3ab494b50dcd15ad7104ff0ea40f398cee9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 11:22:36 2020 +0100 Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36772 Add adressingMode in Custom Sampling commit 00444271a0c3c1efda6373f16432cad3659d8238 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 10:29:07 2020 +0100 Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36771 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36770 commit d4422c88b66f0cf67c561086798b176db69b3d1a Merge: a7052746e1 0e325d7de5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 09:05:59 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md commit a7052746e10326979c3e4c4d69ddc4004bcad83b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 09:04:44 2020 +0100 Unexpected change in upm-ci-vfxmain.yml commit 3fa67e367aeda4f85025886d53729111a0d841e6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 23 10:34:57 2019 +0100 Update upm-ci-vfxmain.yml commit 8abf8e07dbe96fb4f02ab0733e3f22fa30622a7d Merge: 442c3cd4e0 1758e4de4b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 23 10:34:28 2019 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit 442c3cd4e0264a0ef2942ebbe4c1476da370d848 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 9 08:59:41 2019 +0100 Fix experimental & add mesh vertex count output as suggested by @vlad commit 7e306fe26a8839a9d72f4625a61e91814b4105ce Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 28 13:13:04 2019 +0100 Update upm-ci-vfxmain.yml commit 31604a66ff6f0b2031681bf26ac7f59d047d493d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 28 13:12:46 2019 +0100 Revert upm-ci-vfxmain.yml commit 9f8cdafdbc98f084453894897b54858a67e75483 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 28 13:11:49 2019 +0100 Revert upm-ci-vfx_lwrp.yml commit e95e7659b7f0a5a6cf1fc15ee8aef9a207038573 Merge: 858f1a94ed 5b678082c5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 16:55:52 2019 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling commit 858f1a94edfc88756a43b41d4652624939a6ab57 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 16:49:20 2019 +0100 Restrict constant folding on mesh operation commit 1b5216571e1a8b6d21787f10f33c4a819729c0ba Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 16:04:40 2019 +0100 *Update ChangeLog.md commit 651ce34b5baa57c43b2aff6b10f602f4643ec13a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 14:21:01 2019 +0100 Clean useless code commit 8e2e438886de3db5b8ba6c2613102a38947461aa Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 13:45:51 2019 +0100 Use name expression to compute vertex index commit 8349f56e96668f3656113850048e427859602583 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 09:03:17 2019 +0100 Rename "texture_" to "mesh_" when expression is actually a mesh Remove useless sampler for mesh commit 51f1e01943e4d221a7323363c39656b861a94fe7 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 08:39:31 2019 +0100 Update Canvas to include test in graphicTest commit fff4b79856a215bc1d13cb08752f88e40549ddbb Merge: ca39c0d6ec efba8dad57 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 26 07:49:14 2019 +0100 Merge branch 'refs/heads/vfx/staging' into vfx/feature/mesh-sampling # Conflicts: # TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset # TestProjects/VisualEffectGraph_LWRP/ProjectSettings/EditorBuildSettings.asset commit ca39c0d6ece391081f786e10e96aa6007af6b18e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 19 11:22:36 2019 +0100 Remove shape test commit 2aedcdd8bcee3342fc2a43be759f7c31d77628d4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 18 15:02:58 2019 +0100 Temporary : change yamato target to graphics/vfx/fix/mesh-sampling commit aea552d59b018fbf7c217b37d8846e02bfefb349 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 18 14:59:04 2019 +0100 *Update player reference images commit b0ab2685f7bdbd0b859a010422e8074bc95bfbc3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 18 14:36:49 2019 +0100 Fix PositionMesh commit 05aec35f9a430497583f5b952fa97ce6784c676d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 14 17:01:52 2019 +0100 *Update graphicTest commit 052cb87133878404390365f0403b6faa44821133 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 14 15:30:46 2019 +0100 Fix mesh color sampling commit c2db4d2ebe41d1ba0648b439bb167e486fd318ff Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 14 11:41:59 2019 +0100 Use explicit VFXExpressionMesh.GetVertexCount which handle in unified way to mesh nullity commit 2ecdcc54480aa17665db6b980a5ba797539931e9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Nov 13 10:28:19 2019 +0100 Add MeshVertexCount operator commit c5b144214270c741bc61a6bc0994c0c5098ba39a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Nov 13 10:08:14 2019 +0100 Add a true embedded random in SampleMesh commit d4e9dcf5a9abbc6ad79315cc1c60afe79f94af87 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Nov 12 18:35:35 2019 +0100 Fix unexpected cast int to uint commit 0fc7ed15c61435dbe917a56da4c939de35b57f2c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Nov 8 14:39:06 2019 +0100 Add WIP TODOPAUL commit 6ff729e50e85204a597c0628be601a2b8064cc3e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Nov 8 13:55:20 2019 +0100 Use uint instead of int & remove RandInt commit 22770d8cfef4135a054e0ed7194ee4a45b1497b4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 4 15:09:22 2019 +0100 *Update Shape.vfx commit 5d17343ddd478986d867e6d0f499cb5bd6c93d52 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 4 15:07:11 2019 +0100 Fix build commit 3a2729fb19b09fda873eff06ebad83b38b84ceb6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 4 14:46:47 2019 +0100 Report changes from https://github.cds.internal.unity3d.com/unity/vfx-graph/blob/bd366e5cf8dc25b725a4f064ad65577d26d1f51f/com.unity.visualeffectgraph/Shaders/VFXCommon.cginc commit cc0a36b42965c6e04f9b088d363f68ec8b2d41ae Merge: bd366e5cf8 d2bacd6482 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Nov 4 14:43:23 2019 +0100 Merge branch 'vfx/staging' into vfx/feature/mesh-sampling # Conflicts: # TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset # com.unity.visualeffectgraph/Editor/Compiler/VFXCodeGenerator.cs # com.unity.visualeffectgraph/Editor/Compiler/VFXShaderWriter.cs # com.unity.visualeffectgraph/Shaders/VFXCommon.cginc commit bd366e5cf8dc25b725a4f064ad65577d26d1f51f Author: Richard Kettlewell <richardk@unity3d.com> Date: Wed Dec 12 12:53:50 2018 +0000 Fix mesh sampling stride and remove fmod when not needed commit 706aa48a4a98b76f5f2a4d190b4df9250e0896dc Author: Richard Kettlewell <richardk@unity3d.com> Date: Tue Dec 11 16:40:06 2018 +0000 color space fix commit 3df16fe0c60a235e3991249553ccf4167bd7d736 Author: Richard Kettlewell <richardk@unity3d.com> Date: Tue Dec 11 16:03:25 2018 +0000 Shape gfx test commit ceef2e0410503647eb1f997f217e9442fb50b823 Author: Richard Kettlewell <richardk@unity3d.com> Date: Tue Dec 11 12:32:36 2018 +0000 Remove baking prototype and fix channel offsets commit 39d518807d279fd328cc4408d5f85667f60e719b Author: Richard Kettlewell <richardk@unity3d.com> Date: Mon Dec 10 15:26:55 2018 +0000 Mesh sampling * Commit data files as lfs * Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r47935 Rename IsTypeCanBeConstantFolded into IsTypeConstantFoldable * Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r47933 Use simpler & explicit definition of propagated flags * Fix several issue/comment Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50761 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50762 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50764 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50765 * Switch 007_SimpleMaterial from Lit to Unlit to avoid any change from shadergraph * Fix tooltip issue from @lewisjordan Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51380 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51381 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51382 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51383 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51384 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51385 Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51386 Side note : use mode instead of "addressingMode" in PositionMesh as well. * Fix issue : https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51553 * As suggested by @julienf default VFXOperatorUtility.SequentialAddressingMode to Clamp for performance in https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#issuecomment-20777 * Add composition for Position (Mesh) as suggested by @thomasi Co-authored-by: Tristan Genevet <tristan@unity3d.com> * Update experimental disclaimers (#367) * Updated experimental disclaimers * Removed link and added description instead. * [HDRP] MSAA & MotionVector (#12) * Support WRITE_MSAA_DEPTH Unlit template * Fix MSAA for lit output * *Update changelog * Fix SSAO (among other passes) integrating WRITE_MSAA_DEPTH TODO : Fix Sphere output as well * Fix typo in ParticlePoint * Factorize common fragment Lit & unlit for depth alike passes. * Fix particle hexadreon wrong depth with alpha clip * Revert "Fix particle hexadreon wrong depth with alpha clip" This reverts commit b16bd570440087984c2c8c48279bebb088f748e8. * Allow an object slot to have null as its value (#25) * Allow an object slot to have null as its value * changelog * Vfx/fix/prevent capacity change locked (#24) * Prevent capacity change in the debug ui when editing a read only asset such as templates in package mode * changelog * *Update all vfx (had to do it manually...) * Restore missing enty in hdrp changelog (bad resolve conflict from me) * Fix 1233044 - capacity cannot be zero (#21) * Prevent capacity from being 0 * Fix strip capacity as well * Vfx/fix/param order (#22) * Fix for dragged parameters order when there are categories * changelog Co-authored-by: Julien Fryer <julienf@unity3d.com> * Fix minor issue with VFXPreviousPositionBinder.cs (#23) Co-authored-by: Julien Fryer <julienf@unity3d.com> * Vfx/fix/sgoperator create context drag (#28) * Prevent from creating a context in VisualEffectSugraphOperator by draggingfrom an output slot. * changelog * Vfx/fix/context no blocks (#27) * Don't show block windows when context cant have blocks (output mesh ) * changelog * PropertyBinder : Minor Fixes (#29) * Fix for binder when null asset & fix for binder while resetting * Call ClearPropertyBinders while resetting * Add Update Modes & Time Access (revival) (#4) * Squashed commit of the following: commit d77638ba4188bfb03c81130b82cacb2a719f03be Merge: 49eaeadff7 a9338688a6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 09:46:59 2020 +0200 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 49eaeadff7b22d48f26d3b1aa528a9c650ec1cc5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 19 14:53:09 2020 +0100 Update UX for new time access (#260) https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/256#issuecomment-18280 See slack discussion : https://unity.slack.com/archives/G1BTWN88Z/p1584622775185300?thread_ts=1584523980.160500&cid=G1BTWN88Z commit 78d5d9938d9896d517efa89662764afd44ef12fc Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 13 16:03:26 2020 +0100 Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/256/files#r43060 commit bc7e715b0e41b55126fdf171b7459b680e3e3824 Merge: 9a82a52bfe ec959d5de3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 13 14:52:03 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 9a82a52bfe2384ef5f03344f8c68516f9fd57d88 Merge: f56986d415 66df0debfc Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Mar 13 09:17:53 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit f56986d4157f140ca84b039d97c8b7064a18214e Merge: 047820690f 5d2dfe278f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 25 13:25:07 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 047820690fa496bd43d3a60df16dd0932502c7cb Merge: d6d17dfbbc e6fd39c7a2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 24 14:56:39 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md commit d6d17dfbbc65aaa32712b5b16dfa1bf871b5c979 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 14 16:59:15 2020 +0100 Squashed commit of the following: commit ec0f1a18fb986005c13e1147938cb5de7fa0f7f8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 14 13:37:05 2020 +0100 Use implicit block for old position backup commit e786cf3ade7d7515da4569dde9455881af02f282 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Sun Jan 12 15:05:03 2020 +0100 WIP : Add option to skip zero delta per update context commit e864fae742120fbfebabb26b605ddedfd184b02b Merge: 4eecc0b90b fb12af4c28 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 14 16:47:57 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 4eecc0b90bbcf60eb7254c55f23a040ddd2a72a5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Jan 13 16:08:07 2020 +0100 Rename ProcessEveryFrame in ExactFixedTimeStep commit 9d3e36a36ad4e79b3f6e6315658e3735196b81ba Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 10 16:21:50 2020 +0100 Fix ManagerMaxDeltaTime (was GameDeltaTime) commit eaebe2649e93a5083fd62c91ac92185794b908e5 Merge: 98e7dcfcdc 276c02f29a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 10 13:42:08 2020 +0100 Merge remote-tracking branch 'vfxgraph/vfx/staging' into vfx/feature/add-time-update-modes commit 98e7dcfcdceb710c252e4d1a257815a724539e68 Merge: 248004d55a 0737eb535c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 10 13:26:54 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 248004d55a7b96c6532cd3c197e175b751d6f3fe Merge: 2bbadae355 8ab634f533 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jan 9 13:12:50 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit 2bbadae355bb3c4a308b8d4e020e96127fa94818 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 23 10:07:46 2019 +0100 Add tooltip to VFXTime.cs commit 9dc7ea790327b44ffde94bbf783d588e74c50174 Merge: bf48ba84eb 1758e4de4b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 17:29:13 2019 +0100 Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes commit bf48ba84ebfd1472d041966ba4be627e3a1ef427 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 17:26:30 2019 +0100 *Update changelog.md commit b5d76d5d5d65584fde771213d9a01adc6dd9b856 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 16:10:19 2019 +0100 Add operator to enable time accesses commit 1a2fe7b8dc5072dd49d985f045f276385e08287f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 11:25:52 2019 +0100 Add built-in expression (but not listed) commit b0d0e64ee04036adf48f4481bfd22eace649bac3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 10:37:50 2019 +0100 Add some header commit 490a441046a227bb1cc1b98418d0559da17d3771 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 10:36:57 2019 +0100 Add tooltip & text content commit 621c5b2b78545800b2e94921b9314ef860992059 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 19 10:09:32 2019 +0100 *Add custom inspector to edit update flags efficiently * Fix build (VFXPropertyAttribute.Create isn't needed anymore) * Fix editor test * Read Attribute in Spawn Context (#6) * Squashed commit of the following: commit 9d42330b20431b0ff5c4a5e5a90bf293635ab4a2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Apr 3 11:14:14 2020 +0200 *Update image reference (having issue with standalone, not sure of the result) commit 275c22de35f08ada783c96c625b12475f0c42337 Merge: 85254f1ec4 a9338688a6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Apr 3 09:59:48 2020 +0200 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner # Conflicts: # TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png # TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png # com.unity.visualeffectgraph/CHANGELOG.md commit 85254f1ec4ffb2c4d0014a2baa52f49f0b97d0f8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 17 16:21:39 2020 +0100 *Update image reference due to fix with grapicTest update commit e361ecfed65e61f07db4af32f4dd22a9d3cb9caf Merge: d8db341bfb 47b17e444b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 17 11:51:43 2020 +0100 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner # Conflicts: # TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png # TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png # TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset commit d8db341bfbd9257e1a5285d200e3eabe24857b01 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 5 17:57:38 2020 +0100 *Apply Formatting commit f80441dd6b30ef726d46ae2fe32bcf05d208b760 Merge: b3d858ffe1 01f176355a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 5 17:32:49 2020 +0100 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner commit b3d858ffe13b19dc42e1874d8393cf9829a5e2c7 Merge: 0bce44dc9a 5d2dfe278f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 25 13:18:58 2020 +0100 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner # Conflicts: # .yamato/upm-ci-vfx_lwrp.yml # .yamato/upm-ci-vfxmain.yml # com.unity.visualeffectgraph/CHANGELOG.md commit 0bce44dc9a694bf36b849efb894e999fa9dc959e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 24 14:20:03 2020 +0100 *Fix build commit 03b0b05d4f86168f97d9e5e34757b79cae6c39df Merge: 2130ea0ef2 e6fd39c7a2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 24 09:47:09 2020 +0100 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md commit 2130ea0ef2186ecdc5692878940d5d6635dca31b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Jan 13 14:09:13 2020 +0100 *Update tooltips (thanks @vlad) commit f8cdb95f5d2075848e530d997551b69de43f39e0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Jan 13 14:01:44 2020 +0100 Rename SpawnerState in SpawnState commit 3e2b4fd67c4776907e96a8cfa1b9985ee3fab2fd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Jan 13 13:54:24 2020 +0100 Improve ReadAttribute test to cover NewLoop state commit 2c515bfde823bfbce87df8a1444e19e5c2327e32 Merge: a9efee24ff bff1b74b59 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 23 16:32:45 2019 +0100 Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner commit a9efee24ff84131c53dc2ba93f1985b02217e3d7 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 16 14:54:25 2019 +0100 *Update comment commit 6b17879881555cd72b3af4463fd907423f92ad7f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 16 14:53:11 2019 +0100 Throws an exception while detecting unexpected expression flag commit cbad9212075ec6776cf9d892185dd6ee64f8fab2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 16 09:43:33 2019 +0100 Reorder spawner state operator commit e2357ac0dee8d71fe9d4a1ad877aa5fe19a5222a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 16 09:35:30 2019 +0100 Fix issue "Cannot plug in attribute-derived nodes into a spawner block." commit b06d7f0708e5178cae51e9e8b96f547fc2f4c6b2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 9 15:58:30 2019 +0100 *Update changelog commit 61bd2e5871f23002dd1add024858efdef5e09372 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 9 15:46:52 2019 +0100 Update _CCCC test & Rename Spawner State library name commit 4942912123d795023aacb0363c8e462a2da29943 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 16:58:17 2019 +0100 Fix test & clean useless code in VFXExpression.Initialize commit e6d6c593eb27c612a225340615dabe7692f76a00 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 15:22:31 2019 +0100 Switch to graphics/vfx/fix/read-attribute-in-spawner for testing purpose commit f00f740b775f67e9378072744513f3ff920f470d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 15:16:39 2019 +0100 Update 20_SpawnerChainingAndLoop (this is the only test affected by compilation order change) commit b7d8e238dd7e05bf99114a980c8584da7985dcf8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 14:45:56 2019 +0100 Clean test data & add reference images commit 6ddb3389f8e62da44ef50de621884b0526e1b8aa Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 14:17:51 2019 +0100 Move graphicTest to common files commit fa21846e7787fec9068c5a18a33dc568df3f7cc9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 11:53:18 2019 +0100 Separate cleanly per event attribute expressions commit 80e5259674a011e864e65f13c77ce06f92f33b7f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Dec 6 08:38:41 2019 +0100 New test for chaining & read attributes commit 97473daecd146b85eb3c232fffe8141bd0a7f3a1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 5 18:47:20 2019 +0100 Add read attribute for loop settings (context evaluation) commit a41a4a6095e9d5791fdbf3e26baf1d871cfc0fab Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 5 15:30:56 2019 +0100 Clean expression patching commit 9af80d22f70443ef0eb1a8d29aef1d0b3bc64ca0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Dec 5 11:45:06 2019 +0100 Clarify compatibility code for spawner order & random implication commit 0dcf774f623fb93eb7bc19b06407b88669472443 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Dec 4 18:42:30 2019 +0100 Add tricky case in test vfx & fix compatibility code TODO : Optimize it & reserve cleaner solution when change graphicTest result is expected commit 92b5328ab0ea225d0dd86d1443af0e64bae1963e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Dec 4 16:49:42 2019 +0100 *Up local test commit 0984d8a89b5cc8e0daa79765b00392fa4dfff5d4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Dec 4 15:22:03 2019 +0100 Detect & Compute partial evaluation commit 2d9e7a250a0437c13e5f180e4feb4cc97d47aa5b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Dec 3 15:16:29 2019 +0100 Add spawner State Operator & SpawnCount (even if it's actually an attribute) commit 0b1c1982a8ed4bb61182aa070561b7f6036bc07d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Dec 3 15:04:04 2019 +0100 Add spawner state accessor commit adb1d6d66172f2d187b577facaf7b2aea4677d13 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Dec 3 11:24:20 2019 +0100 Add VFXDataSpawner & Use this helper to retrieve read attribute per context while compiling commit d43ad0e1395d0e51f3583ce9627a72006356e117 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 2 16:19:05 2019 +0100 Store m_GlobalEventAttributes in VFXExpressionGraph : this data is used to patch VFXReadAttribute commit 8a25b5fbed33569529d30379fce2acd4da7de88d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Nov 29 16:14:32 2019 +0100 Backup test asset (temporarily) commit dcb3efaf885dbbdec317f5a42ace9ace336fded9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Nov 28 16:37:48 2019 +0100 WIP : experimenting new concept of Read Attribute expression * Merge with vfx/staging * Update VFX * Misc small fixes (#36) * Fix strips outputs, spawnIndex and default metallic value * Increase threshold in particle strip unlit test * Test for Override resetted (#26) * *WIP* add test * Actually add a more legit "prefab" test * Prepare fix later fix of 1206890 : can't change the C++ without updating this test * Fix editor test (todo : graft this change to master to anticipate the C++ change) * Add test to cover https://fogbugz.unity3d.com/f/cases/1232862/ (#20) * New Test : total time is sum of delta time (#7) * *WIP Skeletan of new test to check behavior of https://ono.unity3d.com/unity/unity/pull-request/104407/_/vfx/fix/total-time-is-sum-of-delta-time * Effective test to cover fixing behavior of https://ono.unity3d.com/unity/unity/pull-request/104407/_/vfx/fix/total-time-is-sum-of-delta-time * Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/7/files#r51249 * [Fix] Disable reset option (#41) * Disable reset option * Add repro case 1251533 * Fix minor issue with PreviousPropertyBinder (bis) (#31) * Fix minor issue with VFXPreviousPositionBinder.cs * Fix exception in OnEnable Note : I didn't try it locally yet. * Actual fix of VFXPreviousPositionBinder.cs Co-authored-by: Julien Fryer <julienf@unity3d.com> * Fix culture issues when generating attributes defines in shaders (#40) * [PropertyBinder] Move Update to LateUpdate (#38) * Fix issue with VFXPropertyBinder : we should use late update instead of Update * *Update 23_ParameterBinder reference image * Call resyncslots on shadergraph dependent models. (#10) * Call resyncslots on shadergraph dependent models. * missing call to checkgraphbeforeimport * indentation * fix slot not updated if only the attributes change * Do the same for models having subgraphs than for models having shadergraphs. * Fix based on PR review * Update CHANGELOG.md * update vfx and settings * Renable 009_MultiCamera in URP project * Easy Wins (Small Workflow / Cosmetic fixes) (#37) * Properties now exposed by default in blackboard * Dissociated Colors for bool/int/uint * Added Degrees / Radians conversion subgraphs in samples * De-nicified attribute name (conserve case) in Set Custom Attribute title * Changed the default "No Asset" message when opening the visual effect graph window. * Subgraphs are not in hardcoded categories anymore + Updated Serialization * Added Documentation for setting Subgraph Menu Categories Co-authored-by: Julien Fryer <julienf@unity3d.com> * Vfx/docs/compatability disclaimer (#43) * Added compatability disc * Updated format. * Save a specific vfx asset and its sugraphs only (#35) * Save graph asset works * Update CHANGELOG.md * Update VisualEffectGraphWindow.md * Update VisualEffectGraphWindow.md * Fix for block copy not dirtying the scene. * Remove some unecessary compilation (not all) (#46) * New TransformVector4 and GetTextureDimensions operators (#18) * Vfx/feature/new operators 2 (#266) * Add TransformVector4 operator * Remove unused code * Fix warning * Refactor dynamic type operator * Samll fix to previous commit * Add texture dimensions operator and expressions * Add tooltips * Add changelog entry * Fix merge compilation * Modify point cache test * Prevent textures from being constant folded * Move modified test to correct folder * Output Event (#5) * Squashed commit of the following: commit 449a60793a4c5c91e1913c42632448eb07ebe5de Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 14:27:48 2020 +0200 Fix stackoverflow with subgraph (but doesn't fix the internal workflow) commit caf0df3af5f451f9576c2cc7f328b57a87479f30 Merge: bb1047c59a a9338688a6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Apr 2 10:22:47 2020 +0200 Merge branch 'vfx/staging' into vfx/feature/output-event commit bb1047c59a084551e7df3b93d7d5ad501145ecaf Merge: 7b2890b76f 98ce4878d1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 19 17:17:21 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit 7b2890b76ffcea3b701568f47b97d02e7d5cb6a3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 19 16:54:17 2020 +0100 Add a check of outputEvent in SpawnerTest commit 945992b2feff4b8f7a24740944c77a4a92f271dc Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 19 16:24:56 2020 +0100 *Update OutputEventTest.cs to check Test_Output_Event commit c48fda763e807503f27f98deeda4238b6628c264 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Mar 18 10:17:21 2020 +0100 *Update image reference & Test (stop using a undebuggeable random position) commit 5a5ad49cb485907ee869445627821810589ab34a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 17 22:12:58 2020 +0100 Fix newly integrated spawn test for output event commit 1f978a4645eb211d6a797c2e30a6ced2dab3e50c Merge: ef4837245e 47b17e444b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 17 17:53:06 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event # Conflicts: # TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset # com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs # com.unity.visualeffectgraph/Editor/Models/Contexts/VFXContext.cs commit ef4837245e1d88846f6d686e2803094d1d6cd04d Merge: 2331c32fb4 0e325d7de5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 11 08:30:00 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit 2331c32fb4b0f33f7f9b5086ffd11917bd5e1cda Merge: 5d225d6e19 0103971ce2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Feb 6 08:01:06 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md commit 5d225d6e192b32394faf0964ad263cc33c5280cc Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 4 15:01:51 2020 +0100 Fix editor test commit 7d941ea0375fcb27ac7b14cf4df4cf14fde71ff2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Feb 4 15:00:35 2020 +0100 Add distinct while retrieving virtual link commit 725252869ac24d962490b4550821fbba2ab119b3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Feb 3 14:38:52 2020 +0100 *WIP* Output test commit 96098fa11f4781837543fba099936b15a8c7158d Merge: 02178104a3 bb04ca28fb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 31 14:07:02 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit 02178104a301fb434d5e6821cd369884bbc01006 Merge: 1443b66691 db8325ba2b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 28 18:06:20 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit 1443b66691d46ed9598ccc26b0b9425d373b61e1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 28 17:37:08 2020 +0100 *Reduce unexpected changes commit aa1afcafa9c95d042db146043c60015d3f5c96f2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 28 17:31:13 2020 +0100 New UX for output event (use data instead of system name) (#229) * *WIP* Experiment for UX using eventName * Doesn't work yet but less hacky approach : share automatically vfxdata among output event with same name * Remove useless naming pattern linking label & title for output Cleaner & Safer implementation for outputEvent edition * Use unique system naming * Add test for Data for VFXOutputEvent * Fix hacky OnInvalidate commit 9cd41b81cef062991907d5ce446336bde78b79d3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 22 15:11:39 2020 +0100 Add editor test to check return value of output event (not attribute, already cover by graphic test) commit 1a09c63a98e4650b82160e670cedfb06b630284d Merge: 35126156f2 52ce8b9636 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 22 11:02:45 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit 35126156f2b93b04543de0eb91aca79adf331b2c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jan 17 13:58:06 2020 +0100 Avoid exception if system isn't present yet commit dccc1c5b9a98fa78749f9cd7844266a13478fb3f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jan 16 10:53:13 2020 +0100 *Update Test, adding a test on unused source attribute commit bfd29d8862539cef5b14392e21cbd896436339a5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 15 20:20:59 2020 +0100 Add reference to ReadSource in OutputEvent to retrieve all active attributes in spawn context (TODO : cover it in test) commit d89160df852b64a4b5ecf378c506aa0c9f1c099c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 15 16:13:02 2020 +0100 Filters out orphan output event context commit 721873c2f0ed0976d081402d6c6e3a45ab4ce0cd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 15 14:30:08 2020 +0100 *Update changelog commit cf54e5372e273f86dd5c2e00a6178a543f234fd3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 15 08:40:09 2020 +0100 Add reference image for HDRP commit d710998eb133a3dbadbdec580d1ecad3752aca85 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 14 16:17:28 2020 +0100 Add reference images for newly added test commit bc5174dfae9ac396c720b4f30514b12a64ccd0f0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 14 15:23:18 2020 +0100 *Add a material to unit test commit 6b332b9afba57eaea64d1f5b55833ba55c6a25c2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 8 17:02:27 2020 +0100 Start implementing a effective test project commit 33e66d45fbb0846ee2d8f9f14d86ef400d0ce4a1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 8 16:56:28 2020 +0100 FIx system name synchronisation (not really ideal) commit 7782b888266a011f4f986a7bb3161f024730caa7 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 8 14:24:08 2020 +0100 Fix UI of output event commit 8c9ec8d65e07fac81da38a1cccb8228cace81e64 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jan 8 10:11:56 2020 +0100 Fix build commit 50ae031af02d4c41e651f64b40e9d265668b803f Merge: d838cd2d37 8ab634f533 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jan 7 13:36:21 2020 +0100 Merge branch 'vfx/staging' into vfx/feature/output-event commit d838cd2d3792ca1c15af86b0385fdade7da9a3a8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Dec 24 14:58:00 2019 +0100 Add a wip test scene commit 459b344b3f97c794d47a8eb6942b1129d18632cd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Dec 24 11:40:30 2019 +0100 Fill VFXDataOutputEvent commit e54905485dd553cadcde307ca00a8d7ce8454c0f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Dec 23 18:21:31 2019 +0100 Add basic output event type (empty FillDesc implementation for now) * Change the way we are sharing outputevent to support subgraph (need to update test & merge master before going further) *WIP* * Update 009_OutputEvent test * Move 009_OutputEvent to correct folder (TODO, this to rename it before merge) * Fix sanity test & allow multiple connection from in outputEvent (as initialize) * Get rid of SynchronizeDataTitleAndEventName, using directly stored value per context * Fix editor test using eventName instead of tile * Revert unexpected changes * *Update from C++ change => VisualEffect.OutputEventArgs => VisualEffectOutputEventArgs See https://ono.unity3d.com/unity/unity/pull-request/107827/_/graphics/vfx/feature/output-event-with-delegate-squashed#comment-847485 * Rename VisualEffectOutputEventArgs => VFXOutputEventArgs * Disable connection from OutputEvent to GPUEvent * *Fix build VisualEffect.OutputEventArgs => VFXOutputEventArgs Missing change from : https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/5 * Vfx/feature/enum parameter (#8) * Restart of enum parameters * more work * more work * Still more work. * reorderable list looks good. * Adding and removing values works. * dragging item works. * Enum values show in the inspector. * fixes for rebase * Enumvalue works on subgraphs. * notify enum name change. * Added documentation for blackboard value filtering. * no value per enum * only uint can now avec enum values. * don't nicify enum values. * Update Blackboard.md * Update VFXBlackboard.uss * sanitize parameter already having range * Clamp enum value works. * Changing switch testValue to uint. * value appearing as menu if mode is enum. * Update CHANGELOG.md * Mutli editor of different values of enum parameter works. * cpoy paste enumValues and min/max when copying parameter. * Copy parameter mode when converting to subgraph. * fix * Fix IsCompatible for uintproperties. transfer known label width when PropertyRM rebuilt. * Vfx/docs/new operator docs (#50) * Added documentation for new operators * Changed bullet format. * Fix creation of StringPropertyRM (#51) * Fix creation of StringPropertyRM * Update CHANGELOG.md * Fix input of event emitting block beeing to small because of output * Multi-mesh output, LODs and compute culling (#14) * Implement multi mesh * Add LOD + lit mesh output support * Small fix + optim * Fix crash with multi mesh + sorting * Fix shader compilation with single mesh and compute culling * implement multi sorting * Add globalSort parameter * Fix camera absolute mode * Fix URP shader compilation * Add frustum culling to LOD * Add frustum culling setting * filter out implicit settings and add tooltips * Add radius scale + tooltips * Add a graphics test * Update change log + lod and multi mesh as experimental features * Forgot a file * Small changes based on QA review * Simulate headers on enum values in SlotContainerEditor (#49) * Simulate headers on enum values in SlotContainerEditor * Update CHANGELOG.md Co-authored-by: Julien Fryer <julienf@unity3d.com> * Update VFX * Fix for blackboard scrollable element hidden by resize. * Disable LOD test for XR * Fix test threshold that was reset to 0... * Ignoer graphviz folder * Target Gameobject windows resize doesn't go too far above scrollbars * Missing or incorrect unit in uss. * fix for reference image "VFX/Execution" not updated to new path ( warning when adding output) * Change description in package.json to reflect VFX is not out of preview with URP and mobile Co-authored-by: Tristan Genevet <tristan@unity3d.com> Co-authored-by: Thomas Iché <peeweek@gmail.com> Co-authored-by: Thomas Iché <thomasi@unity3d.com> Co-authored-by: Paul Demeulenaere <pauld@unity3d.com> Co-authored-by: JordanL8 <lewis.jordan@hotmail.co.uk> Co-authored-by: Lewis Jordan <lewisjordan@unity3d.com>
1 parent a6f80aa commit 69598fc

File tree

7 files changed

+91
-65
lines changed

7 files changed

+91
-65
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ ShaderGraph/DebugOutput.meta
3636
ShaderGraph/DebugOutput/**
3737
ShaderGraph/Testing/IntegrationTests/.Failed
3838
TestProjects/*/ProjectSettings/ProjectVersion.txt
39+
TestProjects/VisualEffectGraph_HDRP/GraphViz/
3940
node_modules

‎com.unity.visualeffectgraph/Editor Default Resources/uss/PropertyRM.uss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ Matrix4x4PropertyRM.propertyrm VFXMatrix4x4Field
280280

281281
.ListPropertyRM > .ReorderableList
282282
{
283-
margin-top:4;
284-
margin-left:4;
285-
margin-right:4;
283+
margin-top:4px;
284+
margin-left:4px;
285+
margin-right:4px;
286286
flex:1 1 auto;
287287
}

‎com.unity.visualeffectgraph/Editor Default Resources/uss/VFXBlackboard.uss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
.blackboard *
1+
VFXBlackboard.blackboard
22
{
33
font-size: 11px;
4+
background-color: rgba(0,0,0,0);
5+
border-color: rgba(0,0,0,0);
6+
}
7+
8+
.blackboard > .mainContainer
9+
{
10+
background-color: #2b2b2b;
11+
border-color: #191919;
12+
margin-left:6px;
13+
margin-right:6px;
14+
margin-top:6px;
15+
margin-bottom:6px;
16+
border-radius: 5px;
417
}
518

619
#vfx-properties

‎com.unity.visualeffectgraph/Editor Default Resources/uss/VFXComponentBoard.uss

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,29 @@ VFXComponentBoard.graphElement
22
{
33
position:Absolute;
44

5-
background-color: #2b2b2b;
6-
border-color: #191919;
7-
85
padding-left:0;
96
padding-right:0;
107
padding-top:0;
118
padding-bottom:0;
129

10+
11+
12+
1313
min-width: 286px;
1414
min-height: 100px;
1515
}
1616

17+
VFXComponentBoard.graphElement > .mainContainer
18+
{
19+
flex: 1 1 auto;
20+
background-color: #2b2b2b;
21+
border-color: #191919;
22+
margin-left:6px;
23+
margin-right:6px;
24+
margin-top:6px;
25+
margin-bottom:6px;
26+
}
27+
1728
*
1829
{
1930
font-size: 11px;
@@ -54,9 +65,9 @@ VFXComponentBoard, #component-container
5465
border-color: #212121;
5566
border-top-right-radius: 4px;
5667
border-top-left-radius: 4px;
57-
padding-left: 1px;
58-
padding-top: 4px;
59-
padding-bottom: 2px;
68+
padding-left: 8px;
69+
padding-top: 8px;
70+
padding-bottom: 8px;
6071
}
6172
#header > #labelContainer {
6273
flex:1 0 auto;

‎com.unity.visualeffectgraph/Editor Default Resources/uss/VFXContext.uss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ VFXContextUI #header-space.spaceWorld
199199

200200
VFXContextUI #footer #icon
201201
{
202-
--unity-image:resource("VFX/Execution");
202+
--unity-image: url("project:///Packages/com.unity.visualeffectgraph/Editor Default Resources/VFX/Execution.png");
203203
}
204204

205205
VFXContextUI #block-container {

‎com.unity.visualeffectgraph/Editor Default Resources/uxml/VFXComponentBoard.uxml

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,63 @@
11
<UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:gv="UnityEditor.Experimental.GraphView">
2-
3-
<ui:VisualElement name="header" pickingMode="Ignore">
4-
<ui:VisualElement name="labelContainer" pickingMode="Ignore">
5-
<ui:Label name="titleLabel" text="Target visual effect GameObject" tooltip="Select a visual effect gameobject in the scenes and attach for additionnal control."/>
6-
<ui:Label name="subTitleLabel" />
7-
</ui:VisualElement>
8-
</ui:VisualElement>
9-
<ui:ScrollView class="stretchContentWidth">
10-
<ui:VisualElement name="attach-container">
11-
<ui:Button name="attach" text="Attach" />
12-
<ui:Label name="component-path" text="" pickingMode="Ignore"/>
13-
<ui:Button name="select" text="select" />
2+
<ui:VisualElement class="mainContainer">
3+
<ui:VisualElement name="header" pickingMode="Ignore">
4+
<ui:VisualElement name="labelContainer" pickingMode="Ignore">
5+
<ui:Label name="titleLabel" text="Target visual effect GameObject" tooltip="Select a visual effect gameobject in the scenes and attach for additionnal control."/>
6+
<ui:Label name="subTitleLabel" />
7+
</ui:VisualElement>
148
</ui:VisualElement>
15-
<ui:VisualElement name="divider" class="horizontal"/>
16-
<ui:VisualElement name="component-container">
17-
<ui:VisualElement name="parameter-container" pickingMode="Ignore"/>
18-
<!--<ui:VisualElement name="particle-count-container" pickingMode="Ignore">
19-
<ui:Label text="Particle Count" pickingMode="Ignore"/>
20-
<ui:Label name="particle-count" text="1337000" pickingMode="Ignore"/>
21-
</ui:VisualElement>-->
22-
<ui:VisualElement pickingMode="Ignore" >
23-
<ui:VisualElement name="toolbar" pickingMode="Ignore" >
24-
<ui:Button name="stop">
25-
<ui:Image name="icon"/>
26-
</ui:Button>
27-
<ui:Button name="play">
28-
<ui:Image name="icon"/>
29-
</ui:Button>
30-
<ui:Button name="step">
31-
<ui:Image name="icon"/>
32-
</ui:Button>
33-
<ui:Button name="restart">
34-
<ui:Image name="icon"/>
35-
</ui:Button>
36-
</ui:VisualElement>
37-
<ui:VisualElement name="play-rate-container" pickingMode="Ignore" >
38-
<ui:Label text="Play Rate" />
39-
<ui:Slider name="play-rate-slider" direction="Horizontal" />
40-
<uie:IntegerField name="play-rate-field"/>
41-
<ui:Button name="play-rate-menu" text="Set" class="MiniDropDown"/>
42-
</ui:VisualElement>
43-
<ui:VisualElement>
44-
<ui:VisualElement name="divider" class="horizontal"/>
45-
<ui:Label name="events-label" text="Events" />
46-
<ui:VisualElement pickingMode="Ignore" style="flex-direction:row">
47-
<ui:Button name="on-play-button" text="OnPlay" style="flex:1"/>
48-
<ui:Button name="on-stop-button" text="OnStop" style="flex:1"/>
9+
<ui:ScrollView class="stretchContentWidth">
10+
<ui:VisualElement name="attach-container">
11+
<ui:Button name="attach" text="Attach" />
12+
<ui:Label name="component-path" text="" pickingMode="Ignore"/>
13+
<ui:Button name="select" text="select" />
14+
</ui:VisualElement>
15+
<ui:VisualElement name="divider" class="horizontal"/>
16+
<ui:VisualElement name="component-container">
17+
<ui:VisualElement name="parameter-container" pickingMode="Ignore"/>
18+
<!--<ui:VisualElement name="particle-count-container" pickingMode="Ignore">
19+
<ui:Label text="Particle Count" pickingMode="Ignore"/>
20+
<ui:Label name="particle-count" text="1337000" pickingMode="Ignore"/>
21+
</ui:VisualElement>-->
22+
<ui:VisualElement pickingMode="Ignore" >
23+
<ui:VisualElement name="toolbar" pickingMode="Ignore" >
24+
<ui:Button name="stop">
25+
<ui:Image name="icon"/>
26+
</ui:Button>
27+
<ui:Button name="play">
28+
<ui:Image name="icon"/>
29+
</ui:Button>
30+
<ui:Button name="step">
31+
<ui:Image name="icon"/>
32+
</ui:Button>
33+
<ui:Button name="restart">
34+
<ui:Image name="icon"/>
35+
</ui:Button>
4936
</ui:VisualElement>
50-
<ui:Label name="debug-label" text="Debug"/>
51-
<ui:VisualElement name="debug-container" pickingMode="Ignore">
52-
<ui:Button name="debug-modes" text="Debug modes" class="DropDown"/>
53-
<ui:VisualElement name="debug-modes-container" />
37+
<ui:VisualElement name="play-rate-container" pickingMode="Ignore" >
38+
<ui:Label text="Play Rate" />
39+
<ui:Slider name="play-rate-slider" direction="Horizontal" />
40+
<uie:IntegerField name="play-rate-field"/>
41+
<ui:Button name="play-rate-menu" text="Set" class="MiniDropDown"/>
5442
</ui:VisualElement>
55-
<ui:VisualElement name="events-container" pickingMode="Ignore" >
43+
<ui:VisualElement>
44+
<ui:VisualElement name="divider" class="horizontal"/>
45+
<ui:Label name="events-label" text="Events" />
46+
<ui:VisualElement pickingMode="Ignore" style="flex-direction:row">
47+
<ui:Button name="on-play-button" text="OnPlay" style="flex:1"/>
48+
<ui:Button name="on-stop-button" text="OnStop" style="flex:1"/>
49+
</ui:VisualElement>
50+
<ui:Label name="debug-label" text="Debug"/>
51+
<ui:VisualElement name="debug-container" pickingMode="Ignore">
52+
<ui:Button name="debug-modes" text="Debug modes" class="DropDown"/>
53+
<ui:VisualElement name="debug-modes-container" />
54+
</ui:VisualElement>
55+
<ui:VisualElement name="events-container" pickingMode="Ignore" >
56+
</ui:VisualElement>
5657
</ui:VisualElement>
5758
</ui:VisualElement>
5859
</ui:VisualElement>
59-
</ui:VisualElement>
60-
</ui:ScrollView>
60+
</ui:ScrollView>
61+
</ui:VisualElement>
6162
<gv:ResizableElement pickingMode="Ignore" />
6263
</UXML>

‎com.unity.visualeffectgraph/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "10.0.0-preview.16",
55
"unity": "2020.2",
66
"unityRelease": "0a17",
7-
"description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU.",
7+
"description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.",
88
"keywords": [
99
"vfx",
1010
"visualeffect",

0 commit comments

Comments
 (0)