Merge pull request #108 from AnnulusGames/add-default-scheduler

Add: MotionScheduler.DefaultScheduler
AnnulusGames · Mar 17, 2024 · 83b455a · 83b455a
2 parents cf2aa69 + 52c55e3
commit 83b455a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/LitMotion/Assets/LitMotion/Editor/MotionTrackerTreeView.cs b/src/LitMotion/Assets/LitMotion/Editor/MotionTrackerTreeView.cs
@@ -121,18 +121,14 @@ static string GetTimeKindName(MotionTimeKind motionTimeKind)
             }
             if (scheduler == null)
             {
-#if UNITY_EDITOR
                 if (isCreatedOnEditor)
                 {
-                    scheduler = MotionScheduler.Update;
+                    scheduler = MotionScheduler.DefaultScheduler;
                 }
                 else
                 {
                     scheduler = EditorMotionScheduler.Update;
                 }
-#else
-                scheduler = MotionScheduler.Update;
-#endif
             }
 
             return scheduler switch
@@ -153,7 +149,7 @@ protected override TreeViewItem BuildRoot()
             foreach (var tracking in MotionTracker.Items)
             {
                 children.Add(new MotionTrackerViewItem(id)
-                { 
+                {
                     MotionType = $"[{tracking.ValueType.Name}, {tracking.OptionsType.Name}, {tracking.AdapterType.Name}]",
                     SchedulerType = GetSchedulerName(tracking.Scheduler, tracking.CreatedOnEditor),
                     Elapsed = (DateTime.UtcNow - tracking.CreationTime).TotalSeconds.ToString("00.00"),

diff --git a/src/LitMotion/Assets/LitMotion/Runtime/MotionBuilder.cs b/src/LitMotion/Assets/LitMotion/Runtime/MotionBuilder.cs
@@ -312,19 +312,14 @@ internal readonly MotionHandle Schedule(IMotionScheduler scheduler, ref MotionDa
 #if UNITY_EDITOR
                 if (!UnityEditor.EditorApplication.isPlaying)
                 {
-                    // Inlined EditorUpdateMotionScheduler
                     handle = EditorMotionDispatcher.Schedule<TValue, TOptions, TAdapter>(data, callbackData);
                 }
                 else
                 {
-                    // Inlined PlayerLoopMotionScheduler
-                    data.TimeKind = MotionTimeKind.Time;
-                    handle = MotionDispatcher.Schedule<TValue, TOptions, TAdapter>(data, callbackData, PlayerLoopTiming.Update);
+                    handle = MotionScheduler.DefaultScheduler.Schedule<TValue, TOptions, TAdapter>(ref data, ref callbackData);
                 }
 #else
-                // Inlined PlayerLoopMotionScheduler
-                data.TimeKind = MotionTimeKind.Time;
-                handle = MotionDispatcher.Schedule<TValue, TOptions, TAdapter>(data, callbackData, PlayerLoopTiming.Update);
+                handle = MotionScheduler.DefaultScheduler.Schedule<TValue, TOptions, TAdapter>(ref data, ref callbackData);
 #endif
             }
             else
@@ -383,7 +378,6 @@ internal MotionCallbackData BuildCallbackData()
             return callbacks;
         }
 
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal MotionCallbackData BuildCallbackData(Action<TValue> action)
         {

diff --git a/src/LitMotion/Assets/LitMotion/Runtime/Schedulers/MotionScheduler.cs b/src/LitMotion/Assets/LitMotion/Runtime/Schedulers/MotionScheduler.cs
@@ -5,6 +5,16 @@ namespace LitMotion
     /// </summary>
     public static class MotionScheduler
     {
+        static MotionScheduler()
+        {
+            DefaultScheduler = Update;
+        }
+
+        /// <summary>
+        /// Default scheduler used if not specified
+        /// </summary>
+        public static IMotionScheduler DefaultScheduler { get; set; }
+
         /// <summary>
         /// Scheduler that updates motion at Initialization.
         /// </summary>