diff --git a/Hypercube.Client/Dependencies.cs b/Hypercube.Client/Dependencies.cs index c81e331..49653d8 100644 --- a/Hypercube.Client/Dependencies.cs +++ b/Hypercube.Client/Dependencies.cs @@ -10,17 +10,10 @@ using Hypercube.Client.Input.Manager; using Hypercube.Client.Runtimes; using Hypercube.Client.Runtimes.Loop; +using Hypercube.Shared; using Hypercube.Shared.Dependency; -using Hypercube.Shared.Entities.Realisation.EventBus; -using Hypercube.Shared.Entities.Realisation.Manager; -using Hypercube.Shared.EventBus; -using Hypercube.Shared.Physics; -using Hypercube.Shared.Resources.Container; -using Hypercube.Shared.Resources.Manager; -using Hypercube.Shared.Resources.Preloader; using Hypercube.Shared.Runtimes; using Hypercube.Shared.Runtimes.Loop; -using Hypercube.Shared.Timing; namespace Hypercube.Client; @@ -31,7 +24,8 @@ public static class Dependencies { public static void Register(DependenciesContainer rootContainer) { - + SharedDependencies.Register(rootContainer); + // Input rootContainer.Register(); rootContainer.Register(); diff --git a/Hypercube.Server/Dependencies.cs b/Hypercube.Server/Dependencies.cs index a4b584f..809a146 100644 --- a/Hypercube.Server/Dependencies.cs +++ b/Hypercube.Server/Dependencies.cs @@ -1,5 +1,6 @@ using Hypercube.Server.Runtimes; using Hypercube.Server.Runtimes.Loop; +using Hypercube.Shared; using Hypercube.Shared.Dependency; using Hypercube.Shared.Runtimes; using Hypercube.Shared.Runtimes.Loop; @@ -13,6 +14,8 @@ public static class Dependencies { public static void Register(DependenciesContainer rootContainer) { + SharedDependencies.Register(rootContainer); + // Runtime rootContainer.Register(); rootContainer.Register(); diff --git a/Hypercube.Shared/SharedEntryPoint.cs b/Hypercube.Shared/SharedEntryPoint.cs index 4387098..ade5e4e 100644 --- a/Hypercube.Shared/SharedEntryPoint.cs +++ b/Hypercube.Shared/SharedEntryPoint.cs @@ -25,10 +25,13 @@ public void Enter(string[] args, Action? callba { var parser = new ArgumentParser(args); parser.TryParse(); + var rootContainer = DependencyManager.InitThread(); - SharedDependencies.Register(rootContainer); + Enter(parser, rootContainer); + callback?.Invoke(args, rootContainer); + var runtime = rootContainer.Resolve(); runtime.Run(); }