com.tunnelsnakes.audiosystem 2.0.0 → 2.0.2

packages/LICENSE.md

@@ -1,5 +1,5 @@
-# License
-
-Copyright (C) 2021
-
-AudioSystem can not be copied and/or distributed without the express permission of the author(s).
+# License
+
+Copyright (C) 2021
+
+AudioSystem can not be copied and/or distributed without the express permission of the author(s).

packages/LICENSE.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 928812144b6c1a348af23ae2c10ac0a6
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 928812144b6c1a348af23ae2c10ac0a6
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/README.md

@@ -1,3 +1,3 @@
-# AudioSystem
-
-Audio and vibrations
+# AudioSystem
+
+Audio and vibrations

packages/README.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: cbb2a874c5783c348948a8b027238e13
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: cbb2a874c5783c348948a8b027238e13
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/AssemblyInfo.cs

@@ -1,5 +1,5 @@
-
-using System.Reflection;
-
-[assembly: AssemblyTitle("com.tunnelsnakes.audiosystem.Runtime")]
-[assembly: AssemblyProduct("com.tunnelsnakes.audiosystem")]
+
+using System.Reflection;
+
+[assembly: AssemblyTitle("com.tunnelsnakes.audiosystem.Runtime")]
+[assembly: AssemblyProduct("com.tunnelsnakes.audiosystem")]

packages/Runtime/AssemblyInfo.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: ec4968187fae32243aa89626b8cc6822
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ec4968187fae32243aa89626b8cc6822
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Audio/AudioManager.cs

