[VFX] 7.4 fixes backports (#499)

Author: julienf-unity

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXComponentTest.cs

@@ -231,7 +231,7 @@ public IEnumerator CreateComponent_And_Graph_Modify_It_To_Generate_Expected_Exce
             var graph = CreateGraph_And_System();
 
             yield return null;
-        
+
             while (m_mainObject.GetComponent<VisualEffect>() != null)
             {
                 UnityEngine.Object.DestroyImmediate(m_mainObject.GetComponent<VisualEffect>());
@@ -241,14 +241,14 @@ public IEnumerator CreateComponent_And_Graph_Modify_It_To_Generate_Expected_Exce
             Assert.DoesNotThrow(() => VisualEffectUtility.GetSpawnerState(vfxComponent, 0));
 
             yield return null;
-        
+
             //Plug a GPU instruction on bounds, excepting an exception while recompiling
             var getPositionDesc = VFXLibrary.GetOperators().FirstOrDefault(o => o.modelType == typeof(VFXAttributeParameter) && o.name.Contains(VFXAttribute.Position.name));
             var getPosition = getPositionDesc.CreateInstance();
             graph.AddChild(getPosition);
             var initializeContext = graph.children.OfType<VFXBasicInitialize>().FirstOrDefault();
             Assert.AreEqual(VFXValueType.Float3, initializeContext.inputSlots[0][0].valueType);
-        
+
             getPosition.outputSlots[0].Link(initializeContext.inputSlots[0][0]);
 
             //LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Exception while compiling expression graph:*")); < Incorrect with our katana configuration
@@ -312,9 +312,9 @@ public IEnumerator CreateComponent_And_VerifyRenderBounds()
             vfx.visualEffectAsset = asset;
 
             int maxFrame = 512;
-            while ((    vfx.culled
+            while ((vfx.culled
                     ||  currentObject.GetComponent<VFXRenderer>().bounds.extents.x == 0.0f)
-                    &&  --maxFrame > 0)
+                   &&  --maxFrame > 0)
             {
                 yield return null;
             }

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

@@ -346,7 +346,6 @@ public void UndoRedoChangeSpace()
             Undo.PerformUndo(); //Should go back to local
             Assert.AreEqual((inlineOperatorController.model as VFXInlineOperator).inputSlots[0].space, VFXCoordinateSpace.Local);
             Assert.AreEqual((inlineOperatorController.model as VFXInlineOperator).inputSlots[0].GetSpaceTransformationType(), SpaceableType.Position);
-
         }
 
         [Test]

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXConverterTests.cs

@@ -184,6 +184,7 @@ public void FailingConvertTest([ValueSource("failingConversions")] Conversion co
             LogAssert.Expect(LogType.Error, string.Format("Cannot cast from {0} to {1}", conversion.value.GetType(), conversion.targetType));
             Assert.IsNull(VFXConverter.ConvertTo(conversion.value, conversion.targetType));
         }
+
 #endif
 
         [Test]

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXCopyPastGlobalTests.cs

@@ -60,10 +60,10 @@ public override string ToString()
 
         private static CutBefore[] cutBeforeSource = new CutBefore[]
         {
-        new CutBefore() { taskType = VFXTaskType.Spawner },
-        new CutBefore() { taskType = VFXTaskType.Initialize },
-        new CutBefore() { taskType = VFXTaskType.Update },
-        new CutBefore() { taskType = VFXTaskType.Output },
+            new CutBefore() { taskType = VFXTaskType.Spawner },
+            new CutBefore() { taskType = VFXTaskType.Initialize },
+            new CutBefore() { taskType = VFXTaskType.Update },
+            new CutBefore() { taskType = VFXTaskType.Output },
         };
         [UnityTest]
         public IEnumerator CopyPast_Context_And_Relink([ValueSource("cutBeforeSource")] CutBefore cutBeforeEncapsultor)

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXCopyPasteTests.cs

@@ -195,7 +195,7 @@ public void CopyPasteSpacableOperator()
             var inlineOperatorDesc = VFXLibrary.GetOperators().Where(t => t.modelType == typeof(VFXInlineOperator)).First();
 
             var newOperator = m_ViewController.AddVFXOperator(new Vector2(100, 100), inlineOperatorDesc);
-            newOperator.SetSettingValue("m_Type",new SerializableType(typeof(DirectionType)));
+            newOperator.SetSettingValue("m_Type", new SerializableType(typeof(DirectionType)));
 
             m_ViewController.ApplyChanges();
             var operatorController = m_ViewController.allChildren.OfType<VFXOperatorController>().First();

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXDataTests.cs

@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
+#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
 using System;
 using NUnit.Framework;
 using UnityEngine;
@@ -161,6 +161,34 @@ public void CheckAttributes()
             Assert.IsFalse(data.IsCurrentAttributeWritten(attrib3));
             Assert.IsTrue(data.IsCurrentAttributeWritten(attrib4));
         }
+
+        [Test]
+        public void CheckCapacityCannotBeZero()
+        {
+            var init = ScriptableObject.CreateInstance<ContextTestInit>();
+            var data = init.GetData();
+            data.SetSettingValue("capacity", 0u);
+            uint capacity = (uint)data.GetSettingValue("capacity");
+            Assert.NotZero(capacity);
+        }
+
+        [Test]
+        public void CheckStripCapacityCannotBeZero()
+        {
+            var init = ScriptableObject.CreateInstance<ContextTestInit>();
+            var data = init.GetData();
+            data.SetSettingValue("dataType", VFXDataParticle.DataType.ParticleStrip);
+            data.SetSettingValue("stripCapacity", 0u);
+            data.SetSettingValue("particlePerStripCount", 0u);
+
+            uint capacity = (uint)data.GetSettingValue("capacity");
+            uint stripCapacity = (uint)data.GetSettingValue("stripCapacity");
+            uint particlePerStripCount = (uint)data.GetSettingValue("particlePerStripCount");
+
+            Assert.NotZero(capacity);
+            Assert.NotZero(stripCapacity);
+            Assert.NotZero(particlePerStripCount);
+        }
     }
 }
 #endif

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXDebugExpressionTest.cs

