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

* 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

Author: PaulDemeulenaere

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXContextTests.cs

@@ -194,6 +194,24 @@ public void MultiLinkSpawnerSpawnerAfterSpawnerInit()
             Assert.AreEqual(2, from.outputContexts.Count());
         }
 
+
+        [Test] //see fogbugz 1269756
+        public void Link_Fail_From_Event_To_OutputEvent()
+        {
+            var from = ScriptableObject.CreateInstance<VFXBasicEvent>();
+            var to = ScriptableObject.CreateInstance<VFXOutputEvent>();
+            Assert.IsFalse(VFXContext.CanLink(from, to));
+        }
+
+        [Test]
+        public void Link_Fail_From_Event_To_Initialize()
+        {
+            //For now, we can't use direct link from event to initialize context.
+            var from = ScriptableObject.CreateInstance<VFXBasicEvent>();
+            var to = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            Assert.IsFalse(VFXContext.CanLink(from, to));
+        }
+
         [Test]
         public void Link_Fail()
         {

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXControllerTests.cs

@@ -940,6 +940,45 @@ public void ConvertToSubgraph()
 
             window.graphView.controller = null;
         }
+
+        [Test]
+        public void Subgraph_Event_Link_To_Spawn()
+        {
+            VFXViewWindow window = VFXViewWindow.GetWindow<VFXViewWindow>();
+            window.LoadAsset(AssetDatabase.LoadAssetAtPath<VisualEffectAsset>(testAssetName), null);
+
+            //Create Spawner in subgraph
+            {
+                var spawner = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+                m_ViewController.graph.AddChild(spawner);
+                m_ViewController.LightApplyChanges();
+
+                var controller = window.graphView.Query<VFXContextUI>().ToList().Select(t => t.controller).Cast<Controller>();
+                Assert.AreEqual(1, controller.Count());
+                VFXConvertSubgraph.ConvertToSubgraphContext(window.graphView, controller, Rect.zero, testSubgraphSubAssetName);
+            }
+
+            var subGraphController = m_ViewController.allChildren.OfType<VFXContextController>().FirstOrDefault(o => o.model is VFXSubgraphContext);
+            Assert.IsNotNull(subGraphController);
+
+            //Create Event Context & Link the two input flow
+            var subGraphContext = subGraphController.model;
+            var eventContext = ScriptableObject.CreateInstance<VFXBasicEvent>();
+
+            Assert.IsTrue(VFXContext.CanLink(eventContext, subGraphContext, 0, 0));
+            Assert.IsTrue(VFXContext.CanLink(eventContext, subGraphContext, 0, 1));
+
+            eventContext.LinkTo(subGraphContext, 0, 0);
+            eventContext.LinkTo(subGraphContext, 0, 1);
+
+            var flow = eventContext.outputFlowSlot.First().link;
+            Assert.AreEqual(2, flow.Count());
+            Assert.IsTrue(flow.All(o => o.context == subGraphContext));
+            Assert.IsTrue(flow.Any(o => o.slotIndex == 0));
+            Assert.IsTrue(flow.Any(o => o.slotIndex == 1));
+
+            window.graphView.controller = null;
+        }
     }
 }
 #endif

com.unity.visualeffectgraph/CHANGELOG.md

@@ -58,6 +58,7 @@ The version number for this package has increased due to a version update of a r
 - Fixed Set Strip Progress Attribute utility block in Additional Samples
 - Fix [Case 1255182](https://fogbugz.unity3d.com/f/cases/1255182/)
 - Remove temporarily "Exact Fixed Time Step" option on VisualEffectAsset to avoid unexpected behavior
+- Forbid incorrect link between incompatible context [Case 1269756](https://issuetracker.unity3d.com/product/unity/issues/guid/1269756/)
 
 ## [10.1.0] - 2020-10-12
 ### Added

com.unity.visualeffectgraph/Editor/Models/Contexts/VFXContext.cs

@@ -245,6 +245,10 @@ public static bool CanLink(VFXContext from, VFXContext to, int fromIndex = 0, in
             if (from.m_ContextType == VFXContextType.SpawnerGPU && to.m_ContextType == VFXContextType.OutputEvent)
                 return false;
 
+            //Can't connect directly event to context (OutputEvent or Initialize) for now
+            if (from.m_ContextType == VFXContextType.Event && to.contextType != VFXContextType.Spawner && to.contextType != VFXContextType.Subgraph)
+                return false;
+
             return true;
         }