Code cleanup

Author: svermeulen

.gitignore

@@ -0,0 +1 @@
+.vs

UnityProject/Assets/AsyncUtil/Tests/AsyncTests.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.1273174, g: 0.13414761, b: 0.12107885, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -108,54 +108,6 @@ NavMeshSettings:
     tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &569663778
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 569663780}
-  - component: {fileID: 569663779}
-  m_Layer: 0
-  m_Name: SceneContext
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &569663779
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 569663778}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 89715ad69b973a14899afa2c6730b30b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _installers: []
-  _installerPrefabs: []
-  _scriptableObjectInstallers: []
-  _autoRun: 1
-  _parentNewObjectsUnderRoot: 0
-  _contractNames: []
-  _parentContractName: 
-  _parentContractNames: []
---- !u!4 &569663780
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 569663778}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &872110973
 GameObject:
   m_ObjectHideFlags: 0

UnityProject/Assets/AsyncUtil/Tests/AsyncUtilTests.cs

@@ -76,12 +76,7 @@ public void OnGUI()
             RunIEnumeratorTryCatchExceptionAsync().WrapErrors();
         }
 
-        if (_buttonHandler.Display("Load assetbundle with StartCoroutine"))
-        {
-            StartCoroutine(RunAsyncOperation2());
-        }
-
-        if (_buttonHandler.Display("Load assetbundle with async await"))
+        if (_buttonHandler.Display("Load assetbundle"))
         {
             RunAsyncOperationAsync().WrapErrors();
         }
@@ -106,11 +101,6 @@ public void OnGUI()
             RunWwwAsync().WrapErrors();
         }
 
-        if (_buttonHandler.Display("Test www download coroutines"))
-        {
-            StartCoroutine(RunWww());
-        }
-
         if (_buttonHandler.Display("Test Call Async from coroutine"))
         {
             StartCoroutine(RunAsyncFromCoroutineTest());
@@ -131,13 +121,6 @@ async Task RunAsyncFromCoroutineTest2()
         await new WaitForSeconds(1.0f);
     }
 
-    IEnumerator RunWww()
-    {
-        var www = new WWW(AssetBundleSampleUrl);
-        yield return www;
-        Debug.Log("Downloaded " + (www.bytes.Length / 1024) + " kb");
-    }
-
     async Task RunWwwAsync()
     {
         var bytes = (await new WWW(AssetBundleSampleUrl)).bytes;
@@ -159,21 +142,20 @@ async Task RunUnhandledExceptionTestAsync()
 
     async Task RunTryCatchExceptionTestAsync()
     {
-        var test = NestedRunAsync();
         try
         {
-            await test;
+            await NestedRunAsync();
         }
         catch (Exception e)
         {
-            Debug.Log("Caught expected exception: " + e.Message);
+            Debug.Log("Caught exception! " + e.Message);
         }
     }
 
     async Task NestedRunAsync()
     {
         await new WaitForSeconds(1);
-        throw new Exception();
+        throw new Exception("foo");
     }
 
     async Task WaitThenThrowException()
@@ -182,54 +164,23 @@ async Task WaitThenThrowException()
         throw new Exception("asdf");
     }
 
-    IEnumerator RunAsyncOperation2()
-    {
-        yield return InstantiateAssetBundle(
-            AssetBundleSampleUrl, AssetBundleSampleAssetName);
-    }
-
-    IEnumerator InstantiateAssetBundle(string url, string assetName)
-    {
-        var request = UnityWebRequest.Get(url);
-        yield return request.Send();
-
-        var abLoader = AssetBundle.LoadFromMemoryAsync(request.downloadHandler.data);
-        yield return abLoader;
-        var assetbundle = abLoader.assetBundle;
-
-        var prefabLoader = assetbundle.LoadAssetAsync<GameObject>(assetName);
-        yield return prefabLoader;
-        var prefab = prefabLoader.asset as GameObject;
-
-        GameObject.Instantiate(prefab);
-        assetbundle.Unload(false);
-    }
-
     async Task RunAsyncOperationAsync()
     {
         await InstantiateAssetBundleAsync(AssetBundleSampleUrl, AssetBundleSampleAssetName);
     }
 
     async Task InstantiateAssetBundleAsync(string abUrl, string assetName)
     {
+        // We could use WWW here too which might be easier
+        Debug.Log("Downloading asset bundle data...");
         var assetBundle = await AssetBundle.LoadFromMemoryAsync(
             await DownloadRawDataAsync(abUrl));
 
         var prefab = (GameObject)(await assetBundle.LoadAssetAsync<GameObject>(assetName));
 
         GameObject.Instantiate(prefab);
         assetBundle.Unload(false);
-    }
-
-    async Task InstantiateAssetBundleAsync2(string abUrl, string assetName)
-    {
-        var assetBundle = await AssetBundle.LoadFromMemoryAsync(
-            await DownloadRawDataAsync(abUrl));
-
-        var prefab = (GameObject)(await assetBundle.LoadAssetAsync<GameObject>(assetName));
-
-        GameObject.Instantiate(prefab);
-        assetBundle.Unload(false);
+        Debug.Log("Asset bundle instantiated");
     }
 
     async Task<byte[]> DownloadRawDataAsync(string url)
@@ -247,7 +198,7 @@ async Task RunIEnumeratorTryCatchExceptionAsync()
         }
         catch (Exception e)
         {
-            Debug.Log("Caught exception! {0}" + e);
+            Debug.Log("Caught exception! " + e.Message);
         }
     }
 
@@ -263,8 +214,8 @@ IEnumerator WaitThenThrow()
 
     IEnumerator WaitThenThrowNested()
     {
-        Debug.Log("Waiting 2 seconds...");
-        yield return new WaitForSeconds(2.0f);
+        Debug.Log("Waiting 1 second...");
+        yield return new WaitForSeconds(1.0f);
         throw new Exception("zxcv");
     }