@@ -226,6 +226,7 @@ public IEnumerator CreateAsset_And_Check_Exception_On_Invalid_Graph()
 
             yield return null;
         }
+
 #endif
     }
 }

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXExpressionColorTests.cs

@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
+#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXExpressionGraphTests.cs

@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
+#if !UNITY_EDITOR_OSX || MAC_FORCE_TESTS
 using NUnit.Framework;
 using System;
 using System.Linq;

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

@@ -333,7 +333,6 @@ public void ProcessVanDerCorputSequence()
             }
         }
 
-
         public struct Min_Max_Expression_Folding_TestCase
         {
             internal string name;
@@ -347,7 +346,7 @@ public override string ToString()
         };
 
         static private string[] k_Min_Max_Expression_Folding_TestCase_Names = Generate_Min_Max_Expression_Folding_TestCase().Select(o => o.name).ToArray();
-		
+
         static private IEnumerable<Min_Max_Expression_Folding_TestCase> Generate_Min_Max_Expression_Folding_TestCase()
         {
             var x = VFXBuiltInExpression.TotalTime;
@@ -370,7 +369,7 @@ static private IEnumerable<Min_Max_Expression_Folding_TestCase> Generate_Min_Max
             yield return new Min_Max_Expression_Folding_TestCase() { name = "max(min(x, 0), 1)", expression = new VFXExpressionMax(new VFXExpressionMin(x, zero), one), saturateExpected = false };
             yield return new Min_Max_Expression_Folding_TestCase() { name = "max(1, min(x, 0))", expression = new VFXExpressionMax(one, new VFXExpressionMin(x, zero)), saturateExpected = false };
 
-            //Exotic cases 
+            //Exotic cases
             yield return new Min_Max_Expression_Folding_TestCase() { name = "min(min(x, 1), 0)", expression = new VFXExpressionMin(new VFXExpressionMin(x, one), zero), saturateExpected = false };
             yield return new Min_Max_Expression_Folding_TestCase() { name = "max(max(x, 1), 0)", expression = new VFXExpressionMax(new VFXExpressionMax(x, one), zero), saturateExpected = false };
             yield return new Min_Max_Expression_Folding_TestCase() { name = "max(add(x, 1), 0)", expression = new VFXExpressionMax(new VFXExpressionAdd(x, one), zero), saturateExpected = false };