Now Audio Playing

Assets/Code/Infrastructure/App/AppStateMachine.cs

@@ -1,3 +1,4 @@
+using Code.Infrastructure.Audio;
 using Code.Infrastructure.Camera;
 using Code.Infrastructure.UI;
 using Reflex.Attributes;
@@ -16,6 +17,8 @@ namespace Code.Infrastructure.App
         [Inject] public SceneLoader.SceneLoader SceneLoader { get; set; }
         [Inject] public CameraStateMachine Camera { get; set; } 
         [Inject] public IUIService UIService { get; set; } 
+        [Inject] public IAudioFactory AudioFactory { get; set; } 
+        [Inject] public IAudioService AudioService { get; set; } 
     }
     
     [Generators.StateMachine(typeof(AppStateMachineContext),typeof(AppStates))]

Assets/Code/Infrastructure/App/PapaInstaller.cs

@@ -1,4 +1,5 @@
 using System;
+using Code.Infrastructure.Audio;
 using Code.Infrastructure.Camera;
 using Code.Infrastructure.Configs;
 using Code.Infrastructure.Input;
@@ -21,7 +22,9 @@ namespace Code.Infrastructure.App
         IUIInitializedHandle,
         IUIPanelLoaded,
         IVolumesInitializedHandle,
-        IVolumeLoaded
+        IVolumeLoaded,
+        IAudioSourcePoolInitializedHandle,
+        IAudioConfigsLoadedHandle
     {
         public void InstallBindings(ContainerBuilder containerBuilder)
         {
@@ -51,6 +54,13 @@ namespace Code.Infrastructure.App
             containerBuilder.RegisterType(typeof(VolumeFactory), new[] { typeof(IVolumeFactory) }, Lifetime.Singleton,
                 Resolution.Eager);
 
+            containerBuilder.RegisterType(typeof(AudioFactory), new[] { typeof(IAudioFactory) }, Lifetime.Singleton,
+                Resolution.Eager);
+            containerBuilder.RegisterType(typeof(AudioSourcePool), new[] { typeof(IAudioSourcePool) }, Lifetime.Singleton,
+                Resolution.Eager);
+            containerBuilder.RegisterType(typeof(AudioService), new[] { typeof(IAudioService) }, Lifetime.Singleton,
+                Resolution.Eager);
+
             // UIFactory
             // Logo
             // Scene configs
@@ -58,7 +68,9 @@ namespace Code.Infrastructure.App
             // Camera
             // Volume Factory
             // Loading volume
-            _initialLoading = new Loading(7, () => EssentialLoadEnded(_thatRightContainer));
+            // Audio Factory
+            // Audio Pool
+            _initialLoading = new Loading(9, () => EssentialLoadEnded(_thatRightContainer));
             _ui2CamLoading = new Loading(2,
                 () =>
                 {
@@ -156,5 +168,15 @@ namespace Code.Infrastructure.App
                     break;
             }
         }
+
+        public void AudioSourcePoolInitialized()
+        {
+            _initialLoading.DoProgress();
+        }
+
+        public void AudioConfigsLoaded()
+        {
+            _initialLoading.DoProgress();
+        }
     }
 }

Assets/Code/Infrastructure/App/States/BootstrapState.cs

@@ -1,16 +1,13 @@
-using Code.Infrastructure.Camera;
+using Code.Infrastructure.Audio;
 using Code.Infrastructure.Generators;
 using Code.Infrastructure.SceneLoader;
 using Code.Infrastructure.UI;
-using Cysharp.Threading.Tasks;
-using UnityEngine;
-using UnityEngine.SceneManagement;
 
 namespace Code.Infrastructure.App.States
 {
     [State(typeof(AppStates),typeof(AppStateMachineContext))]
     [StateRaisingEvent]
-    public partial class BootstrapState : IOnGameplaySceneLoadedHandler, IUIPanelLoaded
+    public partial class BootstrapState : IOnGameplaySceneLoadedHandler, IUIPanelLoaded, IReadyToPlayHandle
     {
         private EventBus.EventBus _eventBus;
         public BootstrapState(AppStateMachineContext context, EventBus.EventBus eventBus) : base(context,eventBus)
@@ -24,11 +21,13 @@ namespace Code.Infrastructure.App.States
             _eventBus.Subscribe(this); 
             
             Context.UIService.TryLoadPanel(UIPanelType.DebugSceneChooser);
+            Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
             // Context.SceneLoader.LoadSceneAsync(SceneId.Gameplay, LoadSceneMode.Single).Forget();
         }
  
         protected override void OnExitState()
         { 
+            Context.AudioFactory.ReleaseAudios(AudioNames.UISounds);
             Context.UIService.TryRemovePanel(UIPanelType.DebugSceneChooser);
             _eventBus.Unsubscribe(this);
         }
@@ -44,5 +43,10 @@ namespace Code.Infrastructure.App.States
             
             Context.UIService.OpenPanel(uiPanelType);
         }
+
+        public void OnReadyToPlay(AudioNames groupName)
+        {
+            Context.AudioService.PlayTest();
+        }
     }
 }

Assets/Code/Infrastructure/Audio/AudioFactory.cs

@@ -1,7 +1,102 @@
-namespace DefaultNamespace
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Code.Infrastructure.Configs;
+using Code.Infrastructure.EventBus;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+
+namespace Code.Infrastructure.Audio
 {
-    public class AudioFactory
+    public interface IAudioFactory
     {
+        UniTaskVoid LoadAudioClips(AudioNames groupName);
+        void ReleaseAudios(AudioNames groupName);
+    }
+
+    public class AudioFactory : IAudioFactory, IDisposable
+    {
+        private string _label;
+        private Dictionary<AudioNames, Dictionary<int, AssetReference>> _audioInfos = new();
+
+        private Dictionary<AudioNames, Dictionary<int, AsyncOperationHandle<AudioClip>>> _clipsHandles = new();
+        private AsyncOperationHandle<IList<AudioInfoConfig>> _configsHandle;
+        private EventBus.EventBus _eventBus;
+
+        public AudioFactory(IConfigLocator configLocator, EventBus.EventBus eventBus)
+        {
+            _eventBus = eventBus;
+            _label = configLocator.TryGetManyConfigAssetReferences<AudioInfoConfig>();
+            
+            for (var i = 0; i < typeof(AudioNames).GetEnumValues().Length; i++)
+            {
+                _audioInfos.Add((AudioNames)i, new Dictionary<int, AssetReference>());
+                _clipsHandles.Add((AudioNames)i, new Dictionary<int, AsyncOperationHandle<AudioClip>>());
+            }
+
+            LoadConfigs().Forget();
+        }
         
+        private async UniTaskVoid LoadConfigs()
+        {
+            _configsHandle = Addressables.LoadAssetsAsync<AudioInfoConfig>(_label);
+
+            await _configsHandle.ToUniTask();
+
+            foreach (AudioInfoConfig config in _configsHandle.Result) 
+                _audioInfos[config.GroupName].Add(config.id, config.fileReference);
+
+            _eventBus.RaiseEvent<IAudioConfigsLoadedHandle>(ui => ui.AudioConfigsLoaded());
+        }
+
+        public async UniTaskVoid LoadAudioClips(AudioNames groupName)
+        {
+            foreach (var audioInfo in _audioInfos[groupName])
+                if (!_clipsHandles[groupName].ContainsKey(audioInfo.Key))
+                    _clipsHandles[groupName].Add(audioInfo.Key, Addressables.LoadAssetAsync<AudioClip>(audioInfo.Value));
+                else
+                    _clipsHandles[groupName][audioInfo.Key] = Addressables.LoadAssetAsync<AudioClip>(audioInfo.Value);
+
+            foreach (var handle in _clipsHandles[groupName]) 
+                await handle.Value.ToUniTask();
+
+            _eventBus.RaiseEvent<IAudioClipsEventHandle>(ui =>
+                ui.AudioClipsLoaded(groupName, _clipsHandles[groupName].ToDictionary(
+                    x => x.Key,
+                    x => x.Value.Result)));
+        }
+
+        public void ReleaseAudios(AudioNames groupName)
+        {
+            _eventBus.RaiseEvent<IAudioClipsEventHandle>(x=> x.AudioClipsUnLoaded(groupName));
+            
+            foreach (var handle in _clipsHandles) 
+                Addressables.Release(handle.Value);
+        }
+        public void Dispose()
+        {
+            foreach (var handles in _clipsHandles)
+            {
+                foreach (var handle in handles.Value)
+                {
+                    handle.Value.Release();
+                }
+            }
+
+            _configsHandle.Release();
+        }
+    }
+
+    internal interface IAudioConfigsLoadedHandle : IGlobalSubscriber
+    {
+        void AudioConfigsLoaded();
+    }
+
+    internal interface IAudioClipsEventHandle : IGlobalSubscriber
+    {
+        void AudioClipsLoaded(AudioNames groupName, Dictionary<int, AudioClip> toDictionary);
+        void AudioClipsUnLoaded(AudioNames groupName);
     }
 }

Assets/Code/Infrastructure/Audio/AudioInfo.cs

@@ -0,0 +1,19 @@
+using Code.Infrastructure.Generators;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace Code.Infrastructure.Audio
+{
+    [Config("Configs/Audio/AudioInfo", true)]
+    public class AudioInfo
+    {
+        [ToConfig] public AudioNames GroupName;
+        [ToConfig] public int id;
+        [ToConfig] public AssetReference fileReference;
+    }
+    [Config("Configs/Audio/AudioSource")]
+    public class AudioSourcePrefab
+    {
+        [ToConfig] public AssetReference prefabReference;
+    }
+}

Assets/Code/Infrastructure/Audio/AudioInfo.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 821f8c193f8846568335e415bf1e7ced
+timeCreated: 1769437653

Assets/Code/Infrastructure/Audio/AudioNames.cs

@@ -0,0 +1,8 @@
+namespace Code.Infrastructure.Audio
+{
+    public enum AudioNames
+    {
+        UISounds,
+        EnemySFX
+    }
+}

Assets/Code/Infrastructure/Audio/AudioNames.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 88f7326e5bec4c97b2a70228dcd9f899
+timeCreated: 1769437552

Assets/Code/Infrastructure/Audio/AudioService.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using Code.Infrastructure.EventBus;
+using UnityEngine;
+
+namespace Code.Infrastructure.Audio
+{
+    public interface IAudioService
+    {
+        AudioClip GetClip(AudioNames groupName, int id);
+        void PlayTest();
+    }
+
+    public class AudioService : IAudioClipsEventHandle, IAudioService
+    {
+        private EventBus.EventBus _eventBus;
+        private IAudioFactory _audioFactory;
+        private IAudioSourcePool _pool;
+        private Dictionary<AudioNames, Dictionary<int, AudioClip>> _audioClips = new();
+
+        public AudioService(EventBus.EventBus eventBus, IAudioFactory audioFactory, IAudioSourcePool pool)
+        {
+            _eventBus = eventBus;
+            _audioFactory = audioFactory;
+            _pool = pool;
+
+            _eventBus.Subscribe(this);
+
+            for (int i = 0; i < typeof(AudioNames).GetEnumValues().Length; i++)
+                _audioClips.Add((AudioNames)i, new Dictionary<int, AudioClip>());
+        }
+
+        public void PlayTest()
+        {
+            _pool.GetSource(AudioSourceType.NoBlend).PlayOneShot(GetClip(AudioNames.UISounds, 0));
+        }
+        public AudioClip GetClip(AudioNames groupName, int id) => _audioClips[groupName][id];
+
+        public void AudioClipsLoaded(AudioNames groupname, Dictionary<int, AudioClip> clips)
+        {
+            _audioClips[groupname] = clips;
+            _eventBus.RaiseEvent<IReadyToPlayHandle>(x=> x.OnReadyToPlay(groupname));
+        }
+
+        public void AudioClipsUnLoaded(AudioNames groupName)
+        {
+            _audioClips[groupName] = null;
+        }
+    }
+
+    public interface IReadyToPlayHandle : IGlobalSubscriber
+    {
+        void OnReadyToPlay(AudioNames groupName);
+    }
+}

Assets/Code/Infrastructure/Audio/AudioService.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e8426c9e925a431aa73069c49d6a71c0
+timeCreated: 1769446252

Assets/Code/Infrastructure/Audio/AudioSourcePool.cs

