Added UnityItemGenerator.

Author: ChebanovDD

Assets/Plugins/Match3/Match3.Core.dll

@@ -12,19 +12,18 @@
 using Match3.UnityApp;
 using Match3.UnityApp.Interfaces;
 using UnityEngine;
-using IItemGenerator = Common.Interfaces.IItemGenerator;
 
 public class AppContext : MonoBehaviour, IAppContext
 {
     [SerializeField] private GameUiCanvas _gameUiCanvas;
-    [SerializeField] private ItemGenerator _itemGenerator;
     [SerializeField] private CanvasInputSystem _inputSystem;
     [SerializeField] private UnityGameBoardRenderer _gameBoardRenderer;
 
     [Space]
-    [SerializeField] private IconsSetModel[] _iconSets;
+    [SerializeField] private GameObject _itemPrefab;
 
-    private Dictionary<Type, object> _registeredTypes;
+    [Space]
+    [SerializeField] private IconsSetModel[] _iconSets;
 
     public void Construct()
     {
@@ -33,14 +32,15 @@ public void Construct()
         RegisterInstance<IInputSystem>(_inputSystem);
         RegisterInstance<IconsSetModel[]>(_iconSets);
         RegisterInstance<IGameUiCanvas>(_gameUiCanvas);
-        RegisterInstance<IItemGenerator>(_itemGenerator);
-        RegisterInstance<IItemsPool<IUnityItem>>(_itemGenerator);
-        RegisterInstance<IUnityGameBoardRenderer>(_gameBoardRenderer);
-        RegisterInstance<IGameBoardDataProvider<IUnityGridSlot>>(_gameBoardRenderer);
+        RegisterInstance<IUnityGameBoardRenderer, IGameBoardDataProvider<IUnityGridSlot>>(_gameBoardRenderer);
+
         RegisterInstance<UnityGame>(GetUnityGame());
+        RegisterInstance<IUnityItemGenerator, IItemsPool<IUnityItem>>(GetItemGenerator());
         RegisterInstance<IBoardFillStrategy<IUnityGridSlot>[]>(GetBoardFillStrategies());
     }
 
+    private Dictionary<Type, object> _registeredTypes;
+
     public T Resolve<T>()
     {
         return (T) _registeredTypes[typeof(T)];
@@ -51,6 +51,12 @@ private void RegisterInstance<T>(T instance)
         _registeredTypes.Add(typeof(T), instance);
     }
 
+    private void RegisterInstance<T1, T2>(object instance)
+    {
+        _registeredTypes.Add(typeof(T1), instance);
+        _registeredTypes.Add(typeof(T2), instance);
+    }
+
     private UnityGame GetUnityGame()
     {
         var gameConfig = new GameConfig<IUnityGridSlot>
@@ -65,6 +71,11 @@ private UnityGame GetUnityGame()
         return new UnityGame(_inputSystem, _gameBoardRenderer, gameConfig);
     }
 
+    private UnityItemGenerator GetItemGenerator()
+    {
+        return new UnityItemGenerator(_itemPrefab, new GameObject("ItemsPool").transform);
+    }
+
     private IGameBoardSolver<IUnityGridSlot> GetGameBoardSolver()
     {
         return new GameBoardSolver<IUnityGridSlot>(new ISequenceDetector<IUnityGridSlot>[]

Assets/Plugins/Match3/Match3.Infrastructure.dll

@@ -4,7 +4,6 @@
 using Match3.Core.Interfaces;
 using Match3.Infrastructure.Interfaces;
 using UnityEngine;
-using IItemGenerator = Common.Interfaces.IItemGenerator;
 
 namespace Common.GameModes
 {
@@ -14,7 +13,7 @@ public class GameInitMode : IGameMode, IDisposable
         private readonly IAppContext _appContext;
         private readonly IconsSetModel[] _iconSets;
         private readonly IGameUiCanvas _gameUiCanvas;
-        private readonly IItemGenerator _itemGenerator;
+        private readonly IUnityItemGenerator _itemGenerator;
 
         private bool _isInitialized;
 
@@ -24,7 +23,7 @@ public GameInitMode(IAppContext appContext)
             _unityGame = appContext.Resolve<UnityGame>();
             _iconSets = appContext.Resolve<IconsSetModel[]>();
             _gameUiCanvas = appContext.Resolve<IGameUiCanvas>();
-            _itemGenerator = appContext.Resolve<IItemGenerator>();
+            _itemGenerator = appContext.Resolve<IUnityItemGenerator>();
         }
 
         public event EventHandler Finished;

Assets/Scenes/MainScene.unity

@@ -1,11 +1,10 @@
-using System;
+using Match3.Infrastructure.Interfaces;
 using UnityEngine;
 
 namespace Common.Interfaces
 {
-    public interface IItemGenerator : IDisposable
+    public interface IUnityItemGenerator : IItemGenerator
     {
-        void CreateItems(int capacity);
         void SetSprites(Sprite[] sprites);
     }
 }

Assets/Scripts/AppContext.cs

@@ -0,0 +1,58 @@
+using Common.Extensions;
+using Common.Interfaces;
+using Match3.Infrastructure;
+using UnityEngine;
+using Random = System.Random;
+
+namespace Common
+{
+    public class UnityItemGenerator : ItemGenerator<IUnityItem>, IUnityItemGenerator
+    {
+        private readonly Random _random;
+        private readonly Transform _container;
+        private readonly GameObject _itemPrefab;
+
+        private Sprite[] _sprites;
+
+        public UnityItemGenerator(GameObject itemPrefab, Transform container)
+        {
+            _random = new Random();
+            _container = container;
+            _itemPrefab = itemPrefab;
+        }
+
+        public void SetSprites(Sprite[] sprites)
+        {
+            _sprites = sprites;
+        }
+
+        public override void Dispose()
+        {
+            if (ItemsPool != null)
+            {
+                foreach (var item in ItemsPool)
+                {
+                    item.Dispose();
+                }
+            }
+
+            base.Dispose();
+        }
+
+        protected override IUnityItem CreateItem()
+        {
+            var item = _itemPrefab.CreateNew<IUnityItem>(parent: _container);
+            item.Hide();
+
+            return item;
+        }
+
+        protected override IUnityItem ConfigureItem(IUnityItem item)
+        {
+            var index = _random.Next(0, _sprites.Length);
+            item.SetSprite(index, _sprites[index]);
+
+            return item;
+        }
+    }
+}