Unity-Technologies
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXContextTests.cs
Lines changed: 27 additions & 1 deletion b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXContextTests.cs
Lines changed: 27 additions & 1 deletion
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXSpawnerTest.cs
Lines changed: 179 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXSpawnerTest.cs
Lines changed: 179 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/009_ReadAttributeInSpawner.png
Lines changed: 1 addition & 1 deletion b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/009_ReadAttributeInSpawner.png
Lines changed: 1 addition & 1 deletion
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/016_DirectLink.png
Lines changed: 3 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/016_DirectLink.png
Lines changed: 3 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/016_DirectLink.png.meta
Lines changed: 98 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/016_DirectLink.png.meta
Lines changed: 98 additions & 0 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/20_SpawnerChainingAndLoop.png
Lines changed: 2 additions & 2 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/20_SpawnerChainingAndLoop.png
Lines changed: 2 additions & 2 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png
Lines changed: 2 additions & 2 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png
Lines changed: 2 additions & 2 deletions
diff --git a/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/016_DirectLink.png
Lines changed: 3 additions & 0 deletions b/‎TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/016_DirectLink.png
Lines changed: 3 additions & 0 deletions
@@ -203,13 +203,39 @@ public void Link_Fail_From_Event_To_OutputEvent()
             Assert.IsFalse(VFXContext.CanLink(from, to));
         }
 
+        [Test]
+        public void MultiLink_Spawn_And_Event_To_Initialize()
+        {
+            var from1 = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+            var from2 = ScriptableObject.CreateInstance<VFXBasicEvent>();
+
+            var to = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            to.LinkFrom(from1);
+            to.LinkFrom(from2);
+
+            Assert.AreEqual(2, to.inputContexts.Count());
+        }
+
+        [Test]
+        public void MultiLink_Event_And_Spawn_To_Initialize()
+        {
+            var from1 = ScriptableObject.CreateInstance<VFXBasicEvent>();
+            var from2 = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+
+            var to = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            to.LinkFrom(from1);
+            to.LinkFrom(from2);
+
+            Assert.AreEqual(2, to.inputContexts.Count());
+        }
+
         [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));
+            Assert.IsTrue(VFXContext.CanLink(from, to));
         }
 
         [Test]
 
@@ -416,6 +416,88 @@ public IEnumerator Create_Asset_And_Component_Spawner_And_Output_Event_Expected_
             yield return new ExitPlayMode();
         }
 
