[VFX] Merge of vfx/staging

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/CopyPasteTest.vfx

@@ -619,6 +619,7 @@ MonoBehaviour:
   frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
+  flipbookLayout: 0
   shaderGraph: {fileID: 0}
   primitiveType: 1
   useGeometryShader: 0

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

@@ -40,6 +40,33 @@ public void ProcessExpressionAbs()
             Assert.AreEqual(resultC, expressionC.Get<float>());
         }
 
+        static readonly Vector2[] s_ProcessExpressionSafeNormalizeValues = new Vector2[]
+        {
+            new Vector2(0,0),
+            new Vector2(0.0f, 1e-30f),
+            new Vector2(0.0f, 1e-20f),
+            new Vector2(0.0f, 1e-10f),
+            new Vector2(1e-30f, 1e-30f),
+            new Vector2(1e-20f, 1e-20f),
+            new Vector2(1e-10f, 1e-10f),
+            new Vector2(1e-10f, 1e-10f),
+            new Vector2(1.0f, 1.0f),
+            new Vector2(2.0f, -1.0f),
+            new Vector2(0.5f, 0.2f),
+            new Vector2(-1.0f, -1.0f),
+        };
+
+        [Test]
+        public void ProcessExpressionSafeNormalize([ValueSource("s_ProcessExpressionSafeNormalizeValues")] Vector2 input)
+        {
+            var valueInput = new VFXValue<Vector2>(input);
+            var expression = VFXOperatorUtility.SafeNormalize(valueInput);
+            var context = new VFXExpression.Context(VFXExpressionContextOption.CPUEvaluation);
+            var resultExpression = context.Compile(expression);
+            var expectedResult = input.normalized;
+            Assert.AreEqual(expectedResult, resultExpression.Get<Vector2>());
+        }
+
         [Test]
         public void ProcessExpressionAdd()
         {
@@ -237,9 +264,9 @@ public void ProcessExpressionSign()
             var a = -1.5f;
             var b = 0.0f;
             var c = 0.2f;
-            var resultA = Mathf.Sign(a);
-            var resultB = Mathf.Sign(b);
-            var resultC = Mathf.Sign(c);
+            var resultA = (a < 0.0f) ? -1.0f : (a > 0.0f) ? 1.0f : 0.0f;
+            var resultB = (b < 0.0f) ? -1.0f : (b > 0.0f) ? 1.0f : 0.0f;
+            var resultC = (c < 0.0f) ? -1.0f : (c > 0.0f) ? 1.0f : 0.0f;
 
             var value_a = new VFXValue<float>(a);
             var value_b = new VFXValue<float>(b);

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

@@ -296,7 +296,7 @@ public void ProcessOperatorModuloFloat()
         [Test]
         public void ProcessOperatorSign([ValueSource("ProcessOperatorAbs_a")] float a)
         {
-            var r = Mathf.Sign(a);
+            var r = (a < 0.0f) ? -1.0f : (a > 0.0f) ? 1.0f : 0.0f;
             var value_a = new VFXValue<float>(a);
 
             var expression = new VFXExpressionSign(value_a);

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

@@ -244,6 +244,56 @@ private void Add_Valid_System(VFXGraph graph)
             quadOutput.LinkFrom(basicInitialize);
         }
 
+        //Cover issue from 1285787
+        [UnityTest]
+        public IEnumerator Create_Prefab_And_Verify_Empty_Override()
+        {
+            var graph = VFXTestCommon.MakeTemporaryGraph();
+            const int systemCount = 3;
+            for (int i = 0; i < systemCount; ++i)
+            {
+                Add_Valid_System(graph);
+            }
+            AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
+
+            var mainObject = MakeTemporaryGameObject();
+            GameObject prefabInstanceObject;
+            {
+                var tempVFX = mainObject.AddComponent<VisualEffect>();
+                tempVFX.visualEffectAsset = graph.visualEffectResource.asset;
+
+                GameObject newGameObject;
+                MakeTemporaryPrebab(mainObject, out newGameObject, out prefabInstanceObject);
+                GameObject.DestroyImmediate(mainObject);
+
+                mainObject = PrefabUtility.InstantiatePrefab(prefabInstanceObject) as GameObject;
+            }
+            yield return null;
+
+            Assert.IsNotNull(mainObject.GetComponent<VisualEffect>());
+            var properties = PrefabUtility.GetPropertyModifications(mainObject);
+            //Filter out transform properties & GameObject.m_Name
+            properties = properties.Where(o =>
+            {
+                if (o.target is UnityEngine.Transform)
+                    return false;
+
+                if (o.target is GameObject && o.propertyPath == "m_Name")
+                    return false;
+
+                return true;
+            }).ToArray();
+
+            var logMessage = string.Empty;
+            if (properties.Any())
+            {
+                logMessage = properties.Select(o => string.Format("{0} at {1} : {2}", o.target, o.propertyPath, o.value))
+                                       .Aggregate((a, b) => a + "\n" + b);
+            }
+
+            Assert.AreEqual(0, properties.Length, logMessage);
+        }
+
         //Cover regression from 1213773
         [UnityTest]
         public IEnumerator Create_Prefab_Switch_To_Empty_VisualEffectAsset()

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

@@ -102,6 +102,52 @@ public IEnumerator Sanitize_VFXSpawnerCustomCallback_Namespace()
             yield return null;
         }
 
