Merge pull request #126 from hadashiA/ku/support-domain-reload

hadashiA · Feb 13, 2021 · f5d6f82 · f5d6f82 · vercel · Feb 13, 2021
2 parents 240146d + e549b6d
commit f5d6f82
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.AwakeScheduler.cs b/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.AwakeScheduler.cs
@@ -22,7 +22,11 @@ partial class LifetimeScope
         static readonly List<(LifetimeScope, VContainerParentTypeReferenceNotFound)> WaitingList =
             new List<(LifetimeScope, VContainerParentTypeReferenceNotFound)>();
 
+#if UNITY_2019_3_OR_NEWER
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+#else
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+#endif
         static void SubscribeSceneEvents()
         {
             SceneManager.sceneLoaded -= AwakeWaitingChildren;

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs b/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs
@@ -256,6 +256,7 @@ LifetimeScope GetRuntimeParent()
             if (parentReference.Object != null)
                 return parentReference.Object;
 
+            // Find in scene via type
             if (parentReference.Type != null && parentReference.Type != GetType())
             {
                 var found = Find(parentReference.Type);
@@ -268,15 +269,26 @@ LifetimeScope GetRuntimeParent()
                     $"{name} could not found parent reference of type : {parentReference.Type}");
             }
 
+            // Find root from settings
             if (VContainerSettings.Instance is VContainerSettings settings)
             {
-                if (settings.RootLifetimeScope != null)
+                var rootLifetimeScope = settings.RootLifetimeScope;
+#if UNITY_EDITOR
+                var disableDomainReloading = UnityEditor.EditorSettings.enterPlayModeOptionsEnabled &&
+                                             (UnityEditor.EditorSettings.enterPlayModeOptions &
+                                              UnityEditor.EnterPlayModeOptions.DisableDomainReload) > 0;
+                if (rootLifetimeScope == null && disableDomainReloading)
                 {
-                    if (settings.RootLifetimeScope.Container == null)
+                    UnityEngine.Debug.LogError("VContainerSettings.RootLifetimeScope is missing. Please try to re-compile C# scripts just once.");
+                }
+#endif
+                if (rootLifetimeScope != null)
+                {
+                    if (rootLifetimeScope.Container == null)
                     {
-                        settings.RootLifetimeScope.Build();
+                        rootLifetimeScope.Build();
                     }
-                    return settings.RootLifetimeScope;
+                    return rootLifetimeScope;
                 }
             }
             return null;

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopHelper.cs b/VContainer/Assets/VContainer/Runtime/Unity/PlayerLoopHelper.cs
@@ -1,5 +1,5 @@
 using System;
-using UnityEngine;
+using System.Threading;
 #if UNITY_2019_3_OR_NEWER
 using UnityEngine.LowLevel;
 using UnityEngine.PlayerLoop;
@@ -42,16 +42,13 @@ enum PlayerLoopTiming
     static class PlayerLoopHelper
     {
         static readonly PlayerLoopRunner[] Runners = new PlayerLoopRunner[10];
-        static bool initialized;
+        static long initialized;
 
         // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         public static void Initialize()
         {
-            lock (Runners)
-            {
-                if (initialized) return;
-                initialized = true;
-            }
+            if (Interlocked.CompareExchange(ref initialized, 1, 0) != 0)
+                return;
 
             for (var i = 0; i < Runners.Length; i++)
             {