Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-08 11:59:26 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ContinueWithCoroutine method supports a return value and a argument

Browse Source
This commit is contained in:
chorome
2020-07-01 12:36:44 +09:00
parent a3156a11b9
commit 1b85a49836
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/VRM/DepthFirstScheduler/Functor.cs
View File

@@ -75,10 +75,18 @@ namespace DepthFirstScheduler
#region CoroutineFunctor
public class CoroutineFunctor<T> : IFunctor<T>
{
T m_result;
public T GetResult()
{
return m_result;
if (m_last?.Current == null) return default;
try
{
return (T)m_last.Current;
}
catch
{
return default;
}
}
Exception m_error;
@@ -87,12 +95,11 @@ namespace DepthFirstScheduler
return m_error;
}
Func<T> m_arg;
Func<T, IEnumerator> m_starter;
Func<IEnumerator> m_starter;
Stack<IEnumerator> m_it;
public CoroutineFunctor(Func<T> arg, Func<T, IEnumerator> starter)
private IEnumerator m_last;
public CoroutineFunctor(Func<IEnumerator> starter)
{
m_arg = arg;
m_starter = starter;
}
@@ -100,9 +107,8 @@ namespace DepthFirstScheduler
{
if (m_it == null)
{
m_result = m_arg();
m_it = new Stack<IEnumerator>();
m_it.Push(m_starter(m_result));
m_it.Push(m_starter());
}
try
@@ -119,7 +125,7 @@ namespace DepthFirstScheduler
}
else
{
m_it.Pop();
m_last = m_it.Pop();
}
return ExecutionStatus.Continue;
}
@@ -139,9 +145,11 @@ namespace DepthFirstScheduler
public static class CoroutineFunctor
{
public static CoroutineFunctor<T> Create<T>(Func<T> arg, Func<T, IEnumerator> starter)
/// <typeparam name="S">引数の型</typeparam>
/// <typeparam name="T">結果の型</typeparam>
public static CoroutineFunctor<T> Create<S, T>(Func<S> arg, Func<S, IEnumerator> starter)
{
return new CoroutineFunctor<T>(arg, starter);
return new CoroutineFunctor<T>(() => starter(arg()));
}
}
#endregion

23
Assets/VRM/DepthFirstScheduler/Schedulable.cs
View File

@@ -137,10 +137,10 @@ namespace DepthFirstScheduler
return schedulable;
}
public Schedulable<T> AddCoroutine(IScheduler scheduler, Func<IEnumerator> starter)
public Schedulable<Unit> AddCoroutine(IScheduler scheduler, Func<IEnumerator> starter)
{
var func = CoroutineFunctor.Create(() => default(T), _ => starter());
var schedulable = new Schedulable<T>(scheduler, func);
var func = CoroutineFunctor.Create<Unit, Unit>(() => default(Unit), _ => starter());
var schedulable = new Schedulable<Unit>(scheduler, func);
AddChild(schedulable);
return schedulable;
}
@@ -168,15 +168,26 @@ namespace DepthFirstScheduler
return schedulable;
}
public Schedulable<T> ContinueWithCoroutine(IScheduler scheduler, Func<IEnumerator> starter)
public Schedulable<Unit> ContinueWithCoroutine(IScheduler scheduler, Func<IEnumerator> starter)
{
return ContinueWithCoroutine<Unit>(scheduler, _ => starter());
}
public Schedulable<U> ContinueWithCoroutine<U>(IScheduler scheduler, Func<T, IEnumerator> starter)
{
if (Parent == null)
{
throw new NoParentException();
}
var func = CoroutineFunctor.Create(() => default(T), _ => starter());
var schedulable = new Schedulable<T>(scheduler, func);
Func<T> getResult = null;
if (Func != null)
{
getResult = Func.GetResult;
}
var func = CoroutineFunctor.Create<T, U>(getResult, starter);
var schedulable = new Schedulable<U>(scheduler, func);
Parent.AddChild(schedulable);
return schedulable;
}