+        //Cover case 1122404
+        [UnityTest]
+        public IEnumerator Create_Asset_And_Set_Really_High_SpawnRate()
+        {
+            yield return new EnterPlayMode();
+
+            VisualEffect vfxComponent;
+            GameObject cameraObj, gameObj;
+            VFXGraph graph;
+
+            var reallyBigFloat = 3e+38f;
+            CreateAssetAndComponent(reallyBigFloat, "OnPlay", out graph, out vfxComponent, out gameObj, out cameraObj);
+
+            var init = graph.children.OfType<VFXBasicInitialize>().First();
+            var setLifetime = ScriptableObject.CreateInstance<SetAttribute>();
+            setLifetime.SetSettingValue("attribute", "lifetime"); //Issue 1122404 only occurs when hasKill
+            setLifetime.inputSlots[0].value = 1.0f;
+            init.AddChild(setLifetime);
+
+            var update = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            graph.AddChild(update);
+
+            init.LinkTo(update);
+            update.LinkTo(graph.children.OfType<VFXPlanarPrimitiveOutput>().First());
+
+            AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
+
+            int maxFrame = 256;
+            while (vfxComponent.culled && --maxFrame > 0)
+                yield return null;
+            Assert.IsTrue(maxFrame > 0);
+
+            //Assertion failed on expression: 'nbGroups.x > 0 && nbGroups.y > 0' is logged before 1122404 resolution.
+            yield return null;
+
+            var spawnSystems = new List<string>();
+            vfxComponent.GetSpawnSystemNames(spawnSystems);
+            var spawnState = vfxComponent.GetSpawnSystemInfo(spawnSystems[0]);
+            Assert.IsTrue(spawnState.spawnCount >= reallyBigFloat * 0.01f);
+
+            var spawnCountCastInt = (int)spawnState.spawnCount; //expecting an overflow
+            Assert.IsTrue(spawnCountCastInt < 0);
+
+            yield return new ExitPlayMode();
+
+        }
 
         static string[] k_Create_Asset_And_Check_Event_ListCases = new[] { "OnPlay", "Test_Event" };
 
@@ -185,10 +231,86 @@ public IEnumerator Create_Asset_And_Component_Spawner_Check_Initial_Event()
             yield return new ExitPlayMode();
         }
 
