Removed installers and using modules

EcsRx · Sep 4, 2018 · 1bd2d72 · 1bd2d72
1 parent a18f821
commit 1bd2d72
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 103 deletions.
diff --git a/Assets/EcsRx/Zenject/EcsRxApplicationBehaviour.cs b/Assets/EcsRx/Zenject/EcsRxApplicationBehaviour.cs
@@ -41,13 +41,14 @@ private void Awake()
         protected void OnZenjectReady()
         {   
             DependencyContainer = new ZenjectDependencyContainer(_sceneContext.Container);
-            _sceneContext.Container.Inject(this);
             StartApplication();
         }
 
         public virtual void StartApplication()
         {
             RegisterModules();
+
+            _sceneContext.Container.Inject(this);
             ApplicationStarting();
             RegisterAllPluginDependencies();
             SetupAllPluginSystems();

diff --git a/Assets/Game/Application.cs b/Assets/Game/Application.cs
@@ -8,6 +8,7 @@
 using Game.Components;
 using Game.Configuration;
 using Game.Events;
+using Game.Installers;
 using UniRx;
 using UnityEngine;
 using Zenject;
@@ -21,6 +22,14 @@ public class Application : EcsRxApplicationBehaviour
         [Inject]
         private GameConfiguration _gameConfiguration;
 
+        protected override void RegisterModules()
+        {
+            base.RegisterModules();
+            DependencyContainer.LoadModule<GameModule>();
+            DependencyContainer.LoadModule<SceneCollectionsModule>();
+            DependencyContainer.LoadModule<ComputedModule>();
+        }
+
         protected override void ApplicationStarting()
         {
             this.BindAllSystemsWithinApplicationScope();

diff --git a/Assets/Game/Installers.meta b/Assets/Game/Installers.meta
diff --git a/Assets/Game/Installers/ComputedInstaller.cs b/Assets/Game/Installers/ComputedInstaller.cs
diff --git a/Assets/Game/Installers/ComputedInstaller.cs.meta b/Assets/Game/Installers/ComputedInstaller.cs.meta
diff --git a/Assets/Game/Installers/GameInstaller.cs b/Assets/Game/Installers/GameInstaller.cs
diff --git a/Assets/Game/Installers/GameInstaller.cs.meta b/Assets/Game/Installers/GameInstaller.cs.meta
diff --git a/Assets/Game/Installers/SceneCollectionsInstaller.cs b/Assets/Game/Installers/SceneCollectionsInstaller.cs
diff --git a/Assets/Game/Installers/SceneCollectionsInstaller.cs.meta b/Assets/Game/Installers/SceneCollectionsInstaller.cs.meta
diff --git a/Assets/Game/Scenes/game-scene.unity b/Assets/Game/Scenes/game-scene.unity