@@ -1,57 +1,57 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public static class AudioManager {
-    private static Transform _container = default;
-    private static Queue<AudioPresenter> _freePresenters = new Queue<AudioPresenter>();
-
-    public static AudioPresenter GetFreeAudioPresenter() {
-        AudioPresenter presenter;
-        do {
-            if (_freePresenters.Count != 0) {
-                presenter = _freePresenters.Dequeue();
-            } else {
-                presenter = GetContainer().gameObject.AddComponent<AudioPresenter>();
-            }
-        } while (presenter == null);
-        return presenter;
-    }
-
-    public static void SaveAudioPresenter(AudioPresenter presenter) {
-        presenter.transform.parent = GetContainer();
-        _freePresenters.Enqueue(presenter);
-    }
-
-    public static void Dispose() {
-        while (_freePresenters.Count != 0) {
-            AudioPresenter presenter = _freePresenters.Dequeue();
-            if (presenter != null) {
-                MonoBehaviour.Destroy(presenter);
-            }
-        }
-        MonoBehaviour.Destroy(_container.gameObject);
-    }
-
-    private static Transform GetContainer() {
-        if (_container == null) {
-            _container = CreateContainer();
-        }
-        return _container;
-    }
-
-    private static Transform CreateContainer() {
-        GameObject containerObject = new GameObject("AudioContainer");
-#if UNITY_EDITOR
-        if (!Application.isPlaying) {
-            containerObject.hideFlags = HideFlags.HideAndDontSave;
-        } else {
-#endif
-            MonoBehaviour.DontDestroyOnLoad(containerObject);
-#if UNITY_EDITOR
-        }
-#endif
-        return containerObject.transform;
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public static class AudioManager {
+    private static Transform _container = default;
+    private static Queue<AudioPresenter> _freePresenters = new Queue<AudioPresenter>();
+
+    public static AudioPresenter GetFreeAudioPresenter() {
+        AudioPresenter presenter;
+        do {
+            if (_freePresenters.Count != 0) {
+                presenter = _freePresenters.Dequeue();
+            } else {
+                presenter = GetContainer().gameObject.AddComponent<AudioPresenter>();
+            }
+        } while (presenter == null);
+        return presenter;
+    }
+
+    public static void SaveAudioPresenter(AudioPresenter presenter) {
+        presenter.transform.parent = GetContainer();
+        _freePresenters.Enqueue(presenter);
+    }
+
+    public static void Dispose() {
+        while (_freePresenters.Count != 0) {
+            AudioPresenter presenter = _freePresenters.Dequeue();
+            if (presenter != null) {
+                MonoBehaviour.Destroy(presenter);
+            }
+        }
+        MonoBehaviour.Destroy(_container.gameObject);
+    }
+
+    private static Transform GetContainer() {
+        if (_container == null) {
+            _container = CreateContainer();
+        }
+        return _container;
+    }
+
+    private static Transform CreateContainer() {
+        GameObject containerObject = new GameObject("AudioContainer");
+#if UNITY_EDITOR
+        if (!Application.isPlaying) {
+            containerObject.hideFlags = HideFlags.HideAndDontSave;
+        } else {
+#endif
+            MonoBehaviour.DontDestroyOnLoad(containerObject);
+#if UNITY_EDITOR
+        }
+#endif
+        return containerObject.transform;
+    }
+}

packages/Runtime/Scripts/Audio/AudioManager.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 9a5034b0af552e9469204df870f16270
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 9a5034b0af552e9469204df870f16270
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Audio/AudioPresenter.cs

@@ -1,103 +1,124 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[ExecuteAlways]
-public class AudioPresenter : MonoBehaviour {
-    private AudioSource _audioSource;
-    private Vibration _vibration;
-    private Observable<bool> _isAudioEnable;
-    private Observable<float> _audioGlobalVolume;
-
-    public bool IsPlaying => _audioSource.isPlaying;
-    public float Volume { get; set; }
-    public float Pitch {
-        get { return _audioSource.pitch; }
-        set { _audioSource.pitch = value; }
-    }
-    public bool Loop {
-        get { return _audioSource.loop; }
-        set { _audioSource.loop = value; }
-    }
-
-    [ExecuteAlways]
-    private void Awake() {
-        if (_audioSource == null) {
-            _audioSource = gameObject.AddComponent<AudioSource>();
-            _audioSource.playOnAwake = false;
-        }
-    }
-
-    public void SetClip(AudioClip clip) {
-        _audioSource.clip = clip;
-    }
-
-    public void SetVibration(Vibration vibration) {
-        _vibration = vibration;
-
-    }
-
-    public void SetAudioEnableVariable(Observable<bool> state) {
-        if (_isAudioEnable != null) {
-            _isAudioEnable.RemoveSubscriber(UpdateState);
-        }
-        _isAudioEnable = state;
-        _isAudioEnable.AddSubscriberAndInvoke(UpdateState);
-    }
-
-    public void SetGlobalAudioVolumeVariable(Observable<float> volume) {
-        if (_audioGlobalVolume != null) {
-            _audioGlobalVolume.RemoveSubscriber(UpdateVolume);
-        }
-        _audioGlobalVolume = volume;
-        _audioGlobalVolume.AddSubscriberAndInvoke(UpdateVolume);
-    }
-
-    public void Play(float delay) {
-        StartCoroutine(DelayedAction(Play, delay));
-    }
-
-    public void Stop(float delay) {
-        StartCoroutine(DelayedAction(Stop, delay));
-    }
-
-    public void Play() {
-        _audioSource.Play();
-        if (_vibration != null) _vibration.Vibrate();
-        StartCoroutine(WaitForEnd());
-    }
-
-    public void Stop() {
-        _audioSource.Stop();
-        StopAllCoroutines();
-        AudioManager.SaveAudioPresenter(this);
-    }
-
-    private IEnumerator DelayedAction(Action action, float time) {
-        yield return new WaitForSeconds(time);
-        action?.Invoke();
-    }
-
-    private IEnumerator WaitForEnd() {
-        var time = new WaitForFixedUpdate();
-        while (_audioSource.isPlaying) {
-            yield return time;
-        }
-        Stop();
-    }
-
-    private void UpdateState(Observable<bool> observable, bool oldState, bool newState) {
-        UpdateVolume();
-    }
-
-    private void UpdateVolume(Observable<float> observable, float oldVolume, float newVolume) {
-        _audioGlobalVolume = newVolume;
-        UpdateVolume();
-    }
-
-    private void UpdateVolume() {
-        float volume = Volume * _audioGlobalVolume.Value * ((_isAudioEnable != null && _isAudioEnable.Value) ? 1f : 0f);
-        _audioSource.volume = Mathf.Clamp01(volume);
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[ExecuteAlways]
+public class AudioPresenter : MonoBehaviour {
+    private AudioSource _audioSource;
+    private Vibration _vibration;
+    private Observable<bool> _isAudioEnable;
+    private Observable<float> _audioGlobalVolume;
+
+    public AudioSource AudioSource => _audioSource;
+    public bool IsPlaying => _audioSource.isPlaying;
+    public float Volume { get; set; }
+    public float Pitch {
+        get { return _audioSource.pitch; }
+        set { _audioSource.pitch = value; }
+    }
+    public bool Loop {
+        get { return _audioSource.loop; }
+        set { _audioSource.loop = value; }
+    }
+
+    [ExecuteAlways]
+    private void Awake() {
+        if (_audioSource == null) {
+            _audioSource = gameObject.AddComponent<AudioSource>();
+            _audioSource.playOnAwake = false;
+        }
+    }
+
+    public void SetClip(AudioClip clip) {
+        _audioSource.clip = clip;
+    }
+
+    public void SetVibration(Vibration vibration) {
+        _vibration = vibration;
+
+    }
+
+    public void SetAudioEnableVariable(Observable<bool> state) {
+        if (_isAudioEnable != null) {
+            _isAudioEnable.RemoveSubscriber(UpdateState);
+        }
+        _isAudioEnable = state;
+        _isAudioEnable.AddSubscriberAndInvoke(UpdateState);
+    }
+
+    public void SetGlobalAudioVolumeVariable(Observable<float> volume) {
+        if (_audioGlobalVolume != null) {
+            _audioGlobalVolume.RemoveSubscriber(UpdateVolume);
+        }
+        _audioGlobalVolume = volume;
+        _audioGlobalVolume.AddSubscriberAndInvoke(UpdateVolume);
+    }
+
+    #region Actions
+
+    public void Play(float delay) {
+        StartCoroutine(DelayedAction(Play, delay));
+    }
+
+    public void Stop(float delay) {
+        StartCoroutine(DelayedAction(Stop, delay));
+    }
+
+    public void Pause(float delay) {
+        StartCoroutine(DelayedAction(Pause, delay));
+    }
+
+    public void UnPause(float delay) {
+        StartCoroutine(DelayedAction(UnPause, delay));
+    }
+
+    public void Play() {
+        _audioSource.Play();
+        if (_vibration != null) _vibration.Vibrate();
+        StartCoroutine(WaitForEnd());
+    }
+
+    public void Stop() {
+        _audioSource.Stop();
+        StopAllCoroutines();
+        AudioManager.SaveAudioPresenter(this);
+    }
+
+    public void Pause() {
+        _audioSource.Pause();
+    }
+
+    public void UnPause() {
+        _audioSource.UnPause();
+    }
+
+    private IEnumerator DelayedAction(Action action, float time) {
+        yield return new WaitForSeconds(time);
+        action?.Invoke();
+    }
+
+    #endregion
+
+    private IEnumerator WaitForEnd() {
+        var time = new WaitForFixedUpdate();
+        while (_audioSource.isPlaying) {
+            yield return time;
+        }
+        Stop();
+    }
+
+    private void UpdateState(Observable<bool> observable, bool oldState, bool newState) {
+        UpdateVolume();
+    }
+
+    private void UpdateVolume(Observable<float> observable, float oldVolume, float newVolume) {
+        _audioGlobalVolume = newVolume;
+        UpdateVolume();
+    }
+
+    private void UpdateVolume() {
+        float volume = Volume * _audioGlobalVolume.Value * ((_isAudioEnable != null && _isAudioEnable.Value) ? 1f : 0f);
+        _audioSource.volume = Mathf.Clamp01(volume);
+    }
+}

packages/Runtime/Scripts/Audio/AudioPresenter.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 94b4a8b8e069b55498952baedd9be50f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 100
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 94b4a8b8e069b55498952baedd9be50f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 100
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Audio/Sound.cs

@@ -1,53 +1,54 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-[CreateAssetMenu(fileName = nameof(Sound), menuName = MENU_FOLDER + nameof(Sound))]
-public class Sound : ScriptableObject {
-    protected const string MENU_FOLDER = "Audio/";
-
-    [SerializeField] private AudioClip _audioClip = default;
-    [SerializeField] private Vibration _vibration = default;
-    [Range(0f, 2f)]
-    [SerializeField] private float _volume = 1f;
-    [Range(0f, 2f)]
-    [SerializeField] private float _pitch = 1f;
-    [Range(0f, 1f)]
-    [SerializeField] private float _pitchRange = 0f;
-    [SerializeField] private bool _loop = false;
-
-    protected virtual Observable<bool> IsAudioEnabled => GameData.Instance.AudioSettings.SoundsEnabled;
-    protected virtual Observable<float> GlobalVolume => GameData.Instance.AudioSettings.SoundsVolume;
-
-    public virtual AudioPresenter Play() {
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+[CreateAssetMenu(fileName = nameof(Sound), menuName = MENU_FOLDER + nameof(Sound))]
+public class Sound : ScriptableObject {
+    protected const string MENU_FOLDER = "Audio/";
+
+    [SerializeField] private AudioClip _audioClip = default;
+    [SerializeField] private Vibration _vibration = default;
+    [Range(0f, 2f)]
+    [SerializeField] private float _volume = 1f;
+    [Range(0f, 2f)]
+    [SerializeField] private float _pitch = 1f;
+    [Range(0f, 1f)]
+    [SerializeField] private float _pitchRange = 0f;
+    [SerializeField] private bool _loop = false;
+
+    protected virtual Observable<bool> IsAudioEnabled => GameData.Instance.AudioSettings.SoundsEnabled;
+    protected virtual Observable<float> GlobalVolume => GameData.Instance.AudioSettings.SoundsVolume;
+
+    public virtual AudioPresenter Play() {
+        AudioPresenter presenter = GetPresenter();
+        presenter.Play();
+
+        return presenter;
+    }
+
+    /// <summary>
+    /// Mostly for Unity events
+    /// </summary>
+    ///
+#if UNITY_EDITOR && ODIN_INSPECTOR
+    [Sirenix.OdinInspector.Button]
+#endif
+    public void SimplePlay() {
         AudioPresenter presenter = GetPresenter();
-        presenter.Play();
-
-        return presenter;
-    }
-
-    /// <summary>
-    /// Mostly for Unity events
-    /// </summary>
-    ///
-#if UNITY_EDITOR && ODIN_INSPECTOR
-    [Sirenix.OdinInspector.Button]
-#endif
-    public void SimplePlay() {
-        Play();
-    }
-
-    protected AudioPresenter GetPresenter() {
-        AudioPresenter presenter = AudioManager.GetFreeAudioPresenter();
-        presenter.SetClip(_audioClip);
-        presenter.SetVibration(_vibration);
-        presenter.Volume =  _volume;
-        presenter.Pitch = _pitch + _pitchRange * Random.Range(-1f, 1f);
-        presenter.Loop = _loop;
-
-        presenter.SetGlobalAudioVolumeVariable(GlobalVolume);
-        presenter.SetAudioEnableVariable(IsAudioEnabled);
-        return presenter;
-    }
-}
+        presenter.AudioSource.PlayOneShot(_audioClip);
+    }
+
+    protected AudioPresenter GetPresenter() {
+        AudioPresenter presenter = AudioManager.GetFreeAudioPresenter();
+        presenter.SetClip(_audioClip);
+        presenter.SetVibration(_vibration);
+        presenter.Volume =  _volume;
+        presenter.Pitch = _pitch + _pitchRange * Random.Range(-1f, 1f);
+        presenter.Loop = _loop;
+
+        presenter.SetGlobalAudioVolumeVariable(GlobalVolume);
+        presenter.SetAudioEnableVariable(IsAudioEnabled);
+        return presenter;
+    }
+}

packages/Runtime/Scripts/Audio/Sound.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 0107a3eef9bc2b24b861bfa042a800d2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0107a3eef9bc2b24b861bfa042a800d2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Audio/StackableSound.cs

@@ -1,60 +1,60 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[CreateAssetMenu(fileName = nameof(StackableSound), menuName = MENU_FOLDER + nameof(StackableSound))]
-public class StackableSound : Sound {
-    [Space]
-    [SerializeField] private int _maxStackSize = 4;
-    [SerializeField] private float _timeStep = 0.25f;
-    [Space]
-    [SerializeField] private bool _stackablePitch = false;
-    [SerializeField] private float _pitchStep = 0.1f;
-    [SerializeField] private float _pitchStackInterval = 1f;
-
-    [NonSerialized]
-    private float _lastSoundTime;
-    [NonSerialized]
-    private float _currentExtraPitch;
-
-    public override AudioPresenter Play() {
-        AudioPresenter presenter = null;
-        int stackSize = GetCurrentStackSize();
-        if (stackSize < _maxStackSize) {
-            presenter = GetPresenter();
-            if (_stackablePitch) {
-                if (Time.time - _lastSoundTime <= _pitchStackInterval) {
-                    _currentExtraPitch += _pitchStep;
-                    presenter.Pitch += _currentExtraPitch;
-                } else {
-                    _currentExtraPitch = 0f;
-                }
-            }
-
-            if (stackSize < 0) {
-                _lastSoundTime = Time.time;
-                presenter.Play();
-            } else {
-                _lastSoundTime += _timeStep;
-                presenter.Play(_lastSoundTime - Time.time);
-            }
-        }
-
-        return presenter;
-    }
-
-#if UNITY_EDITOR && ODIN_INSPECTOR
-    [Sirenix.OdinInspector.Button]
-#endif
-    public void Reset() {
-        _lastSoundTime = 0f;
-        _currentExtraPitch = 0f;
-    }
-
-    private int GetCurrentStackSize() {
-        float timeDelta = _lastSoundTime - Time.time;
-        int size = (timeDelta < 0f ? -1 : 1) * Mathf.FloorToInt(Mathf.Abs(timeDelta / _timeStep));
-        return size;
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = nameof(StackableSound), menuName = MENU_FOLDER + nameof(StackableSound))]
+public class StackableSound : Sound {
+    [Space]
+    [SerializeField] private int _maxStackSize = 4;
+    [SerializeField] private float _timeStep = 0.25f;
+    [Space]
+    [SerializeField] private bool _stackablePitch = false;
+    [SerializeField] private float _pitchStep = 0.1f;
+    [SerializeField] private float _pitchStackInterval = 1f;
+
+    [NonSerialized]
+    private float _lastSoundTime;
+    [NonSerialized]
+    private float _currentExtraPitch;
+
+    public override AudioPresenter Play() {
+        AudioPresenter presenter = null;
+        int stackSize = GetCurrentStackSize();
+        if (stackSize < _maxStackSize) {
+            presenter = GetPresenter();
+            if (_stackablePitch) {
+                if (Time.time - _lastSoundTime <= _pitchStackInterval) {
+                    _currentExtraPitch += _pitchStep;
+                    presenter.Pitch += _currentExtraPitch;
+                } else {
+                    _currentExtraPitch = 0f;
+                }
+            }
+
+            if (stackSize < 0) {
+                _lastSoundTime = Time.time;
+                presenter.Play();
+            } else {
+                _lastSoundTime += _timeStep;
+                presenter.Play(_lastSoundTime - Time.time);
+            }
+        }
+
+        return presenter;
+    }
+
+#if UNITY_EDITOR && ODIN_INSPECTOR
+    [Sirenix.OdinInspector.Button]
+#endif
+    public void Reset() {
+        _lastSoundTime = 0f;
+        _currentExtraPitch = 0f;
+    }
+
+    private int GetCurrentStackSize() {
+        float timeDelta = _lastSoundTime - Time.time;
+        int size = (timeDelta < 0f ? -1 : 1) * Mathf.FloorToInt(Mathf.Abs(timeDelta / _timeStep));
+        return size;
+    }
+}

packages/Runtime/Scripts/Audio/StackableSound.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: e778783923c023244a1e2c8623fc6dd8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e778783923c023244a1e2c8623fc6dd8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Audio.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 5e1e3d5c1e292644e8480c6cde7e117d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5e1e3d5c1e292644e8480c6cde7e117d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Vibrations/{HapticVibration.cs → HapticPresetVibration.cs}

@@ -1,34 +1,34 @@
-//#undef MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
-//#define MOREMOUNTAINS_NICEVIBRATIONS
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
-using Lofelt.NiceVibrations;
-#elif MOREMOUNTAINS_NICEVIBRATIONS
-using MoreMountains.NiceVibrations;
-#endif
-
-[CreateAssetMenu(fileName = nameof(HapticPresetVibration), menuName = MENU_FOLDER + nameof(HapticPresetVibration))]
-public class HapticPresetVibration : Vibration {
-
-#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
-    [SerializeField] private HapticPatterns.PresetType _type = HapticPatterns.PresetType.None;
-#elif MOREMOUNTAINS_NICEVIBRATIONS
-    [SerializeField] private HapticTypes _type = HapticTypes.None;
-#endif
-
-    public override void Vibrate() {
-        if (CanVibrate) {
-#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
-            HapticPatterns.PlayPreset(_type);
-#elif MOREMOUNTAINS_NICEVIBRATIONS
-            MMVibrationManager.Haptic(_type, false, true, null);
-#else
-#if UNITY_EDITOR
-            Debug.LogWarning("Vibrations are disabled!");
-#endif
-#endif
-        }
-    }
-}
+//#undef MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
+//#define MOREMOUNTAINS_NICEVIBRATIONS
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
+using Lofelt.NiceVibrations;
+#elif MOREMOUNTAINS_NICEVIBRATIONS
+using MoreMountains.NiceVibrations;
+#endif
+
+[CreateAssetMenu(fileName = nameof(HapticPresetVibration), menuName = MENU_FOLDER + nameof(HapticPresetVibration))]
+public class HapticPresetVibration : Vibration {
+
+#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
+    [SerializeField] private HapticPatterns.PresetType _type = HapticPatterns.PresetType.None;
+#elif MOREMOUNTAINS_NICEVIBRATIONS
+    [SerializeField] private HapticTypes _type = HapticTypes.None;
+#endif
+
+    public override void Vibrate() {
+        if (CanVibrate) {
+#if MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED
+            HapticPatterns.PlayPreset(_type);
+#elif MOREMOUNTAINS_NICEVIBRATIONS
+            MMVibrationManager.Haptic(_type, false, true, null);
+#else
+#if UNITY_EDITOR
+            Debug.LogWarning("Vibrations are disabled!");
+#endif
+#endif
+        }
+    }
+}

packages/Runtime/Scripts/Vibrations/{HapticVibration.cs.meta → HapticPresetVibration.cs.meta}

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 5019a6c27cca1eb48ba8811fd611d43b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5019a6c27cca1eb48ba8811fd611d43b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Vibrations/Vibration.cs

@@ -1,10 +1,10 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public abstract class Vibration : ScriptableObject {
-    protected const string MENU_FOLDER = "Vibration/";
-    protected bool CanVibrate => GameData.Instance.AudioSettings.VibrationsEnabled.Value;
-
-    public abstract void Vibrate();
-}
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class Vibration : ScriptableObject {
+    protected const string MENU_FOLDER = "Vibration/";
+    protected bool CanVibrate => GameData.Instance.AudioSettings.VibrationsEnabled.Value;
+
+    public abstract void Vibrate();
+}

packages/Runtime/Scripts/Vibrations/Vibration.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 5cc157c4ad634fa40bae7d723887849e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5cc157c4ad634fa40bae7d723887849e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts/Vibrations.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 711cecfdad3dfce49b12184eb22d1c28
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 711cecfdad3dfce49b12184eb22d1c28
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/Scripts.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: e20be6ade4aa3dc4295905bc49f33094
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e20be6ade4aa3dc4295905bc49f33094
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime/com.tunnelsnakes.audiosystem.Runtime.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: c1eb42fcf27eaf348a30944660a3321f
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: c1eb42fcf27eaf348a30944660a3321f
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/Runtime.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 7d1306cddc1f2614598fa3dac7046e41
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7d1306cddc1f2614598fa3dac7046e41
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

packages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.tunnelsnakes.audiosystem",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "displayName": "TS AudioSystem",
   "description": "Audio and vibrations",
   "license": "proprietary",

packages/package.json.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: f95dc0157bd93de44ad78bea29f088d0
-PackageManifestImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: f95dc0157bd93de44ad78bea29f088d0
+PackageManifestImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: