bye bye asynccontentmanager

Assets/Scripts/OpenTS2/Audio/TSAudioSource.cs

@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using UnityEngine;
 
 /// <summary>
@@ -34,7 +35,7 @@ public AudioAsset Audio
     private float _timeAudioSourcePlaying = 0f;
     private bool _audioClipPlaying = false;
     private bool _paused = false;
-    private AsyncContentManager _asyncContentLoader;
+    private ContentManager _contentManager;
 
     public void Pause()
     {
@@ -61,18 +62,13 @@ public void Play()
     public void PlayAsync(ResourceKey audioResourceKey)
     {
         CleanUp();
-        StartCoroutine(PlayAsyncInternal(audioResourceKey));
-    }
-
-    private IEnumerator PlayAsyncInternal(ResourceKey key)
-    {
-        var audioRequest = _asyncContentLoader.RequestAsset(key);
-        while (!audioRequest.Finished)
-            yield return null;
-        if (audioRequest.Result == AsyncContentManager.Results.Success)
-            PlayInternal(audioRequest.Asset as AudioAsset);
-        else
-            Stop();
+        Task.Run(() =>
+        {
+            _audio = _contentManager.GetAsset<AudioAsset>(audioResourceKey);
+        }).ContinueWith(task =>
+        {
+            PlayInternal(_audio);
+        }, TaskScheduler.FromCurrentSynchronizationContext());
     }
 
     private void PlayInternal(AudioAsset asset)
@@ -93,7 +89,7 @@ public void Stop()
 
     private void Awake()
     {
-        _asyncContentLoader = AsyncContentManager.Instance;
+        _contentManager = ContentManager.Instance;
         _audioSource = GetComponent<AudioSource>();
         if (_audioSource == null)
         {

Assets/Scripts/OpenTS2/Engine/Core.cs

@@ -44,7 +44,6 @@ public static void InitializeCore()
             var nhoodManager = new NeighborhoodManager();
             var casController = new CASManager();
             var lotManger = new LotManager();
-            var asyncContentLoader = new AsyncContentManager();
 
             TerrainManager.Initialize();
             MaterialManager.Initialize();