Skip to content

[10.x.x][VFX] 10.3 backports #3143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jan 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ddf5f9e
Fix Event connected directly to Output Event (revival) #154
PaulDemeulenaere Nov 9, 2020
6207965
Restore disabled 26_NonUnifomScale due to a wrong merge (need backpor…
PaulDemeulenaere Nov 12, 2020
64dc8d0
[HDRP] Fix debug view material (albedo/normal/...)
PaulDemeulenaere Nov 13, 2020
50eb3fc
Force ui update when shader might be reimported in StaticMeshOutput (…
iTris666 Nov 16, 2020
a8b81dc
Don't create VFXGraph during import callbacks (#148)
iTris666 Nov 16, 2020
88b8374
Select node on create (#166)
iTris666 Nov 20, 2020
b92a758
Dont flag dirty in vfxgraph is the model modified is a copy (#165)
iTris666 Nov 23, 2020
1aef99e
Added excludeFromTAA setting to VFX outputs
gabrieldelacruz Nov 24, 2020
197d328
Fix Custom Spawn serialization (#132)
PaulDemeulenaere Nov 30, 2020
6d8d869
Fix case 1294180 : Error feedback throwing an error while changing ca…
PaulDemeulenaere Nov 30, 2020
9df1264
Fix Preset (with exclusion) (#177)
PaulDemeulenaere Nov 30, 2020
812e474
Fix 1276602 incorrect uchar pcache import (#129)
Dec 1, 2020
73950bf
Update gradient test (#151)
gabrieldelacruz Dec 1, 2020
eedfcbd
Fix incorrect compilation condition for linux build (#184)
PaulDemeulenaere Dec 10, 2020
c8e95e0
Fix GPUEvent & SubGraph (#178)
PaulDemeulenaere Dec 15, 2020
a1c4ddf
Sample Point Cache operator (#92)
ludovic-theobald Dec 1, 2020
ef00540
Fix Case 1223747 - NaN caused by normal bending (#181)
ludovic-theobald Dec 1, 2020
369e2eb
[Subgraph] Prevent Pasting Context invalid subgraph (#191)
PaulDemeulenaere Jan 7, 2021
a424e5f
Fix Mouse Event Binder in player (#175)
PaulDemeulenaere Jan 8, 2021
21c8fa0
Vfx/docs/bugfixes (#188)
Jan 12, 2021
cbfbfb6
Update HDRP project assets
julienf-unity Jan 15, 2021
51db803
Change VisualEffect inspector "Edit" button to "New" when no asset is…
Nov 24, 2020
7f27e5f
Spawn State documentation (#195)
Jan 15, 2021
17d7abb
Added what's new page and moved blocks out one level in the table of …
Jan 15, 2021
ce22e42
backout update gradien test
julienf-unity Jan 15, 2021
d2f519e
Update ref images + deactivate test 26
julienf-unity Jan 17, 2021
87fafc1
update URP assets
julienf-unity Jan 17, 2021
cc0d5b4
Merge remote-tracking branch 'srp/10.x.x/release' into vfx/10.x.x-sta…
julienf-unity Jan 17, 2021
4ceb824
DEactivate test 32 + clean ribbon template vfx
julienf-unity Jan 17, 2021
6d68f0d
Merge branch '10.x.x/release' into vfx/10.x.x-staging
sebastienlagarde Jan 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ MonoBehaviour:
blendMode: 1
useAlphaClipping: 0
generateMotionVector: 0
excludeFromTAA: 0
m_SubOutputs:
- {fileID: 8926484042661614564}
cullMode: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,24 @@ public void MultiLinkSpawnerSpawnerAfterSpawnerInit()
Assert.AreEqual(2, from.outputContexts.Count());
}


[Test] //see fogbugz 1269756
public void Link_Fail_From_Event_To_OutputEvent()
{
var from = ScriptableObject.CreateInstance<VFXBasicEvent>();
var to = ScriptableObject.CreateInstance<VFXOutputEvent>();
Assert.IsFalse(VFXContext.CanLink(from, to));
}

[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));
}

[Test]
public void Link_Fail()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,45 @@ public void ConvertToSubgraph()

window.graphView.controller = null;
}

[Test]
public void Subgraph_Event_Link_To_Spawn()
{
VFXViewWindow window = VFXViewWindow.GetWindow<VFXViewWindow>();
window.LoadAsset(AssetDatabase.LoadAssetAtPath<VisualEffectAsset>(testAssetName), null);

//Create Spawner in subgraph
{
var spawner = ScriptableObject.CreateInstance<VFXBasicSpawner>();
m_ViewController.graph.AddChild(spawner);
m_ViewController.LightApplyChanges();

var controller = window.graphView.Query<VFXContextUI>().ToList().Select(t => t.controller).Cast<Controller>();
Assert.AreEqual(1, controller.Count());
VFXConvertSubgraph.ConvertToSubgraphContext(window.graphView, controller, Rect.zero, testSubgraphSubAssetName);
}

var subGraphController = m_ViewController.allChildren.OfType<VFXContextController>().FirstOrDefault(o => o.model is VFXSubgraphContext);
Assert.IsNotNull(subGraphController);

//Create Event Context & Link the two input flow
var subGraphContext = subGraphController.model;
var eventContext = ScriptableObject.CreateInstance<VFXBasicEvent>();

Assert.IsTrue(VFXContext.CanLink(eventContext, subGraphContext, 0, 0));
Assert.IsTrue(VFXContext.CanLink(eventContext, subGraphContext, 0, 1));

eventContext.LinkTo(subGraphContext, 0, 0);
eventContext.LinkTo(subGraphContext, 0, 1);

var flow = eventContext.outputFlowSlot.First().link;
Assert.AreEqual(2, flow.Count());
Assert.IsTrue(flow.All(o => o.context == subGraphContext));
Assert.IsTrue(flow.Any(o => o.slotIndex == 0));
Assert.IsTrue(flow.Any(o => o.slotIndex == 1));

window.graphView.controller = null;
}
}
}
#endif
Loading