Merge pull request #112 from AnnulusGames/fix-possibility-of-double-r…

…elease

Fix: possibility of double release

src/LitMotion/Assets/LitMotion/Runtime/Internal/MotionStorage.cs

@@ -121,9 +121,11 @@ internal sealed class MotionStorage<TValue, TOptions, TAdapter> : IMotionStorage
         where TOptions : unmanaged, IMotionOptions
         where TAdapter : unmanaged, IMotionAdapter<TValue, TOptions>
     {
-        readonly struct AnimationCurveAllocatorKey { }
-
-        public MotionStorage(int id) => StorageId = id;
+        public MotionStorage(int id)
+        {
+            StorageId = id;
+            AllocatorHelper = RewindableAllocatorFactory.CreateAllocator();
+        }
 
         // Entry
         readonly StorageEntryList entries = new(InitialCapacity);
@@ -133,6 +135,9 @@ readonly struct AnimationCurveAllocatorKey { }
         public MotionData<TValue, TOptions>[] dataArray = new MotionData<TValue, TOptions>[InitialCapacity];
         public MotionCallbackData[] callbacksArray = new MotionCallbackData[InitialCapacity];
 
+        // Allocator
+        AllocatorHelper<RewindableAllocator> AllocatorHelper;
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Span<MotionData<TValue, TOptions>> GetDataSpan() => dataArray.AsSpan(0, tail);
 
@@ -171,7 +176,7 @@ readonly struct AnimationCurveAllocatorKey { }
             {
                 if (!prevAnimationCurve.IsCreated)
                 {
-                    prevAnimationCurve = new NativeAnimationCurve(SharedRewindableAllocator<AnimationCurveAllocatorKey>.Allocator.Handle);
+                    prevAnimationCurve = new NativeAnimationCurve(AllocatorHelper.Allocator.Handle);
                 }
 
                 prevAnimationCurve.CopyFrom(data.AnimationCurve);
@@ -403,7 +408,7 @@ public void Reset()
             callbacksArray.AsSpan().Clear();
             tail = 0;
 
-            SharedRewindableAllocator<AnimationCurveAllocatorKey>.Allocator.Rewind();
+            AllocatorHelper.Allocator.Rewind();
         }
 
         public float GetPlaybackSpeed(MotionHandle handle)

src/LitMotion/Assets/LitMotion/Runtime/Internal/RewindableAllocatorFactory.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Unity.Collections;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+namespace LitMotion
+{
+    internal static class RewindableAllocatorFactory
+    {
+        const int InitialSize = 128 * 1024;
+        static bool isInitialized;
+        static readonly Stack<AllocatorHelper<RewindableAllocator>> allocators = new();
+
+        public static AllocatorHelper<RewindableAllocator> CreateAllocator()
+        {
+            Initialize();
+
+            var allocatorHelper = new AllocatorHelper<RewindableAllocator>(Allocator.Persistent);
+            allocatorHelper.Allocator.Initialize(InitialSize, true);
+            allocators.Push(allocatorHelper);
+
+            return allocatorHelper;
+        }
+
+        static void Initialize()
+        {
+            if (!isInitialized)
+            {
+#if UNITY_EDITOR
+                AssemblyReloadEvents.beforeAssemblyReload += Dispose;
+#else
+                UnityEngine.Application.quitting += Dispose;
+#endif
+                isInitialized = true;
+            }
+        }
+
+        static void Dispose()
+        {
+            while (allocators.TryPop(out var allocatorHelper))
+            {
+                allocatorHelper.Allocator.Dispose();
+                allocatorHelper.Dispose();
+            }
+        }
+    }
+}

src/LitMotion/Assets/LitMotion/Tests/Runtime/NativeAnimationCurveTest.cs

@@ -45,9 +45,10 @@ public void Test_Dispose()
         public void Test_Dispose_RewindableAllocator()
         {
             var curve = AnimationCurve.EaseInOut(0f, 0f, 1f, 1f);
-            var native = new NativeAnimationCurve(curve, SharedRewindableAllocator<NativeAnimationCurveTest>.Allocator.Handle);
+            var allocator = RewindableAllocatorFactory.CreateAllocator();
+            var native = new NativeAnimationCurve(curve, allocator.Allocator.Handle);
 
-            SharedRewindableAllocator<NativeAnimationCurveTest>.Allocator.Rewind();
+            allocator.Allocator.Rewind();
 
             try
             {