Skip to content

Commit 2f49340

Browse files
committed
Update VFX
1 parent 907b889 commit 2f49340

File tree

108 files changed

+16084
-15592
lines changed

Some content is hidden

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

108 files changed

+16084
-15592
lines changed

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/Indeterminate Test.vfx

Lines changed: 77 additions & 76 deletions
Large diffs are not rendered by default.

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

Lines changed: 82 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ MonoBehaviour:
115115
m_Type:
116116
m_SerializableType: UnityEngine.Gradient, UnityEngine.CoreModule, Version=0.0.0.0,
117117
Culture=neutral, PublicKeyToken=null
118-
m_SerializableObject: '{"colorKeys":[{"color":{"r":0.02799190953373909,"g":0.1764705777168274,"b":0.0,"a":1.0},"time":0.0},{"color":{"r":0.0,"g":1.0,"b":0.5448274612426758,"a":1.0},"time":0.32480353116989138},{"color":{"r":0.7379310131072998,"g":1.0,"b":0.0,"a":1.0},"time":0.6118562817573547},{"color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"time":0.8558022379875183},{"color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}],"gradientMode":0}'
118+
m_SerializableObject: '{"colorKeys":[{"color":{"r":0.002166556427255273,"g":0.026241222396492959,"b":0.0,"a":1.0},"time":0.0},{"color":{"r":0.0,"g":1.0,"b":0.2579035460948944,"a":1.0},"time":0.32480353116989138},{"color":{"r":0.5039170980453491,"g":1.0,"b":0.0,"a":1.0},"time":0.6118562817573547},{"color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"time":0.8558022379875183},{"color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}],"gradientMode":0}'
119119
m_Space: 2147483647
120120
m_Property:
121121
name: gradient
@@ -489,27 +489,6 @@ MonoBehaviour:
489489
PublicKeyToken=b77a5c561934e089
490490
m_Direction: 1
491491
m_LinkedSlots: []
492-
--- !u!114 &114155774272602464
493-
MonoBehaviour:
494-
m_ObjectHideFlags: 1
495-
m_CorrespondingSourceObject: {fileID: 0}
496-
m_PrefabInstance: {fileID: 0}
497-
m_PrefabAsset: {fileID: 0}
498-
m_GameObject: {fileID: 0}
499-
m_Enabled: 1
500-
m_EditorHideFlags: 0
501-
m_Script: {fileID: 11500000, guid: 7d33fb94df928ef4c986f97607706b82, type: 3}
502-
m_Name: VFXBuiltInParameter
503-
m_EditorClassIdentifier:
504-
m_Parent: {fileID: 114690118887451068}
505-
m_Children: []
506-
m_UIPosition: {x: -1908.3439, y: -834.90137}
507-
m_UICollapsed: 1
508-
m_UISuperCollapsed: 0
509-
m_InputSlots: []
510-
m_OutputSlots:
511-
- {fileID: 114703705328324528}
512-
m_expressionOp: 7
513492
--- !u!114 &114161823308658574
514493
MonoBehaviour:
515494
m_ObjectHideFlags: 1
@@ -2010,7 +1989,7 @@ MonoBehaviour:
20101989
m_Type:
20111990
m_SerializableType: UnityEngine.Gradient, UnityEngine.CoreModule, Version=0.0.0.0,
20121991
Culture=neutral, PublicKeyToken=null
2013-
m_SerializableObject: '{"colorKeys":[{"color":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"time":0.0},{"color":{"r":1.0,"g":0.0,"b":0.8901960849761963,"a":1.0},"time":0.19407950341701508},{"color":{"r":0.24313725531101228,"g":0.0,"b":1.0,"a":1.0},"time":0.3466697037220001},{"color":{"r":0.0,"g":0.8352941274642944,"b":1.0,"a":1.0},"time":0.48148319125175478},{"color":{"r":0.0,"g":1.0,"b":0.09019608050584793,"a":1.0},"time":0.6444495320320129},{"color":{"r":0.9450980424880981,"g":1.0,"b":0.0,"a":1.0},"time":0.808896005153656},{"color":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}],"gradientMode":0}'
1992+
m_SerializableObject: '{"colorKeys":[{"color":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"time":0.0},{"color":{"r":1.0,"g":0.0,"b":0.7681512832641602,"a":1.0},"time":0.19407950341701508},{"color":{"r":0.04817182198166847,"g":0.0,"b":1.0,"a":1.0},"time":0.3466697037220001},{"color":{"r":0.0,"g":0.6653873324394226,"b":1.0,"a":1.0},"time":0.48148319125175478},{"color":{"r":0.0,"g":1.0,"b":0.00856812484562397,"a":1.0},"time":0.6444495320320129},{"color":{"r":0.8796223402023315,"g":1.0,"b":0.0,"a":1.0},"time":0.808896005153656},{"color":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}],"gradientMode":0}'
20141993
m_Space: 2147483647
20151994
m_Property:
20161995
name: o
@@ -2176,7 +2155,7 @@ MonoBehaviour:
21762155
- {fileID: 114967288652437010}
21772156
- {fileID: 114886110431456336}
21782157
- {fileID: 114577405790901024}
2179-
- {fileID: 114155774272602464}
2158+
- {fileID: 8926484042661614568}
21802159
- {fileID: 8926484042661614528}
21812160
- {fileID: 114055849663728558}
21822161
- {fileID: 114556453381267000}
@@ -2228,6 +2207,7 @@ MonoBehaviour:
22282207
descendantCount: 0
22292208
m_ImportDependencies: []
22302209
m_GraphVersion: 4
2210+
m_ResourceVersion: 1
22312211
m_saved: 1
22322212
m_SubgraphDependencies: []
22332213
m_CategoryPath:
@@ -2296,40 +2276,6 @@ MonoBehaviour:
22962276
PublicKeyToken=b77a5c561934e089
22972277
m_Direction: 0
22982278
m_LinkedSlots: []
2299-
--- !u!114 &114703705328324528
2300-
MonoBehaviour:
2301-
m_ObjectHideFlags: 1
2302-
m_CorrespondingSourceObject: {fileID: 0}
2303-
m_PrefabInstance: {fileID: 0}
2304-
m_PrefabAsset: {fileID: 0}
2305-
m_GameObject: {fileID: 0}
2306-
m_Enabled: 1
2307-
m_EditorHideFlags: 0
2308-
m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
2309-
m_Name: VFXSlotFloat
2310-
m_EditorClassIdentifier:
2311-
m_Parent: {fileID: 0}
2312-
m_Children: []
2313-
m_UIPosition: {x: 0, y: 0}
2314-
m_UICollapsed: 1
2315-
m_UISuperCollapsed: 0
2316-
m_MasterSlot: {fileID: 114703705328324528}
2317-
m_MasterData:
2318-
m_Owner: {fileID: 114155774272602464}
2319-
m_Value:
2320-
m_Type:
2321-
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
2322-
PublicKeyToken=b77a5c561934e089
2323-
m_SerializableObject:
2324-
m_Space: 2147483647
2325-
m_Property:
2326-
name: TotalTime
2327-
m_serializedType:
2328-
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
2329-
PublicKeyToken=b77a5c561934e089
2330-
m_Direction: 1
2331-
m_LinkedSlots:
2332-
- {fileID: 8926484042661614529}
23332279
--- !u!114 &114715049336638546
23342280
MonoBehaviour:
23352281
m_ObjectHideFlags: 1
@@ -3418,6 +3364,7 @@ MonoBehaviour:
34183364
angularIntegration: 0
34193365
ageParticles: 1
34203366
reapParticles: 1
3367+
skipZeroDeltaUpdate: 0
34213368
--- !u!114 &114975308330480832
34223369
MonoBehaviour:
34233370
m_ObjectHideFlags: 1
@@ -3471,7 +3418,7 @@ MonoBehaviour:
34713418
m_InputSlots: []
34723419
m_OutputSlots: []
34733420
m_Label:
3474-
m_Data: {fileID: 0}
3421+
m_Data: {fileID: 8926484042661614567}
34753422
m_InputFlowSlot:
34763423
- link: []
34773424
- link: []
@@ -3699,7 +3646,7 @@ MonoBehaviour:
36993646
PublicKeyToken=b77a5c561934e089
37003647
m_Direction: 0
37013648
m_LinkedSlots:
3702-
- {fileID: 114703705328324528}
3649+
- {fileID: 8926484042661614569}
37033650
--- !u!114 &8926484042661614530
37043651
MonoBehaviour:
37053652
m_ObjectHideFlags: 0
@@ -4903,3 +4850,78 @@ MonoBehaviour:
49034850
PublicKeyToken=b77a5c561934e089
49044851
m_Direction: 1
49054852
m_LinkedSlots: []
4853+
--- !u!114 &8926484042661614567
4854+
MonoBehaviour:
4855+
m_ObjectHideFlags: 0
4856+
m_CorrespondingSourceObject: {fileID: 0}
4857+
m_PrefabInstance: {fileID: 0}
4858+
m_PrefabAsset: {fileID: 0}
4859+
m_GameObject: {fileID: 0}
4860+
m_Enabled: 1
4861+
m_EditorHideFlags: 0
4862+
m_Script: {fileID: 11500000, guid: f68759077adc0b143b6e1c101e82065e, type: 3}
4863+
m_Name:
4864+
m_EditorClassIdentifier:
4865+
m_Parent: {fileID: 114690118887451068}
4866+
m_Children: []
4867+
m_UIPosition: {x: 0, y: 0}
4868+
m_UICollapsed: 1
4869+
m_UISuperCollapsed: 0
4870+
title:
4871+
m_Owners:
4872+
- {fileID: 114978657291914718}
4873+
--- !u!114 &8926484042661614568
4874+
MonoBehaviour:
4875+
m_ObjectHideFlags: 0
4876+
m_CorrespondingSourceObject: {fileID: 0}
4877+
m_PrefabInstance: {fileID: 0}
4878+
m_PrefabAsset: {fileID: 0}
4879+
m_GameObject: {fileID: 0}
4880+
m_Enabled: 1
4881+
m_EditorHideFlags: 0
4882+
m_Script: {fileID: 11500000, guid: a72fbb93ebe17974e90a144ef2ec8ceb, type: 3}
4883+
m_Name:
4884+
m_EditorClassIdentifier:
4885+
m_Parent: {fileID: 114690118887451068}
4886+
m_Children: []
4887+
m_UIPosition: {x: -1908.3439, y: -834.90137}
4888+
m_UICollapsed: 1
4889+
m_UISuperCollapsed: 0
4890+
m_InputSlots: []
4891+
m_OutputSlots:
4892+
- {fileID: 8926484042661614569}
4893+
m_BuiltInParameters: 4
4894+
--- !u!114 &8926484042661614569
4895+
MonoBehaviour:
4896+
m_ObjectHideFlags: 0
4897+
m_CorrespondingSourceObject: {fileID: 0}
4898+
m_PrefabInstance: {fileID: 0}
4899+
m_PrefabAsset: {fileID: 0}
4900+
m_GameObject: {fileID: 0}
4901+
m_Enabled: 1
4902+
m_EditorHideFlags: 0
4903+
m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
4904+
m_Name:
4905+
m_EditorClassIdentifier:
4906+
m_Parent: {fileID: 0}
4907+
m_Children: []
4908+
m_UIPosition: {x: 0, y: 0}
4909+
m_UICollapsed: 1
4910+
m_UISuperCollapsed: 0
4911+
m_MasterSlot: {fileID: 8926484042661614569}
4912+
m_MasterData:
4913+
m_Owner: {fileID: 8926484042661614568}
4914+
m_Value:
4915+
m_Type:
4916+
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
4917+
PublicKeyToken=b77a5c561934e089
4918+
m_SerializableObject: 0
4919+
m_Space: 2147483647
4920+
m_Property:
4921+
name: Total Time
4922+
m_serializedType:
4923+
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
4924+
PublicKeyToken=b77a5c561934e089
4925+
m_Direction: 1
4926+
m_LinkedSlots:
4927+
- {fileID: 8926484042661614529}

0 commit comments

Comments
 (0)