-        static List<int> s_receivedEvent;
-        static void OnEventReceived(VFXOutputEventArgs evt)
+
+        static List<Vector3> s_RecordedPositions = new List<Vector3>();
+        static void OnEventReceived_SavePosition(VFXOutputEventArgs evt)
+        {
+            s_RecordedPositions.Add(evt.eventAttribute.GetVector3("position"));
+        }
+
+        static bool[] s_Verify_Reseed_OnPlay_Behavior_options = new bool[] { false, true };
+
+        [UnityTest]
+        public IEnumerator Verify_Reseed_OnPlay_Behavior([ValueSource("s_Verify_Reseed_OnPlay_Behavior_options")] bool reseed, [ValueSource("s_Verify_Reseed_OnPlay_Behavior_options")] bool useSendEvent)
+        {
+            yield return new EnterPlayMode();
+
+            var spawnCountValue = 1.0f;
+            VisualEffect vfxComponent;
+            GameObject cameraObj, gameObj;
+            VFXGraph graph;
+            CreateAssetAndComponent(spawnCountValue, "OnPlay", out graph, out vfxComponent, out gameObj, out cameraObj);
+
+            var outputEvent = ScriptableObject.CreateInstance<VFXOutputEvent>();
+            var eventName = "qsdf";
+            outputEvent.SetSettingValue("eventName", eventName);
+            var basicSpawner = graph.children.OfType<VFXBasicSpawner>().FirstOrDefault();
+            graph.AddChild(outputEvent);
+            outputEvent.LinkFrom(basicSpawner);
+
+            //Add constant random to inspect the current seed
+            var setAttributePosition = ScriptableObject.CreateInstance<VFXSpawnerSetAttribute>();
+            setAttributePosition.SetSettingValue("attribute", "position");
+            basicSpawner.AddChild(setAttributePosition);
+
+            for (int i = 0; i < 3; ++i)
+            {
+                var random = ScriptableObject.CreateInstance<Operator.Random>();
+                random.SetSettingValue("seed", VFXSeedMode.PerComponent);
+                random.SetSettingValue("constant", true);
+                graph.AddChild(outputEvent);
+                random.outputSlots.First().Link(setAttributePosition.inputSlots.First()[i]);
+            }
+            AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
+
+            s_RecordedPositions = new List<Vector3>();
+            vfxComponent.outputEventReceived += OnEventReceived_SavePosition;
+            vfxComponent.resetSeedOnPlay = reseed;
+
+            int maxFrame = 256;
+            while (s_RecordedPositions.Count < 3 && --maxFrame > 0)
+                yield return null;
+
+            Assert.IsTrue(maxFrame > 0);
+            Assert.AreEqual(1, s_RecordedPositions.Distinct().Count());
+
+            for (int i = 0; i < 3; ++i)
+            {
+                //The seed should change depending on resetSeedOnPlay settings
+                if (useSendEvent)
+                    vfxComponent.SendEvent(VisualEffectAsset.PlayEventID);
+                else
+                    vfxComponent.Play();
+
+                maxFrame = 256;
+                while (s_RecordedPositions.Count < 3 + i * 3 && --maxFrame > 0)
+                    yield return null;
+                Assert.IsTrue(maxFrame > 0);
+            }
+
+            var distinctCount = s_RecordedPositions.Distinct().Count();
+            if (reseed)
+                Assert.AreNotEqual(1, distinctCount);
+            else
+                Assert.AreEqual(1, distinctCount);
+
+            yield return new ExitPlayMode();
+        }
+
+        static List<int> s_ReceivedEventNamedId;
+        static void OnEventReceived_RegisterNameID(VFXOutputEventArgs evt)
         {
-            s_receivedEvent.Add(evt.nameId);
+            s_ReceivedEventNamedId.Add(evt.nameId);
         }
 
         [UnityTest]
@@ -211,8 +333,8 @@ public IEnumerator Create_Asset_And_Component_Spawner_And_Output_Event()
             outputEvent.LinkFrom(basicSpawner);
             AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
 
-            s_receivedEvent = new List<int>();
-            vfxComponent.outputEventReceived += OnEventReceived;
+            s_ReceivedEventNamedId = new List<int>();
+            vfxComponent.outputEventReceived += OnEventReceived_RegisterNameID;
 
             int maxFrame = 64;
             while (vfxComponent.culled && --maxFrame > 0)
