refactor: ecs & di & composition root

- Needs refactoring yet & docs update

docs/Workflow.md

@@ -11,6 +11,10 @@
 - [Creating global `const`](#creating-global-const)
 - [State Machine](#state-machine)
 
+## MonoGame Pipeline
+
+Don't forget to rebuild `.mgcb` file after changing files in it.
+
 ## Makefile
 
 If something happens like commands don't run, variables not evaluated, but the file is correct 99%,

src/Apps/GameDesktop/Content/Content.mgcb

@@ -13,3 +13,6 @@
 
 #---------------------------------- Content ---------------------------------#
 
+#begin SpriteSheets/Player.aseprite
+/copy:SpriteSheets/Player.aseprite
+

src/Apps/GameDesktop/Game.cs

@@ -1,22 +1,29 @@
-using Microsoft.Xna.Framework;
+using Features;
+using LightInject;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Serilog.Core;
+using Serilog;
 
 namespace GameDesktop;
 
 public class Game : Microsoft.Xna.Framework.Game
 {
-    private readonly Logger _logger;
+    private readonly ILogger _logger;
     private readonly Contexts _contexts;
+    private readonly IServiceContainer _container;
+
+    private Entitas.Extended.Feature _rootFeature;
+    private SpriteBatch _spriteBatch;
 
-    public SpriteBatch SpriteBatch { get; private set; }
 
     public Game(
-        Logger logger,
-        Contexts contexts)
+        ILogger logger,
+        Contexts contexts,
+        IServiceContainer container)
     {
         _logger = logger;
         _contexts = contexts;
+        _container = container;
 
         _logger.ForContext<Game>().Verbose("ctor");
     }
@@ -26,10 +33,11 @@ protected override void Initialize()
         _logger.ForContext<Game>().Verbose($"Initialize(): start; available {GraphicsDevice}");
         _logger.ForContext<Game>().Verbose("SpriteBatch initialization...");
 
-        SpriteBatch = new SpriteBatch(GraphicsDevice);
+        _spriteBatch = new SpriteBatch(GraphicsDevice);
 
         _logger.ForContext<Game>().Verbose("SpriteBatch initialized");
 
+
         base.Initialize();
 
         _logger.ForContext<Game>().Verbose("Initialize(): end");
@@ -39,11 +47,14 @@ protected override void LoadContent()
     {
         _logger.ForContext<Game>().Verbose("LoadContent(): start");
 
-        // TODO: DI with ECS?
-        // TODO: Projects management (external in Libs/External?)
+        _container.Register(_ => _spriteBatch);
+        _container.RegisterFrom<RootFeatureCompositionRoot>();
+
+        _rootFeature = _container.GetInstance<RootFeature>();
+
         // TODO: Logging with game flags (like LOG_MOVEMENT, etc)?
         // TODO: Error handling
-        // _gameFeature.Initialize();
+        _rootFeature.Initialize();
         _logger.ForContext<Game>().Verbose("LoadContent(): end");
     }
 
@@ -65,31 +76,25 @@ protected override void EndRun()
         _logger.ForContext<Game>().Verbose("Ended");
     }
 
-    private void FixedUpdate(GameTime fixedGameTime)
-    {
-        // _gameFeature.FixedExecute(fixedGameTime);
-    }
+    private void FixedUpdate(GameTime fixedGameTime) => _rootFeature.FixedExecute(fixedGameTime);
 
     protected override void Update(GameTime gameTime)
     {
         FixedUpdate(gameTime);
 
         base.Update(gameTime);
-        // _gameFeature.Execute(gameTime);
+        _rootFeature.Execute(gameTime);
 
         LateUpdate(gameTime);
     }
 
-    private void LateUpdate(GameTime gameTime)
-    {
-        // _gameFeature.LateExecute(gameTime);
-    }
+    private void LateUpdate(GameTime gameTime) => _rootFeature.LateExecute(gameTime);
 
     protected override void Draw(GameTime gameTime)
     {
         GraphicsDevice.Clear(Color.CornflowerBlue);
 
-        // _gameFeature.Draw(gameTime, _spriteBatch);
+        _rootFeature.Draw(gameTime, _spriteBatch);
 
         base.Draw(gameTime);
     }

src/Apps/GameDesktop/GameCompositionRoot.cs

@@ -1,6 +1,7 @@
-using LightInject;
+using Features;
+using LightInject;
 using Microsoft.Xna.Framework;
-using Serilog.Core;
+using Serilog;
 
 namespace GameDesktop;
 
@@ -18,11 +19,14 @@ private void RegisterGameServices(IServiceRegistry serviceRegistry)
     {
         serviceRegistry.Register(_ => Contexts.sharedInstance);
 
+        serviceRegistry.RegisterFrom<RootFeatureCompositionRoot>();
+
         serviceRegistry.Register(factory =>
         {
             Game game = new(
-                factory.GetInstance<Logger>(),
-                factory.GetInstance<Contexts>()
+                factory.GetInstance<ILogger>(),
+                factory.GetInstance<Contexts>(),
+                factory.GetInstance<IServiceContainer>()
             ) { IsMouseVisible = IsMouseVisible, Content = { RootDirectory = ContentRootDirectory, } };
 
             // Hack. Resolving cycle dependency issue (fundamental architecture)

src/Apps/GameDesktop/GameDesktop.csproj

@@ -59,6 +59,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Libs\Components\Components.csproj" />
     <ProjectReference Include="..\..\Libs\External\Entitas.Extended\Entitas.Extended.csproj" />
+    <ProjectReference Include="..\..\Libs\Features\Features.csproj" />
     <ProjectReference Include="..\..\Libs\Services\Services.csproj" />
   </ItemGroup>
   <ItemGroup>

src/Apps/GameDesktop/Program.cs

@@ -2,6 +2,7 @@
 using GameDesktop;
 using LightInject;
 using Microsoft.Extensions.Configuration;
+using Serilog;
 using Serilog.Core;
 
 IConfigurationRoot configuration = ConfigurationFactory.Create();
@@ -18,8 +19,9 @@
         };
     using ServiceContainer container = new(containerOptions);
 
-    container.Register(_ => configuration, new PerContainerLifetime());
-    container.Register(_ => logger, new PerContainerLifetime());
+    container.Register<IServiceContainer>(_ => container);
+    container.Register<IConfiguration>(_ => configuration, new PerContainerLifetime());
+    container.Register<ILogger>(_ => logger, new PerContainerLifetime());
 
     container.RegisterFrom<GameCompositionRoot>();
 
@@ -28,5 +30,5 @@
 }
 catch (Exception e)
 {
-    logger.Error(e.ToString());
+    logger.ForContext<Program>().Fatal(e.ToString());
 }

src/Apps/GameDesktop/RootFeatureCompositionRoot.cs

@@ -0,0 +1,84 @@
+using Components.Sprites;
+using Entitas;
+using Features;
+using LightInject;
+using Microsoft.Xna.Framework.Graphics;
+using MonoGame.Aseprite.Sprites;
+using Serilog;
+using Services;
+using Services.Factories;
+using Services.Input;
+using Services.Movement;
+using Stateless;
+using Systems;
+
+namespace GameDesktop;
+
+public class RootFeatureCompositionRoot : ICompositionRoot
+{
+    public void Compose(IServiceRegistry serviceRegistry)
+    {
+        serviceRegistry.Register<IInputScanner, KeyboardScanner>(new PerContainerLifetime());
+
+        serviceRegistry.Register<IMovement, SimpleMovement>(new PerContainerLifetime());
+
+        serviceRegistry.Register(factory =>
+        {
+            Contexts contexts = factory.GetInstance<Contexts>();
+            IAllOfMatcher<GameEntity> inputMovableMatcher = GameMatcher.AllOf(GameMatcher.Transform,
+                GameMatcher.Movable,
+                GameMatcher.Player);
+            IGroup<GameEntity> inputMovableGroup = contexts.game.GetGroup(inputMovableMatcher);
+
+            var inputScanner = factory.GetInstance<IInputScanner>();
+            var logger = factory.GetInstance<ILogger>();
+
+            return new InputSystem(inputScanner, inputMovableGroup, logger);
+        }, new PerContainerLifetime());
+
+        serviceRegistry.Register(factory =>
+        {
+            Contexts contexts = factory.GetInstance<Contexts>();
+            IAllOfMatcher<GameEntity> movableMatcher = GameMatcher.AllOf(GameMatcher.Transform,
+                GameMatcher.Movable);
+            IGroup<GameEntity> movableGroup = contexts.game.GetGroup(movableMatcher);
+
+            var movement = factory.GetInstance<IMovement>();
+            var logger = factory.GetInstance<ILogger>();
+
+            return new MovementSystem(movement, movableGroup, logger);
+        }, new PerContainerLifetime());
+
+        serviceRegistry.Register(factory =>
+        {
+            GraphicsDevice graphicsDevice = factory.GetInstance<SpriteBatch>().GraphicsDevice;
+            SpriteSheet spriteSheet =
+                AnimatedCharactersFactory.LoadSpriteSheet(graphicsDevice, "Content/SpriteSheets/Player.aseprite");
+
+            var idleDirAnimations = AnimatedCharactersFactory.CreateAnimations(spriteSheet, "Idle");
+            var walkingDirAnimations = AnimatedCharactersFactory.CreateAnimations(spriteSheet, "Walking");
+
+            return new AnimatedMovementComponent(
+                new StateMachine<PlayerState, PlayerTrigger>(PlayerState.Idle),
+                idleDirAnimations,
+                walkingDirAnimations);
+        });
+
+        serviceRegistry.Register(factory => new CreatePlayerEntitySystem(factory.GetInstance<Contexts>(),
+            factory.GetInstance<AnimatedMovementComponent>()));
+
+        serviceRegistry.Register(factory =>
+        {
+            Contexts contexts = factory.GetInstance<Contexts>();
+            IAllOfMatcher<GameEntity> animatedMovableMatcher = GameMatcher.AllOf(GameMatcher.Movable,
+                GameMatcher.AnimatedMovement);
+            IGroup<GameEntity> animatedMovableGroup = contexts.game.GetGroup(animatedMovableMatcher);
+
+            var logger = factory.GetInstance<ILogger>();
+
+            return new AnimatedMovementSystem(animatedMovableGroup, logger);
+        });
+
+        serviceRegistry.Register<RootFeature>();
+    }
+}

src/Libs/Features/Features.csproj

@@ -11,4 +11,8 @@
       <ProjectReference Include="..\Systems\Systems.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="LightInject" Version="6.6.4" />
+    </ItemGroup>
+
 </Project>

src/Libs/Features/PlayerMovementFeature.cs

@@ -1,9 +1,4 @@
-using Entitas;
-using Services.Input;
-using Services.Movement;
-using Systems;
-using Systems.Input;
-using Systems.Sprites;
+using Systems;
 
 namespace Features;
 

src/Libs/Features/RootFeature.cs

@@ -0,0 +1,18 @@
+using Systems;
+
+namespace Features;
+
+public sealed class RootFeature : Entitas.Extended.Feature
+{
+    public RootFeature(InputSystem inputSystem,
+        MovementSystem movementSystem,
+        CreatePlayerEntitySystem createPlayerEntitySystem,
+        AnimatedMovementSystem animatedMovementSystem
+    )
+    {
+        Add(inputSystem);
+        Add(movementSystem);
+        Add(createPlayerEntitySystem);
+        Add(animatedMovementSystem);
+    }
+}

src/Libs/Services/Factories/AnimatedCharactersFactory.cs

@@ -6,9 +6,9 @@
 
 namespace Services.Factories;
 
-public class AnimatedCharactersFactory
+public static class AnimatedCharactersFactory
 {
-    private readonly IReadOnlyList<RadDir> _directions =
+    private static readonly IReadOnlyList<RadDir> Directions =
         new[] { RadDir.Right, RadDir.Down, RadDir.Left, RadDir.Up };
 
     public static SpriteSheet LoadSpriteSheet(GraphicsDevice graphicsDevice, string path)
@@ -41,10 +41,10 @@ private static AnimatedSprite CreateAnimation(SpriteSheet spriteSheet, string ac
         return animatedSprite;
     }
 
-    public Dictionary<RadDir, AnimatedSprite> CreateAnimations(SpriteSheet spriteSheet, string action)
+    public static Dictionary<RadDir, AnimatedSprite> CreateAnimations(SpriteSheet spriteSheet, string action)
     {
         Dictionary<RadDir, AnimatedSprite> dictionary =
-            _directions.ToDictionary(dir => dir, dir => CreateAnimation(spriteSheet, action, dir));
+            Directions.ToDictionary(dir => dir, dir => CreateAnimation(spriteSheet, action, dir));
 
         // Temp hack
         dictionary.Add(RadDir.DownLeft, dictionary[RadDir.Left]);

src/Libs/Systems/AnimatedMovementSystem.cs

@@ -3,17 +3,20 @@
 using Entitas.Extended;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Serilog;
 using IExecuteSystem = Entitas.Extended.IExecuteSystem;
 
-namespace Systems.Sprites;
+namespace Systems;
 
 public class AnimatedMovementSystem : IExecuteSystem, IDrawSystem
 {
     private readonly IGroup<GameEntity> _group;
+    private readonly ILogger _logger;
 
-    public AnimatedMovementSystem(IGroup<GameEntity> group)
+    public AnimatedMovementSystem(IGroup<GameEntity> group, ILogger logger)
     {
         _group = group;
+        _logger = logger;
     }
 
     public void Execute(GameTime gameTime)
@@ -22,9 +25,9 @@ public void Execute(GameTime gameTime)
         foreach (GameEntity e in entities)
         {
             Vector2 velocity = e.transform.Velocity;
-            AnimatedMovementComponent movementAnimatedSprites =
-                (AnimatedMovementComponent)e.GetComponents().First(component => component is AnimatedMovementComponent);
+            AnimatedMovementComponent movementAnimatedSprites = e.animatedMovement;
 
+            // TODO: refactor and put it in service system
             if (velocity.Equals(Vector2.Zero))
             {
                 movementAnimatedSprites.StateMachine.Fire(PlayerTrigger.Stop);
@@ -42,12 +45,11 @@ public void Draw(GameTime gameTime, SpriteBatch spriteBatch)
     {
         spriteBatch.Begin(samplerState: SamplerState.PointClamp);
 
-        GameEntity[]? entities = _group.GetEntities();
+        GameEntity[] entities = _group.GetEntities();
         foreach (GameEntity e in entities)
         {
             Vector2 position = e.transform.Position;
-            AnimatedMovementComponent? movementAnimatedSprites =
-                (AnimatedMovementComponent)e.GetComponents().First(component => component is AnimatedMovementComponent);
+            AnimatedMovementComponent movementAnimatedSprites = e.animatedMovement;
 
             movementAnimatedSprites.PlayingAnimation.Draw(spriteBatch, position);
         }