pengtaihao
/
UniTask
mirror of https://github.com/Cysharp/UniTask
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix version define for preWillRenderCanvases 

Canvas.preWillRenderCanvases callback is available in 2020.3.0 and later
pull/554/head
Jake Perry 2024-03-16 17:26:04 +10:30
parent 68a7969808
commit bbbf396bb4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/EngineCallbackRunner.cs
View File

@ -24,7 +24,7 @@ namespace Cysharp.Threading.Tasks.Internal
case EngineCallbackTiming.WillRenderCanvases: case EngineCallbackTiming.WillRenderCanvases:
WillRenderCanvases(); WillRenderCanvases();
break; break;
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
case EngineCallbackTiming.PreWillRenderCanvases: case EngineCallbackTiming.PreWillRenderCanvases:
PreWillRenderCanvases(); PreWillRenderCanvases();
break; break;
@ -40,7 +40,7 @@ namespace Cysharp.Threading.Tasks.Internal
void OnBeforeRender() => RunCore(); void OnBeforeRender() => RunCore();
void WillRenderCanvases() => RunCore(); void WillRenderCanvases() => RunCore();
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
void PreWillRenderCanvases() => RunCore(); void PreWillRenderCanvases() => RunCore();
#endif #endif
} }

10
src/UniTask/Assets/Plugins/UniTask/Runtime/PlayerLoopHelper.cs
View File

@ -103,7 +103,7 @@ namespace Cysharp.Threading.Tasks
OnBeforeRender = 0, OnBeforeRender = 0,
WillRenderCanvases = 1, WillRenderCanvases = 1,
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
PreWillRenderCanvases = 2, PreWillRenderCanvases = 2,
#endif #endif
} }
@ -187,7 +187,7 @@ namespace Cysharp.Threading.Tasks
All = All =
OnBeforeRender | OnBeforeRender |
WillRenderCanvases WillRenderCanvases
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
| PreWillRenderCanvases | PreWillRenderCanvases
#endif #endif
, ,
@ -195,7 +195,7 @@ namespace Cysharp.Threading.Tasks
OnBeforeRender = 1, OnBeforeRender = 1,
WillRenderCanvases = 2, WillRenderCanvases = 2,
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
PreWillRenderCanvases = 4, PreWillRenderCanvases = 4,
#endif #endif
} }
@ -448,7 +448,7 @@ namespace Cysharp.Threading.Tasks
runners = new PlayerLoopRunner[14]; runners = new PlayerLoopRunner[14];
#endif #endif
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
callbackRunners = new EngineCallbackRunner[3]; callbackRunners = new EngineCallbackRunner[3];
#else #else
callbackRunners = new EngineCallbackRunner[2]; callbackRunners = new EngineCallbackRunner[2];
@ -549,7 +549,7 @@ namespace Cysharp.Threading.Tasks
Canvas.willRenderCanvases += willRenderCanvasesRunner.Run; Canvas.willRenderCanvases += willRenderCanvasesRunner.Run;
} }
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
if (GetInjectCallback(injectCallbackTimings, InjectEngineCallbackTimings.PreWillRenderCanvases, if (GetInjectCallback(injectCallbackTimings, InjectEngineCallbackTimings.PreWillRenderCanvases,
2, EngineCallbackTiming.PreWillRenderCanvases, out var preWillRenderCanvasesRunner)) 2, EngineCallbackTiming.PreWillRenderCanvases, out var preWillRenderCanvasesRunner))
{ {

2
src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs
View File

@ -205,7 +205,7 @@ namespace Cysharp.Threading.Tasks
return new UniTask(YieldPromise.Create(EngineCallbackTiming.WillRenderCanvases, cancellationToken, cancelImmediately, out var token), token); return new UniTask(YieldPromise.Create(EngineCallbackTiming.WillRenderCanvases, cancellationToken, cancelImmediately, out var token), token);
} }
#if UNITY_2021_3_OR_NEWER #if UNITY_2020_3_OR_NEWER
public static UniTask WaitForPreWillRenderCanvases(CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false) public static UniTask WaitForPreWillRenderCanvases(CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
{ {
return new UniTask(YieldPromise.Create(EngineCallbackTiming.PreWillRenderCanvases, cancellationToken, cancelImmediately, out var token), token); return new UniTask(YieldPromise.Create(EngineCallbackTiming.PreWillRenderCanvases, cancellationToken, cancelImmediately, out var token), token);