Changed back to only initialize the global composition root in scenes…

… that also have a scene composition root as discussed here: https://groups.google.com/forum/#!msg/zenject/mD-v2IcVPlg/S--lMpl2CAAJ
ssannandeji · Feb 4, 2016 · e7b4e8b · e7b4e8b
1 parent a008c32
commit e7b4e8b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/Build/BinaryMetas/Zenject.dll.meta b/Build/BinaryMetas/Zenject.dll.meta
diff --git a/UnityProject/Assets/Tests.meta b/UnityProject/Assets/Tests.meta
diff --git a/UnityProject/Assets/Zenject/Source/Main/GlobalCompositionRoot.cs b/UnityProject/Assets/Zenject/Source/Main/GlobalCompositionRoot.cs
@@ -40,17 +40,20 @@ public static GlobalCompositionRoot Instance
         {
             get
             {
-                Assert.IsNotNull(_instance);
+                if (_instance == null)
+                {
+                    _instance = new GameObject("Global Composition Root")
+                        .AddComponent<GlobalCompositionRoot>();
+                    _instance.Initialize();
+                }
+
                 return _instance;
             }
         }
 
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-        static void GlobalMainEntryPoint()
+        public void EnsureIsInitialized()
         {
-            _instance = new GameObject("Global Composition Root")
-                .AddComponent<GlobalCompositionRoot>();
-            _instance.Initialize();
+            // Do nothing - Initialize occurs in Instance property
         }
 
         void Initialize()

diff --git a/UnityProject/Assets/Zenject/Source/Main/SceneCompositionRoot.cs b/UnityProject/Assets/Zenject/Source/Main/SceneCompositionRoot.cs
@@ -52,6 +52,9 @@ public override IFacade RootFacade
 
         public void Awake()
         {
+            // We always want to initialize GlobalCompositionRoot as early as possible
+            GlobalCompositionRoot.Instance.EnsureIsInitialized();
+
             Assert.IsNull(Container);
             Assert.IsNull(RootFacade);
 

diff --git a/UnityProject/Assets/Zenject/Source/Misc/UnityEventManager.cs.meta b/UnityProject/Assets/Zenject/Source/Misc/UnityEventManager.cs.meta
diff --git a/UnityProject/Assets/Zenject/Source/Util/SceneDecoratorCompositionRoot.cs b/UnityProject/Assets/Zenject/Source/Util/SceneDecoratorCompositionRoot.cs
@@ -28,6 +28,9 @@ public sealed class SceneDecoratorCompositionRoot : MonoBehaviour
 
         public void Awake()
         {
+            // We always want to initialize GlobalCompositionRoot as early as possible
+            GlobalCompositionRoot.Instance.EnsureIsInitialized();
+
             _beforeInstallHooks = SceneCompositionRoot.BeforeInstallHooks;
             SceneCompositionRoot.BeforeInstallHooks = null;
 

diff --git a/UnityProject/Assets/Zenject/Source/Util/SceneDecoratorCompositionRoot.cs.meta b/UnityProject/Assets/Zenject/Source/Util/SceneDecoratorCompositionRoot.cs.meta