refactor: basic di for root feature

cherrynik · Nov 19, 2023 · b9d065d · b9d065d
1 parent b7240c1
commit b9d065d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 24 deletions.
diff --git a/src/Apps/GameDesktop/CompositionRoots/Features/RootFeatureCompositionRoot.cs b/src/Apps/GameDesktop/CompositionRoots/Features/RootFeatureCompositionRoot.cs
@@ -1,6 +1,19 @@
-using LightInject;
+using Components.Data;
+using Entities.Factories.Characters;
+using Entities.Factories.Meta;
+using Features;
+using LightInject;
 using GameDesktop.CompositionRoots.Components;
 using GameDesktop.CompositionRoots.Entities;
+using Implementations;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Scellecs.Morpeh;
+using Services.Movement;
+using Systems;
+using Systems.Debugging;
+using Systems.Debugging.Render;
+using Systems.Render;
 #if DEBUG
 using GameDesktop.CompositionRoots.DebugFeatures;
 #endif
@@ -29,7 +42,7 @@ public void Compose(IServiceRegistry serviceRegistry)
         serviceRegistry.RegisterFrom<DebugRootFeatureCompositionRoot>();
 #endif
 
-        // RegisterEntryPoint(serviceRegistry);
+        RegisterEntryPoint(serviceRegistry);
     }
 
     private static void RegisterFundamental(IServiceRegistry serviceRegistry) =>
@@ -52,6 +65,37 @@ private static void RegisterFeatures(IServiceRegistry serviceRegistry)
         // serviceRegistry.RegisterFrom<MovementFeatureCompositionRoot>();
     }
 
-    // private static void RegisterEntryPoint(IServiceRegistry serviceRegistry) =>
+    private static void RegisterEntryPoint(IServiceRegistry serviceRegistry)
+    {
+        serviceRegistry.RegisterSingleton(_ => World.Create());
+
+        serviceRegistry.RegisterSingleton(factory =>
+        {
+            Texture2D pixel = new(factory.GetInstance<SpriteBatch>().GraphicsDevice, 1, 1);
+            pixel.SetData(new[] { Color.Gold });
+
+            return new RootFeature(factory.GetInstance<World>(),
+                new WorldInitializer(factory.GetInstance<World>(), new WorldEntityFactory(new WorldComponent()),
+                    factory.GetInstance<PlayerEntityFactory>(),
+                    factory.GetInstance<DummyEntityFactory>()),
+                new MovementFeature(factory.GetInstance<World>(),
+                    new InputSystem(factory.GetInstance<World>(), new KeyboardInput()),
+                    new MovementSystem(factory.GetInstance<World>(), new SimpleMovement())),
+                new PreRenderFeature(factory.GetInstance<World>(),
+                    new CharacterMovementAnimationSystem(factory.GetInstance<World>()),
+                    new CameraFollowingSystem(factory.GetInstance<World>())),
+                new RenderFeature(factory.GetInstance<World>(),
+                    new RenderCharacterMovementAnimationSystem(factory.GetInstance<World>(),
+                        factory.GetInstance<SpriteBatch>()))
+#if DEBUG
+                ,
+                new DebugFeature(factory.GetInstance<World>(), new EntitiesList(factory.GetInstance<World>()),
+                    new FrameCounter(factory.GetInstance<World>()),
+                    new RenderFramesPerSec(factory.GetInstance<World>()),
+                    new PivotRenderSystem(factory.GetInstance<World>(), factory.GetInstance<SpriteBatch>(), pixel))
+#endif
+            );
+        });
+    }
     // serviceRegistry.RegisterSingleton<RootFeature>();
 }
diff --git a/src/Apps/GameDesktop/Game.cs b/src/Apps/GameDesktop/Game.cs
@@ -132,26 +132,7 @@ protected override void LoadContent()
 //         _desktop.Root = grid;
         // ------
 
-        World world = World.Create();
-
-        _rootFeature = new RootFeature(world,
-            new WorldInitializer(world, new WorldEntityFactory(new WorldComponent()),
-                _container.GetInstance<PlayerEntityFactory>(),
-                _container.GetInstance<DummyEntityFactory>()),
-            new MovementFeature(world,
-                new InputSystem(world, new KeyboardInput()),
-                new MovementSystem(world, new SimpleMovement())),
-            new PreRenderFeature(world,
-                new CharacterMovementAnimationSystem(world),
-                new CameraFollowingSystem(world)),
-            new RenderFeature(world,
-                new RenderCharacterMovementAnimationSystem(world, _spriteBatch))
-#if DEBUG
-            ,
-            new DebugFeature(world, new EntitiesList(world), new FrameCounter(world), new RenderFramesPerSec(world),
-                new PivotRenderSystem(world, _spriteBatch, pixel))
-#endif
-        );
+        _rootFeature = _container.GetInstance<RootFeature>();
 
         _rootFeature.OnAwake();
 

diff --git a/src/UnitTests/UnitTests.Entities/PlayerEntity.cs b/src/UnitTests/UnitTests.Entities/PlayerEntity.cs
@@ -95,7 +95,7 @@ public void WorldSystemAndEntityWorkTogether()
         Assert.That(transform.Velocity.X, Is.EqualTo(0));
         Assert.That(transform.Position.Y, Is.EqualTo(0));
 
-        rootFeature.OnUpdate(16.6f);
+        rootFeature.OnUpdate(.0f);
 
         Assert.That(transform.Velocity.X, Is.EqualTo(1));
         // Assert.That(transform.Position.Y, Is.EqualTo(0));