com.puzzlescapegames.services 1.1.8 → 1.2.0

package/Runtime/Services/AudioService/AudioService.cs

@@ -1,4 +1,3 @@
-using DG.Tweening;
 using UnityEngine;
 using UnityEngine.Audio;
 
@@ -13,9 +12,6 @@ namespace PuzzlescapeGames.Services.AudioService
         private const string SFX = "SFX";
         private const string MUSIC = "Music";
         
-        private AudioSource _musicSource;
-        private Tween _musicFade;
-
         private readonly AudioSourceFactory _audioFactory;
         private readonly AudioMixer _audioMixer;
 
@@ -25,55 +21,6 @@ namespace PuzzlescapeGames.Services.AudioService
             _audioMixer = audioMixer;
         }
 
-        public void PlayMusic( AudioClip clip )
-        {
-            CreateMusic().PlayLoop( clip );
-        }
-
-        public void ChangedMusic( AudioClip clip, float fadeOut = 0.33f, float fadeIn = 0.33f )
-        {
-            _musicFade?.Kill();
-
-            if ( _musicSource == null )
-            {
-                PlayMusic( clip );
-                _musicSource.Source.volume = 0f;
-                _musicFade = _musicSource.DoVolume( 1f, fadeIn );
-            }
-            else
-            {
-                _musicFade = _musicSource
-                    .DoVolume( 0f, fadeOut )
-                    .OnComplete( VolumeCompleted );
-            }
-
-            void VolumeCompleted()
-            {
-                PlayMusic( clip );
-                _musicFade = _musicSource.DoVolume( 1f, fadeIn );
-            }
-        }
-
-        public void MuteMusic( bool trigger )
-        {
-            CreateMusic().Mute( trigger );
-        }
-
-        public void PauseMusic( bool trigger )
-        {
-            CreateMusic().Pause( trigger );
-        }
-
-        public void SetMusicVolume( float value )
-        {
-            CreateMusic().Source.volume = value;
-        }
-
-        public Tween DoMusicVolume( float target, float duration )
-        {
-            return CreateMusic().DoVolume( target, duration );
-        }
-
         public AudioSource PlaySound( AudioClip clip, bool isLoop = false )
         {
             var source = CreateSound();
@@ -116,19 +63,15 @@ namespace PuzzlescapeGames.Services.AudioService
             return source;
         }
 
-        private AudioSource CreateMusic()
+        public MusicSource CreateMusic()
         {
-            if ( _musicSource == null )
+            var source = _audioFactory.Create();
+            if ( _audioMixer != null )
             {
-                _musicSource = _audioFactory.Create();
-
-                if ( _audioMixer != null )
-                {
-                    _musicSource.Source.outputAudioMixerGroup = _audioMixer.FindMatchingGroups( MUSIC )[ 0 ];
-                }
+                source.Source.outputAudioMixerGroup = _audioMixer.FindMatchingGroups( MUSIC )[ 0 ];
             }
 
-            return _musicSource;
+            return new( source );
         }
     }
 }

package/Runtime/Services/AudioService/AudioSource.cs

@@ -59,6 +59,12 @@ namespace PuzzlescapeGames.Services.AudioService
             IsPlaying = false;
             Source.clip = null;
         }
+        
+        public void Rewind()
+        {
+            Source.time = 0;
+            Source.Stop();
+        }
 
         public Tween DoVolume( float target, float duration )
         {
@@ -87,7 +93,7 @@ namespace PuzzlescapeGames.Services.AudioService
             isLoop = trigger;
             Source.loop = trigger;
         }
-
+        
         private void StartPlayDelay( float playTime )
         {
             PlayDelay( playTime ).Forget();

package/Runtime/Services/AudioService/IAudioService.cs

@@ -1,22 +1,15 @@
-using DG.Tweening;
 using UnityEngine;
 
 namespace PuzzlescapeGames.Services.AudioService
 {
     public interface IAudioService
     {
-        void PlayMusic( AudioClip clip );
-        void ChangedMusic( AudioClip clip, float fadeOut = 0.33f, float fadeIn = 0.33f );
         AudioSource PlaySound( AudioClip clip, bool isLoop = false );
-
-        void SetMusicVolume( float value );
-        Tween DoMusicVolume( float target, float duration );
         
         void SetMixerMasterVolume( float value );
         void SetMixerMusicVolume( float value );
         void SetMixerSoundVolume( float value );
 
-        void MuteMusic( bool trigger );
-        void PauseMusic( bool trigger );
+        MusicSource CreateMusic();
     }
 }

package/Runtime/Services/AudioService/MusicSource.cs

@@ -0,0 +1,67 @@
+using DG.Tweening;
+using System;
+using UnityEngine;
+
+namespace PuzzlescapeGames.Services.AudioService
+{
+    public sealed class MusicSource
+    {
+        public AudioSource Audio { get; }
+
+        private Tween _fade;
+        
+        public MusicSource( AudioSource audioSource )
+        {
+            Audio = audioSource ?? throw new ArgumentNullException( nameof(audioSource) );
+        }
+        
+        public void Play( AudioClip clip )
+        {
+            Audio.PlayLoop( clip );
+        }
+
+        public void Changed( AudioClip clip, float fadeOut = 0.33f, float fadeIn = 0.33f )
+        {
+            _fade?.Kill();
+
+            if ( _fade == null )
+            {
+                Play( clip );
+                Audio.Source.volume = 0f;
+                _fade = Audio.DoVolume( 1f, fadeIn );
+            }
+            else
+            {
+                _fade = Audio
+                    .DoVolume( 0f, fadeOut )
+                    .OnComplete( VolumeCompleted );
+            }
+
+            void VolumeCompleted()
+            {
+                Play( clip );
+                _fade = Audio.DoVolume( 1f, fadeIn );
+            }
+        }
+
+        public void SetVolume( float value )
+        {
+            Audio.Source.volume = value;
+        }
+
+        public Tween DoVolume( float target, float duration )
+        {
+            return Audio.DoVolume( target, duration );
+        }
+        
+        public void Pause( bool trigger )
+        {
+            Audio.Pause( trigger );
+        }
+        
+        public void Mute( bool trigger )
+        {
+            Audio.Mute( trigger );
+        }
+    }
+}

package/Runtime/Services/AudioService/MusicSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 11ca154f888449738793f43b33653453
+timeCreated: 1737110170

package/package.json

@@ -1,7 +1,7 @@
 {
     "name" : "com.puzzlescapegames.services",
     "displayName" : "Puzzlescape Games Services",
-    "version" : "1.1.8",
+    "version" : "1.2.0",
     "author" : "Puzzlescape Games",
     "description" : "Common services.",
     "repository": {