@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Code.Infrastructure.Configs;
+using Code.Infrastructure.EventBus;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.Audio;
+using UnityEngine.Pool;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using Object = UnityEngine.Object;
+
+namespace Code.Infrastructure.Audio
+{
+    public interface IAudioSourcePool
+    {
+        AudioSource GetSource(AudioSourceType sourceType);
+        void ReleaseSource(AudioSource source);
+    }
+
+    public class AudioSourcePool : IAudioSourcePool, IDisposable
+    {
+        // The pool holds plain GameObjects (you can swap this for any component type).
+        private IObjectPool<AudioSource> _pool; 
+        private GameObject _sourcePrefab;
+
+        private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
+        
+        public AudioSourcePool(Dictionary<AudioSourceType, AudioSourceSettingsConfig> settings) => _settings = settings;
+        
+        private string _configsLabel;
+        private AsyncOperationHandle<IList<AudioSourceSettingsConfig>> _handles;
+        private AssetReference _sourcePrefabConfigReference;
+        private AsyncOperationHandle<AudioSourcePrefabConfig> _prefabConfigHandle;
+        private AsyncOperationHandle<GameObject> _prefabHandle;
+        private EventBus.EventBus _eventBus;
+        
+        public AudioSourcePool(IConfigLocator configLocator, EventBus.EventBus eventBus)
+        {
+            _eventBus = eventBus;
+            
+            _configsLabel = configLocator.TryGetManyConfigAssetReferences<AudioSourceSettingsConfig>();
+            _sourcePrefabConfigReference = configLocator.TryGetConfigAssetReference<AudioSourcePrefabConfig>();
+            
+            LoadConfigs().Forget();
+        }
+
+        private async UniTaskVoid LoadConfigs()
+        {
+            _prefabConfigHandle = Addressables.LoadAssetAsync<AudioSourcePrefabConfig>(_sourcePrefabConfigReference);
+            _handles = Addressables.LoadAssetsAsync<AudioSourceSettingsConfig>(_configsLabel);
+            
+            await UniTask.WhenAll(
+                _prefabConfigHandle.ToUniTask(),
+                _handles.ToUniTask());
+
+            _prefabHandle = Addressables.LoadAssetAsync<GameObject>(_prefabConfigHandle.Result.prefabReference);
+            
+            _settings = _handles.Result.ToDictionary(x => x.sourceType);
+            
+            await _prefabHandle.ToUniTask();
+            
+            _pool = new ObjectPool<AudioSource>(
+                createFunc: CreateItem,
+                // actionOnGet: OnGet,
+                actionOnRelease: OnRelease,
+                actionOnDestroy: OnDestroyItem,
+                collectionCheck: true,   // helps catch double-release mistakes
+                defaultCapacity: 10,
+                maxSize: 20
+            );
+            
+            _eventBus.RaiseEvent<IAudioSourcePoolInitializedHandle>(x => x.AudioSourcePoolInitialized());
+        }
+        // Creates a new pooled GameObject the first time (and whenever the pool needs more).
+        private AudioSource CreateItem()
+        {
+            var audioSource = Object.Instantiate(_prefabHandle.Result).GetComponent<AudioSource>();
+            audioSource.name = "PooledAudioSource";
+            Object.DontDestroyOnLoad(audioSource);
+            return audioSource;
+        }
+
+        // Called when an item is taken from the pool.
+        private void OnGet(AudioSource source)
+        {
+            //source.gameObject.SetActive(true);
+        }
+
+        // Called when an item is returned to the pool.
+        private void OnRelease(AudioSource source)
+        {
+            source.Stop();
+            //source.gameObject.SetActive(false);
+        }
+
+        // Called when the pool decides to destroy an item (e.g., above max size).
+        private void OnDestroyItem(AudioSource source)
+        {
+            Object.Destroy(source.gameObject);
+        }
+        //
+        // public async UniTaskVoid PlayOneShot(AudioClip clip, Vector3 position, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
+        // {
+        //     AudioSource source = _pool.Get();
+        //     source.PlayOneShot(clip);
+        //     source.spatialBlend = _settings[audioSourceType].spatialBlend;
+        //     source.transform.position = position;
+        //     source.outputAudioMixerGroup = audioMixerGroup;
+        //     
+        //     await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
+        //     onComplete?.Invoke();
+        //     _pool.Release(source);
+        // }
+        // public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
+        // {
+        //     AudioSource source = _pool.Get();
+        //     source.PlayOneShot(clip);
+        //     source.spatialBlend = _settings[audioSourceType].spatialBlend;
+        //     source.outputAudioMixerGroup = audioMixerGroup;
+        //     
+        //     await UniTask.WaitUntilValueChanged(source, x => x.isPlaying);
+        //     onComplete?.Invoke();
+        //     _pool.Release(source);
+        // } 
+        // public async UniTaskVoid PlayOneShot(AudioSource audioSource, AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
+        // { 
+        //     audioSource.PlayOneShot(clip);
+        //     audioSource.spatialBlend = _settings[audioSourceType].spatialBlend;
+        //     audioSource.outputAudioMixerGroup = audioMixerGroup;
+        //     
+        //     // TODO Потом сделать. Можно с cancellation, но сейчас лень. Ну правда
+        //     await UniTask.WaitUntilValueChanged(audioSource, x => x.isPlaying);
+        //     
+        //     if (!audioSource) return;
+        //     
+        //     _pool.Release(audioSource);
+        //     onComplete?.Invoke();
+        // } 
+        // public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, CancellationTokenSource cancellationToken, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
+        // { 
+        //     AudioSource source = _pool.Get();
+        //     source.PlayOneShot(clip);
+        //     source.spatialBlend = _settings[audioSourceType].spatialBlend;
+        //     source.outputAudioMixerGroup = audioMixerGroup;
+        //      
+        //     var (isCanceled, _) = await UniTask.WaitUntilValueChanged(source, x => x.isPlaying, cancellationToken: cancellationToken.Token).SuppressCancellationThrow();
+        //     
+        //     _pool.Release(source);
+        //     
+        //     if(!isCanceled) onComplete?.Invoke();
+        //     else cancellationToken.Dispose();
+        // } 
+        public AudioSource GetSource(AudioSourceType sourceType)
+        {
+            var source = _pool.Get();
+            
+            source.spatialBlend = _settings[sourceType].spatialBlend;
+            
+            return source;
+        }
+
+        public void ReleaseSource(AudioSource source) => _pool.Release(source);
+        
+        public void Dispose()
+        {
+            Addressables.Release(_handles);
+            Addressables.Release(_prefabConfigHandle);
+            Addressables.Release(_sourcePrefab);
+        }
+    }
+
+    public interface IAudioSourcePoolInitializedHandle : IGlobalSubscriber
+    {
+        void AudioSourcePoolInitialized();
+    }
+}

Assets/Code/Infrastructure/Audio/AudioSourcePool.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 246ae406fabc4ca791673d3f38cfe1c5
+timeCreated: 1769448041

Assets/Code/Infrastructure/Audio/AudioSourceSettings.cs

@@ -0,0 +1,13 @@
+using Code.Infrastructure.Generators;
+
+namespace Code.Infrastructure.Audio
+{
+    [Config("Configs/Audio/AudioSourceSettings", true)]
+    public class AudioSourceSettings
+    {
+        // Дополнять по мере необходимости
+        [ToConfig] public float spatialBlend;
+        
+        [ToConfig] public AudioSourceType sourceType;
+    }
+}

Assets/Code/Infrastructure/Audio/AudioSourceSettings.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 76d9dd39cbe641dab0cfa8ed1f2007f4
+timeCreated: 1769448198

Assets/Code/Infrastructure/Audio/AudioSourceType.cs

@@ -0,0 +1,8 @@
+namespace Code.Infrastructure.Audio
+{
+    public enum AudioSourceType
+    {
+        Full3D,
+        NoBlend
+    }
+}

Assets/Code/Infrastructure/Audio/AudioSourceType.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 85f9cb99599f4399a1fd66496b5184d0
+timeCreated: 1769448254

Assets/Code/Infrastructure/UI/UIPanel.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel;
 using UnityEngine;
-using UnityEngine.Serialization;
 
 namespace Code.Infrastructure.UI
 {