refactor: assemblies for DI

cherrynik · Jun 20, 2024 · 943348e · 943348e
1 parent d5c2716
commit 943348e
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -494,4 +494,5 @@ dependensee.html
 
 # Jenny & CSharp
 *.userproperties
-Generated/
+Generated/
+src/Libs/External/MonoGame.ImGuiNet
diff --git a/src/Apps/GameDesktop/CompositionRoots/Components/ComponentsCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Components/ComponentsCompositionRoot.cs
@@ -10,6 +10,9 @@
 using MonoGame.Aseprite.Sprites;
 using Services.Math;
 
+
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.Components.ComponentsCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots.Components;
 
 internal class ComponentsCompositionRoot : ICompositionRoot
@@ -115,7 +118,8 @@ private static void RegisterMovementAnimationsComponent(IServiceRegistry service
 
     private static void RegisterTransformComponent(IServiceRegistry serviceRegistry)
     {
-        serviceRegistry.RegisterSingleton(_ => new TransformComponent());
+        serviceRegistry.Register<string, NameComponent>((factory, name) => new NameComponent(name));
+        serviceRegistry.RegisterTransient(_ => new TransformComponent());
 
         serviceRegistry.RegisterSingleton(_ =>
             new TransformComponent { Position = new(316, 116) }, "PlayerEntity");

diff --git a/src/Apps/GameDesktop/CompositionRoots/DebugFeatures/DebugRootFeatureCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/DebugFeatures/DebugRootFeatureCompositionRoot.cs
@@ -1,7 +1,9 @@
 // using Features.Debugging;
+
 using LightInject;
 using MonoGame.ImGuiNet;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.DebugFeatures.DebugRootFeatureCompositionRoot))]
 namespace GameDesktop.CompositionRoots.DebugFeatures;
 
 internal class DebugRootFeatureCompositionRoot : ICompositionRoot
@@ -16,10 +18,10 @@ private static void RegisterSystems(IServiceRegistry serviceRegistry)
     {
         // serviceRegistry.RegisterSingleton(factory =>
         // {
-            // return new DrawRectangleCollisionComponentsSystem(factory.GetInstance<ILogger>());
+        // return new DrawRectangleCollisionComponentsSystem(factory.GetInstance<ILogger>());
         // });
     }
 
     // private static void RegisterFeature(IServiceRegistry serviceRegistry) =>
-        // serviceRegistry.RegisterSingleton<DebugRootFeature>();
+    // serviceRegistry.RegisterSingleton<DebugRootFeature>();
 }
diff --git a/src/Apps/GameDesktop/CompositionRoots/Entities/PlayerEntityCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Entities/PlayerEntityCompositionRoot.cs
@@ -4,6 +4,8 @@
 using Entities.Factories.Characters;
 using LightInject;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.Entities.PlayerEntityCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots.Entities;
 
 internal class PlayerEntityCompositionRoot : ICompositionRoot

diff --git a/src/Apps/GameDesktop/CompositionRoots/Entities/RockEntityCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Entities/RockEntityCompositionRoot.cs
@@ -3,6 +3,7 @@
 using Entities.Factories.Items;
 using LightInject;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.Entities.RockEntityCompositionRoot))]
 namespace GameDesktop.CompositionRoots.Entities;
 
 public class RockEntityCompositionRoot : ICompositionRoot

diff --git a/src/Apps/GameDesktop/CompositionRoots/Entities/StaticEntityCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Entities/StaticEntityCompositionRoot.cs
@@ -3,6 +3,8 @@
 using Entities.Factories.Characters;
 using LightInject;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.Entities.StaticEntityCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots.Entities;
 
 internal class StaticEntityCompositionRoot : ICompositionRoot

diff --git a/src/Apps/GameDesktop/CompositionRoots/Features/RootFeatureCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Features/RootFeatureCompositionRoot.cs
@@ -29,6 +29,8 @@
 using GameDesktop.CompositionRoots.DebugFeatures;
 #endif
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.Features.RootFeatureCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots.Features;
 
 internal class RootFeatureCompositionRoot : ICompositionRoot

diff --git a/src/Apps/GameDesktop/CompositionRoots/FundamentalCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/FundamentalCompositionRoot.cs
@@ -11,6 +11,8 @@
 using Services.Factories;
 using Services.Math;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.FundamentalCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots;
 
 internal class FundamentalCompositionRoot : ICompositionRoot

diff --git a/src/Apps/GameDesktop/CompositionRoots/GameCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/GameCompositionRoot.cs
@@ -4,6 +4,8 @@
 using Microsoft.Xna.Framework;
 using Serilog;
 
+[assembly: CompositionRootType(typeof(GameDesktop.CompositionRoots.GameCompositionRoot))]
+
 namespace GameDesktop.CompositionRoots;
 
 internal class GameCompositionRoot : ICompositionRoot

diff --git a/src/Libs/Entities/Factories/EntityFactory.cs b/src/Libs/Entities/Factories/EntityFactory.cs
@@ -22,8 +22,7 @@ public class AbstractEntityFactory(IServiceFactory serviceFactory) : IAbstractEn
     private readonly Dictionary<string, IAbstractEntityFactory> _factories = new()
     {
         // { "Tree", () => (IEntityFactory)serviceProvider.GetService(typeof(RockFactory)) },
-        { "Rock", serviceFactory.GetInstance<RockFactory>() },
-        { "Default", null }
+        { "Rock", serviceFactory.GetInstance<RockFactory>() }, { "Default", null }
     };
 
     public Entity CreateEntity(EntityInstance entity, World @in)
@@ -50,8 +49,8 @@ protected override void AddTags(Entity e)
 
     protected override void AddData(Entity e)
     {
-        // ref var name = ref e.AddComponent(serviceProvider.GetInstance<NameComponent>());
-        ref var transform = ref e.AddComponent(serviceProvider.GetInstance<TransformComponent>());
+        e.AddComponent(serviceProvider.GetInstance<string, NameComponent>("Pebble"));
+        e.AddComponent(serviceProvider.GetInstance<TransformComponent>());
     }
 
     protected override void AddRender(Entity e)