+        [UnityTest]
+        public IEnumerator Create_Asset_And_Component_Spawner_With_Manual_Set_SpawnCount_And_Output_Event_Check_Expected_Count()
+        {
+            yield return new EnterPlayMode();
+
+            //This mainly cover return value & expected behavior, event attribute values are covered by a graphic test
+            var spawnCountValue = 1.0f; //We running these test at 10FPS, half of rate provided by constantRate, the other comes from manaul spawnCount
+            VisualEffect vfxComponent;
+            GameObject cameraObj, gameObj;
+            VFXGraph graph;
+            CreateAssetAndComponent(spawnCountValue / 2.0f, "OnPlay", out graph, out vfxComponent, out gameObj, out cameraObj);
+
+            //Manual constant rate
+            var spawnState = ScriptableObject.CreateInstance<Operator.SpawnState>();
+            graph.AddChild(spawnState);
+
+            var currentSpawnCount = ScriptableObject.CreateInstance<VFXAttributeParameter>(); //Also available in spawn state
+            currentSpawnCount.SetSettingValue("location", VFXAttributeLocation.Current);
+            currentSpawnCount.SetSettingValue("attribute", VFXAttribute.SpawnCount.name);
+            graph.AddChild(currentSpawnCount);
+
+            graph.AddChild(spawnState);
+
+            var multiply = ScriptableObject.CreateInstance<Operator.Multiply>();
+            multiply.SetOperandType(0, typeof(float));
+            multiply.SetOperandType(1, typeof(float));
+            graph.AddChild(multiply);
+
+            var add = ScriptableObject.CreateInstance<Operator.Add>();
+            add.SetOperandType(0, typeof(float));
+            add.SetOperandType(1, typeof(float));
+            graph.AddChild(add);
+
+            var setSpawnCount = ScriptableObject.CreateInstance<Block.VFXSpawnerSetAttribute>();
+            setSpawnCount.SetSettingValue("attribute", VFXAttribute.SpawnCount.name);
+            graph.children.OfType<VFXBasicSpawner>().First().AddChild(setSpawnCount);
+
+            Assert.IsTrue(spawnState.outputSlots.First(o => o.name == "SpawnDeltaTime").Link(multiply.inputSlots[0]));
+            multiply.inputSlots[1].value = spawnCountValue / 2.0f;
+
+            Assert.IsTrue(multiply.outputSlots[0].Link(add.inputSlots[0]));
+            Assert.IsTrue(currentSpawnCount.outputSlots[0].Link(add.inputSlots[1]));
+            Assert.IsTrue(add.outputSlots[0].Link(setSpawnCount.inputSlots[0]));
+
+            //Create output event
+            var outputEvent = ScriptableObject.CreateInstance<VFXOutputEvent>();
+            var basicSpawner = graph.children.OfType<VFXBasicSpawner>().FirstOrDefault();
+            graph.AddChild(outputEvent);
+            outputEvent.LinkFrom(basicSpawner);
+            AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
+
+            s_ReceivedEventNamedId = new List<int>();
+            vfxComponent.outputEventReceived += OnEventReceived_RegisterNameID;
+
+            int maxFrame = 512;
+            while (vfxComponent.culled && --maxFrame > 0)
+            {
+                yield return null;
+            }
+            Assert.IsTrue(maxFrame > 0);
+
+            vfxComponent.Reinit();
+            float deltaTime = 0.1f;
+            uint count = 32;
+            vfxComponent.Simulate(deltaTime, count);
+            Assert.AreEqual(0u, s_ReceivedEventNamedId.Count); //The simulate is asynchronous
+
+            float simulateTime = deltaTime * count;
+            uint expectedEventCount = (uint)Mathf.Floor(simulateTime / spawnCountValue);
+
+            maxFrame = 64; s_ReceivedEventNamedId.Clear();
+            cameraObj.SetActive(false);
+            while (s_ReceivedEventNamedId.Count == 0u && --maxFrame > 0)
+            {
+                yield return null;
+            }
+            Assert.AreEqual(expectedEventCount, (uint)s_ReceivedEventNamedId.Count);
+            yield return null;
+
+            yield return new ExitPlayMode();
+        }
+
         [UnityTest]
         public IEnumerator Create_Asset_And_Component_Spawner()
         {
@@ -1110,6 +1192,103 @@ bool CompareWithExpectedLog(StringBuilder actualContent, string identifier, out
             return success;
         }
 
+        public static IEnumerable<IEnumerable<T>> PermutationHelper<T>(IEnumerable<T> set, IEnumerable<T> subset = null)
+        {
+            if (subset == null)
+                subset = Enumerable.Empty<T>();
+
+            if (!set.Any())
+                yield return subset;
+
+            for (var i = 0; i < set.Count(); i++)
+            {
+                var newSubset = set.Take(i).Concat(set.Skip(i + 1));
+                foreach (var permutation in PermutationHelper(newSubset, subset.Concat(set.Skip(i).Take(1))))
+                {
+                    yield return permutation;
+                }
+            }
+        }
+
+        public static string[] k_CreateSpawner_Chaining_And_Check_Expected_Ordering = PermutationHelper(new[] { "A", "B", "C", "D" }).Select(o => o.Aggregate((a, b) => a + b)).ToArray();
+        public static bool[] k_CreateSpawner_Chaining_And_Check_Expected_Plug_C_First = { true, false }; 
+        [UnityTest]
+        public IEnumerator CreateSpawner_Chaining_And_Check_Expected_Ordering([ValueSource("k_CreateSpawner_Chaining_And_Check_Expected_Ordering")] string ordering, [ValueSource("k_CreateSpawner_Chaining_And_Check_Expected_Plug_C_First")] bool plugCFirst)
+        {
+            var graph = VFXTestCommon.MakeTemporaryGraph();
+            // A -> B -> C  -> Init
+            //  \-> D      /
+            var correctSequences = new string[] { "ABCD", "ABDC" };
+
+            foreach (var c in ordering)
+            {
+                var spawnerContext = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+                var blockSpawnerConstant = ScriptableObject.CreateInstance<VFXSpawnerConstantRate>();
+                blockSpawnerConstant.GetInputSlot(0).value = 0.1f;
+                spawnerContext.label = c.ToString();
+                spawnerContext.AddChild(blockSpawnerConstant);
+                graph.AddChild(spawnerContext);
+            }
+
+            var initialize = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            var setPosition = ScriptableObject.CreateInstance<SetAttribute>();
+            setPosition.SetSettingValue("attribute", "position");
+            initialize.AddChild(setPosition);
+            var output = ScriptableObject.CreateInstance<VFXPointOutput>();
+            graph.AddChild(initialize);
+            graph.AddChild(output);
+            output.LinkFrom(initialize);
+
+            var spawn_a = graph.children.OfType<VFXBasicSpawner>().First(o => o.label == "A");
+            var spawn_b = graph.children.OfType<VFXBasicSpawner>().First(o => o.label == "B");
+            var spawn_c = graph.children.OfType<VFXBasicSpawner>().First(o => o.label == "C");
+            var spawn_d = graph.children.OfType<VFXBasicSpawner>().First(o => o.label == "D");
+
+            if (plugCFirst)
+            {
+                initialize.LinkFrom(spawn_c);
+                initialize.LinkFrom(spawn_d);
+            }
+            else
+            {
+                initialize.LinkFrom(spawn_d);
+                initialize.LinkFrom(spawn_c);
+            }
+
+            spawn_d.LinkFrom(spawn_a);
+            spawn_c.LinkFrom(spawn_b);
+            spawn_b.LinkFrom(spawn_a);
+
+            Assert.AreEqual(2, spawn_a.outputFlowSlot[0].link.Count);
+            Assert.AreEqual(1, spawn_b.outputFlowSlot[0].link.Count);
+            Assert.AreEqual(1, spawn_c.outputFlowSlot[0].link.Count);
+            Assert.AreEqual(1, spawn_d.outputFlowSlot[0].link.Count);
+            graph.SetCompilationMode(VFXCompilationMode.Runtime);
+            AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
+
+            var gameObj = new GameObject("CreateSpawner_Chaining_And_Check_Expected_Ordering");
+            var vfxComponent = gameObj.AddComponent<VisualEffect>();
+            vfxComponent.visualEffectAsset = graph.visualEffectResource.asset;
+
+            var particleSystem = new List<string>();
+            vfxComponent.GetParticleSystemNames(particleSystem);
+            Assert.AreEqual(1, particleSystem.Count);
+
+            var spawnSystem = new List<string>();
+            vfxComponent.GetSpawnSystemNames(spawnSystem);
+            Assert.AreEqual(4, spawnSystem.Count);
+            Assert.Contains("A", spawnSystem);
+            Assert.Contains("B", spawnSystem);
+            Assert.Contains("C", spawnSystem);
+            Assert.Contains("D", spawnSystem);
+
+            var actualSequence = spawnSystem.Aggregate((a, b) => a + b);
+            Assert.Contains(actualSequence, correctSequences);
+            yield return null;
+
+            GameObject.DestroyImmediate(gameObj);
+        }
+
         static readonly System.Reflection.MethodInfo[] k_SpawnerStateGetter = typeof(VFXSpawnerState).GetMethods().Where(o => o.Name.StartsWith("get_") && o.Name != "get_vfxEventAttribute").ToArray();
         static string DebugSpawnerStateAggregate(IEnumerable<string> all)
         {