@@ -228,19 +350,19 @@ public IEnumerator Create_Asset_And_Component_Spawner_And_Output_Event()
             Assert.AreEqual(outputEventName, eventName);
 
             //Checking invalid event (waiting for the first event)
-            Assert.AreEqual(0u, s_receivedEvent.Count);
+            Assert.AreEqual(0u, s_ReceivedEventNamedId.Count);
 
             //Checking on valid event while there is an event
-            maxFrame = 64; s_receivedEvent.Clear();
-            while (s_receivedEvent.Count == 0u && --maxFrame > 0)
+            maxFrame = 64; s_ReceivedEventNamedId.Clear();
+            while (s_ReceivedEventNamedId.Count == 0u && --maxFrame > 0)
             {
                 yield return null;
             }
             Assert.IsTrue(maxFrame > 0);
-            Assert.IsTrue(s_receivedEvent.Count > 0);
-            Assert.AreEqual(Shader.PropertyToID(eventName), s_receivedEvent.FirstOrDefault());
+            Assert.IsTrue(s_ReceivedEventNamedId.Count > 0);
+            Assert.AreEqual(Shader.PropertyToID(eventName), s_ReceivedEventNamedId.FirstOrDefault());
 
-            s_receivedEvent.Clear();
+            s_ReceivedEventNamedId.Clear();
 
             yield return new ExitPlayMode();
         }
@@ -263,8 +385,8 @@ public IEnumerator Create_Asset_And_Component_Spawner_And_Output_Event_Expected_
             outputEvent.LinkFrom(basicSpawner);
             AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
 
-            s_receivedEvent = new List<int>();
-            vfxComponent.outputEventReceived += OnEventReceived;
+            s_ReceivedEventNamedId = new List<int>();
+            vfxComponent.outputEventReceived += OnEventReceived_RegisterNameID;
 
             int maxFrame = 512;
             while (vfxComponent.culled && --maxFrame > 0)
@@ -277,24 +399,23 @@ public IEnumerator Create_Asset_And_Component_Spawner_And_Output_Event_Expected_
             float deltaTime = 0.1f;
             uint count = 32;
             vfxComponent.Simulate(deltaTime, count);
-            Assert.AreEqual(0u, s_receivedEvent.Count); //The simulate is asynchronous
+            Assert.AreEqual(0u, s_ReceivedEventNamedId.Count); //The simulate is asynchronous
 
             float simulateTime = deltaTime * count;
             uint expectedEventCount = (uint)Mathf.Floor(simulateTime / spawnCountValue);
 
-            maxFrame = 64; s_receivedEvent.Clear();
+            maxFrame = 64; s_ReceivedEventNamedId.Clear();
             cameraObj.SetActive(false);
-            while (s_receivedEvent.Count == 0u && --maxFrame > 0)
+            while (s_ReceivedEventNamedId.Count == 0u && --maxFrame > 0)
             {
                 yield return null;
             }
-            Assert.AreEqual(expectedEventCount, (uint)s_receivedEvent.Count);
+            Assert.AreEqual(expectedEventCount, (uint)s_ReceivedEventNamedId.Count);
             yield return null;
 
             yield return new ExitPlayMode();
         }
-
-
+
         [UnityTest]
         public IEnumerator Create_Asset_And_Component_Spawner()
         {

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/05_MotionVectors.vfx

@@ -3201,6 +3201,7 @@ MonoBehaviour:
   frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
+  flipbookLayout: 0
 --- !u!114 &114904363320238742
 MonoBehaviour:
   m_ObjectHideFlags: 1

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/06_LineOutput.vfx

@@ -2434,6 +2434,7 @@ MonoBehaviour:
   frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
+  flipbookLayout: 0
   useTargetOffset: 1
   useNativeLines: 0
 --- !u!114 &114978967300245268

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/07_UnityLogo.vfx

@@ -2853,6 +2853,7 @@ MonoBehaviour:
   frustumCulling: 0
   castShadows: 0
   useExposureWeight: 0
+  flipbookLayout: 0
   shaderGraph: {fileID: 0}
   primitiveType: 1
   useGeometryShader: 0