Skip to content

Commit ce1f22a

Browse files
merge master
2 parents df294f7 + f5c02f6 commit ce1f22a

File tree

91 files changed

+9631
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+9631
-347
lines changed

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,31 +93,16 @@ public void CheckDataType()
9393
Assert.IsInstanceOf<VFXDataParticle>(output.GetData());
9494
}
9595

96-
string tempFilePath = "Assets/Temp_vfxTest_Ddata.vfx";
97-
98-
VFXGraph MakeTemporaryGraph()
99-
{
100-
if (System.IO.File.Exists(tempFilePath))
101-
{
102-
AssetDatabase.DeleteAsset(tempFilePath);
103-
}
104-
var asset = VisualEffectAssetEditorUtility.CreateNewAsset(tempFilePath);
105-
VisualEffectResource resource = asset.GetResource(); // force resource creation
106-
VFXGraph graph = ScriptableObject.CreateInstance<VFXGraph>();
107-
graph.visualEffectResource = resource;
108-
return graph;
109-
}
110-
11196
[OneTimeTearDown]
11297
public void CleanUp()
11398
{
114-
AssetDatabase.DeleteAsset(tempFilePath);
99+
VFXTestCommon.DeleteAllTemporaryGraph();
115100
}
116101

117102
[Test]
118103
public void CheckName_Sharing_Between_Output_Event()
119104
{
120-
var graph = MakeTemporaryGraph();
105+
var graph = VFXTestCommon.MakeTemporaryGraph();
121106

122107
var gameObj = new GameObject("CheckData_Sharing_Between_Output_Event");
123108
var vfxComponent = gameObj.AddComponent<VisualEffect>();

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,38 @@ private VisualEffectAsset CreateAssetAtPath(string path)
2828
return VisualEffectAssetEditorUtility.CreateNewAsset(path);
2929
}
3030

31+
[Test]
32+
public void Sanitize_GetSpawnCount()
33+
{
34+
string kSourceAsset = "Assets/AllTests/Editor/Tests/VFXSerializationTests_GetSpawnCount.vfx_";
35+
var graph = VFXTestCommon.CopyTemporaryGraph(kSourceAsset);
36+
37+
Assert.AreEqual(5, graph.children.OfType<VFXAttributeParameter>().Count());
38+
Assert.AreEqual(5, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(uint)).Count());
39+
Assert.AreEqual(1, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(float)).Count());
40+
Assert.AreEqual(1, graph.children.OfType<Operator.Add>().Count());
41+
Assert.AreEqual(1, graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(Color)).Count());
42+
43+
foreach (var attribute in graph.children.OfType<VFXAttributeParameter>())
44+
Assert.IsTrue(attribute.outputSlots[0].HasLink());
45+
46+
foreach (var inlineUInt in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(uint)))
47+
Assert.IsTrue(inlineUInt.inputSlots[0].HasLink());
48+
49+
foreach (var inlineFloat in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(float)))
50+
Assert.IsTrue(inlineFloat.inputSlots[0].HasLink());
51+
52+
foreach (var inlineColor in graph.children.OfType<VFXInlineOperator>().Where(o => o.type == typeof(Color)))
53+
Assert.IsTrue(inlineColor.inputSlots[0].HasLink());
54+
55+
foreach (var add in graph.children.OfType<Operator.Add>())
56+
{
57+
Assert.AreEqual(2, add.operandCount);
58+
Assert.IsTrue(add.inputSlots[0].HasLink());
59+
Assert.IsTrue(add.inputSlots[1].HasLink());
60+
}
61+
}
62+
3163
[OneTimeSetUpAttribute]
3264
public void OneTimeSetUpAttribute()
3365
{

0 commit comments

Comments
 (0)